Changeset 2330 for palm/trunk


Ignore:
Timestamp:
Aug 3, 2017 2:26:02 PM (7 years ago)
Author:
schwenkel
Message:

Bugfix for gfortran

Location:
palm/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/.mrun.config.cuhk

    r2264 r2330  
    3232%compiler_name     mpif90                                        lccuhk parallel
    3333%compiler_name_ser gfortran                                      lccuhk parallel
    34 %cpp_options       -cpp:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__lc:-D__netcdf:-D__parallel   lccuhk parallel
     34%cpp_options       -cpp:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__lc:-D__netcdf:-D__parallel:-D__gfortran   lccuhk parallel
    3535%netcdf_inc        -I:$HOME/opt/netcdf-3.6.3/include             lccuhk parallel
    3636%netcdf_lib        -L:$HOME/opt/netcdf-3.6.3/lib:-lnetcdf        lccuhk parallel
     
    4444%compiler_name     mpif90                                        lccuhk parallel trace
    4545%compiler_name_ser gfortran                                      lccuhk parallel trace
    46 %cpp_options       -cpp:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__lc:-D__netcdf:-D__parallel   lccuhk parallel trace
     46%cpp_options       -cpp:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__lc:-D__netcdf:-D__parallel:-D__gfortran   lccuhk parallel trace
    4747%netcdf_inc        -I:$HOME/opt/netcdf-3.6.3/include             lccuhk parallel trace
    4848%netcdf_lib        -L:$HOME/opt/netcdf-3.6.3/lib:-lnetcdf        lccuhk parallel trace
  • palm/trunk/SCRIPTS/.mrun.config.forwind_eddy

    r2272 r2330  
    3434%compiler_name     mpifort                                                                                                       lceddy parallel
    3535%compiler_name_ser gfortran                                                                                                      lceddy parallel
    36 %cpp_options       -DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__lc:-D__netcdf:-D__netcdf4:-D__parallel  lceddy parallel
     36%cpp_options       -DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__lc:-D__netcdf:-D__netcdf4:-D__parallel:-D__gfortran  lceddy parallel
    3737%netcdf_inc        -I/cm/shared/uniol/software/netCDF-Fortran/4.4.4-goolf-5.2.01/include                                         lceddy parallel
    3838%netcdf_lib        -lnetcdff:-lnetcdf                                                                                            lceddy parallel
  • palm/trunk/SCRIPTS/.mrun.config.forwind_hlrnIII

    r2264 r2330  
    4646%compiler_name     mpif90                                                    lcfor parallel
    4747%compiler_name_ser gfortran                                                  lcfor parallel
    48 %cpp_options       -DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__lc:-D__netcdf:-D__netcdf4:-D__parallel  lcfor parallel
     48%cpp_options       -DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__lc:-D__netcdf:-D__netcdf4:-D__parallel:-D__gfortran  lcfor parallel
    4949%netcdf_inc        -I/usr/include                                            lcfor parallel
    5050%netcdf_lib        -L/usr/lib:-lnetcdff:-lnetcdf                             lcfor parallel
  • palm/trunk/SCRIPTS/.mrun.config.gfortran

    r2264 r2330  
    3535%compiler_name     mpif90                                        <hi> parallel
    3636%compiler_name_ser gfortran                                      <hi> parallel
    37 %cpp_options       -cpp:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__lc:-D__netcdf:-D__parallel   <hi> parallel
     37%cpp_options       -cpp:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__lc:-D__netcdf:-D__parallel:-D__gfortran   <hi> parallel
    3838%netcdf_inc        -I:<replace_by_netcdf_include_path>           <hi> parallel
    3939%netcdf_lib        -L:<replace_by_netcdf_library_path>:-lnetcdf  <hi> parallel
     
    5353%compiler_name     mpif90                                        <hi> parallel trace
    5454%compiler_name_ser gfortran                                      <hi> parallel trace
    55 %cpp_options       -cpp:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__lc:-D__netcdf:-D__parallel   <hi> parallel trace
     55%cpp_options       -cpp:-DMPI_REAL=MPI_DOUBLE_PRECISION:-DMPI_2REAL=MPI_2DOUBLE_PRECISION:-D__lc:-D__netcdf:-D__parallel:-D__gfortran   <hi> parallel trace
    5656%netcdf_inc        -I:<replace_by_netcdf_include_path>           <hi> parallel trace
    5757%netcdf_lib        -L:<replace_by_netcdf_library_path>:-lnetcdf  <hi> parallel trace
  • palm/trunk/SOURCE/lpm_exchange_horiz.f90

    r2305 r2330  
    2525! -----------------
    2626! $Id$
     27! Bugfix: Also for gfortran compilable, function c_sizeof is not used.
     28!
     29! 2305 2017-07-06 11:18:47Z hoffmann
    2730! Improved calculation of particle IDs.
    2831!
     
    406409    ENDDO
    407410
     411#if defined( __gfortran )
     412!
     413!--    For the gfortran compiler the function c_sizeof produces strange erros
     414!--    which can probably be attributed to an error in the gfortran compiler.
     415!--    Therefore the particle size in bytes is set manually. Attention: A
     416!--    change of the size of the particle type requires an adjustment of
     417!--    this value
     418       par_size = 184
     419#else
     420!     
     421!--    This MPI_SENDRECV should work even with odd mixture on 32 and 64 Bit
     422!--    variables in structure particle_type (due to the calculation of par_size)
     423       par_size = c_sizeof(trlp(1))
     424#endif
     425
     426
    408427!
    409428!-- Allocate arrays required for north-south exchange, as these
     
    424443
    425444       ALLOCATE(rvrp(MAX(1,trrp_count_recv)))
    426 !     
    427 !--    This MPI_SENDRECV should work even with odd mixture on 32 and 64 Bit
    428 !--    variables in structure particle_type (due to the calculation of par_size)
    429        par_size = c_sizeof(trlp(1))
     445
    430446       CALL MPI_SENDRECV( trlp, max(1,trlp_count)*par_size, MPI_BYTE,&
    431447                          pleft, 1, rvrp,                            &
     
    447463!--    This MPI_SENDRECV should work even with odd mixture on 32 and 64 Bit
    448464!--    variables in structure particle_type (due to the calculation of par_size)
    449        par_size = c_sizeof(trrp(1))
    450465       CALL MPI_SENDRECV( trrp, max(1,trrp_count)*par_size, MPI_BYTE,&
    451466                          pright, 1, rvlp,                           &
     
    655670!--    This MPI_SENDRECV should work even with odd mixture on 32 and 64 Bit
    656671!--    variables in structure particle_type (due to the calculation of par_size)
    657        par_size = c_sizeof(trsp(1))
    658672       CALL MPI_SENDRECV( trsp, trsp_count*par_size, MPI_BYTE,      &
    659673                          psouth, 1, rvnp,                             &
     
    675689!--    This MPI_SENDRECV should work even with odd mixture on 32 and 64 Bit
    676690!--    variables in structure particle_type (due to the calculation of par_size)
    677        par_size = c_sizeof(trnp(1))
    678691       CALL MPI_SENDRECV( trnp, trnp_count*par_size, MPI_BYTE,      &
    679692                          pnorth, 1, rvsp,                          &
Note: See TracChangeset for help on using the changeset viewer.