Changeset 2841 for palm/trunk


Ignore:
Timestamp:
Feb 27, 2018 3:02:57 PM (4 years ago)
Author:
knoop
Message:

Bugfix: wrong placement of include 'mpif.h' corrected

Location:
palm/trunk/SOURCE
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/lpm_write_exchange_statistics.f90

    r2801 r2841  
    2525! -----------------
    2626! $Id$
     27! Bugfix: wrong placement of include 'mpif.h' corrected,
     28! kinds module added and pegrid module scope restricted
     29!
     30! 2801 2018-02-14 16:01:55Z thiele
    2731! Introduce particle transfer in nested models.
    2832!
     
    7175!------------------------------------------------------------------------------!
    7276 SUBROUTINE lpm_write_exchange_statistics
    73  
     77
     78#if !defined( __mpifh )
    7479    USE MPI
     80#endif
    7581
    7682    USE control_parameters,                                                    &
     
    7985    USE indices,                                                               &
    8086        ONLY:  nxl, nxr, nys, nyn, nzb, nzt
     87
     88    USE kinds
    8189
    8290    USE particle_attributes,                                                   &
     
    8997        ONLY:  pmcp_g_print_number_of_particles
    9098
    91     USE pegrid
     99    USE pegrid,                                                                &
     100        ONLY:  comm2d, ierr, pleft, pright, psouth, pnorth
    92101
    93102    IMPLICIT NONE
     103
     104#if defined( __mpifh )
     105    INCLUDE "mpif.h"
     106#endif
    94107
    95108    INTEGER(iwp) :: ip         !<
  • palm/trunk/SOURCE/pmc_child_mod.f90

    r2809 r2841  
    2626! -----------------
    2727! $Id$
     28! Bugfix: wrong placement of include 'mpif.h' corrected
     29!
     30! 2809 2018-02-15 09:55:58Z schwenkel
    2831! Bugfix for gfortran: Replace the function C_SIZEOF with STORAGE_SIZE
    2932!
     
    9699    USE, INTRINSIC ::  iso_c_binding
    97100
    98 #if defined( __mpifh )
    99     INCLUDE "mpif.h"
    100 #else
     101#if !defined( __mpifh )
    101102    USE MPI
    102103#endif
    103104
    104105    USE kinds
     106
    105107    USE pmc_general,                                                           &
    106108        ONLY:  arraydef, childdef, da_desclen, da_namedef, da_namelen, pedef,  &
     
    114116
    115117    IMPLICIT NONE
     118
     119#if defined( __mpifh )
     120    INCLUDE "mpif.h"
     121#endif
    116122
    117123    PRIVATE
  • palm/trunk/SOURCE/pmc_general_mod.f90

    r2801 r2841  
    2626! -----------------
    2727! $Id$
     28! Bugfix: wrong placement of include 'mpif.h' corrected
     29!
     30! 2801 2018-02-14 16:01:55Z thiele
    2831! Introduce particle transfer in nested models.
    2932!
     
    8083    USE kinds
    8184
     85#if !defined( __mpifh )
     86    USE MPI
     87#endif
     88
     89    IMPLICIT NONE
     90
    8291#if defined( __mpifh )
    8392    INCLUDE "mpif.h"
    84 #else
    85     USE MPI
    8693#endif
    87 
    88     IMPLICIT NONE
    8994
    9095    PRIVATE
  • palm/trunk/SOURCE/pmc_handle_communicator_mod.f90

    r2801 r2841  
    2525! -----------------
    2626! $Id$
     27! Bugfix: wrong placement of include 'mpif.h' corrected
     28!
     29! 2801 2018-02-14 16:01:55Z thiele
    2730! Introduce particle transfer in nested models.
    2831!
     
    112115    USE kinds
    113116
    114 #if defined( __mpifh )
    115     INCLUDE "mpif.h"
    116 #else
     117#if !defined( __mpifh )
    117118    USE MPI
    118119#endif
     
    124125
    125126    IMPLICIT NONE
     127
     128#if defined( __mpifh )
     129    INCLUDE "mpif.h"
     130#endif
    126131
    127132    TYPE pmc_layout
  • palm/trunk/SOURCE/pmc_interface_mod.f90

    r2812 r2841  
    2525! -----------------
    2626! $Id$
     27! Bugfix: wrong placement of include 'mpif.h' corrected
     28!
     29! 2812 2018-02-16 13:40:25Z hellstea
    2730! Bugfixes in computation of the interpolation loglaw-correction parameters
    2831!
     
    275278
    276279#if defined( __parallel )
    277 #if defined( __mpifh )
    278     INCLUDE "mpif.h"
    279 #else
     280#if !defined( __mpifh )
    280281    USE MPI
    281282#endif
     
    314315
    315316    IMPLICIT NONE
     317
     318#if defined( __parallel )
     319#if defined( __mpifh )
     320    INCLUDE "mpif.h"
     321#endif
     322#endif
    316323
    317324    PRIVATE
  • palm/trunk/SOURCE/pmc_mpi_wrapper_mod.f90

    r2809 r2841  
    2626! -----------------
    2727! $Id$
     28! Bugfix: wrong placement of include 'mpif.h' corrected
     29!
     30! 2809 2018-02-15 09:55:58Z schwenkel
    2831! Bugfix for gfortran: Replace the function C_SIZEOF with STORAGE_SIZE
    2932!
     
    7477    USE, INTRINSIC ::  ISO_C_BINDING
    7578
    76 #if defined( __mpifh )
    77     INCLUDE "mpif.h"
    78 #else
     79#if !defined( __mpifh )
    7980    USE MPI
    8081#endif
     
    8586
    8687    IMPLICIT NONE
     88
     89#if defined( __mpifh )
     90    INCLUDE "mpif.h"
     91#endif
    8792
    8893    PRIVATE
  • palm/trunk/SOURCE/pmc_parent_mod.f90

    r2809 r2841  
    2626! -----------------
    2727! $Id$
     28! Bugfix: wrong placement of include 'mpif.h' corrected
     29!
     30! 2809 2018-02-15 09:55:58Z schwenkel
    2831! Bugfix for gfortran: Replace the function C_SIZEOF with STORAGE_SIZE
    2932!
     
    99102    USE, INTRINSIC ::  ISO_C_BINDING
    100103
    101 #if defined( __mpifh )
    102     INCLUDE "mpif.h"
    103 #else
     104#if !defined( __mpifh )
    104105    USE MPI
    105106#endif
     
    117118
    118119   IMPLICIT NONE
     120
     121#if defined( __mpifh )
     122   INCLUDE "mpif.h"
     123#endif
    119124
    120125   PRIVATE
  • palm/trunk/SOURCE/pmc_particle_interface.f90

    r2809 r2841  
    2626! -----------------!
    2727! $Id$
     28! Bugfix: wrong placement of include 'mpif.h' corrected
     29!
     30! 2809 2018-02-15 09:55:58Z schwenkel
    2831! Bugfix for gfortran: Replace the function C_SIZEOF with STORAGE_SIZE.
    2932
     
    4043
    4144   USE, INTRINSIC ::  ISO_C_BINDING
     45
     46#if !defined( __mpifh )
    4247   USE MPI
     48#endif
    4349
    4450   USE kinds
     
    9298
    9399   IMPLICIT NONE
     100
     101#if defined( __mpifh )
     102   INCLUDE "mpif.h"
     103#endif
     104
    94105   PRIVATE
    95106   SAVE
  • palm/trunk/SOURCE/spectra_mod.f90

    r2718 r2841  
    2525! -----------------
    2626! $Id$
     27! Bugfix: wrong placement of include 'mpif.h' corrected
     28!
     29! 2718 2018-01-02 08:49:38Z maronga
    2730! Corrected "Former revisions" section
    2831!
     
    507510
    508511#if defined( __parallel )
     512#if !defined( __mpifh )
     513       USE MPI
     514#endif
     515#endif
     516
     517       USE pegrid,                                                             &
     518           ONLY:  collective_wait, comm2d, ierr
     519
     520       USE statistics,                                                         &
     521           ONLY:  hom
     522
     523
     524       IMPLICIT NONE
     525
     526#if defined( __parallel )
    509527#if defined( __mpifh )
    510528       INCLUDE "mpif.h"
    511 #else
    512        USE MPI
    513 #endif
    514 #endif
    515        USE pegrid,                                                             &
    516            ONLY:  collective_wait, comm2d, ierr
    517 
    518        USE statistics,                                                         &
    519            ONLY:  hom
    520 
    521 
    522        IMPLICIT NONE
     529#endif
     530#endif
    523531
    524532       INTEGER(iwp) :: i  !<
     
    616624
    617625#if defined( __parallel )
     626#if !defined( __mpifh )
     627       USE MPI
     628#endif
     629#endif
     630
     631       USE pegrid,                                                             &
     632           ONLY:  comm2d, ierr, myid
     633
     634       USE transpose_indices,                                                  &
     635           ONLY:  nyn_x, nys_x, nzb_x, nzt_x
     636
     637
     638       IMPLICIT NONE
     639
     640#if defined( __parallel )
    618641#if defined( __mpifh )
    619642       INCLUDE "mpif.h"
    620 #else
    621        USE MPI
    622 #endif
    623 #endif
    624        USE pegrid,                                                             &
    625            ONLY:  comm2d, ierr, myid
    626 
    627        USE transpose_indices,                                                  &
    628            ONLY:  nyn_x, nys_x, nzb_x, nzt_x
    629 
    630 
    631        IMPLICIT NONE
     643#endif
     644#endif
    632645
    633646       INTEGER(iwp) ::  i         !<
     
    758771
    759772#if defined( __parallel )
     773#if !defined( __mpifh )
     774       USE MPI
     775#endif
     776#endif
     777
     778       USE pegrid,                                                             &
     779           ONLY:  comm2d, ierr, myid
     780
     781       USE transpose_indices,                                                  &
     782           ONLY:  nxl_yd, nxr_yd, nzb_yd, nzt_yd
     783
     784
     785       IMPLICIT NONE
     786
     787#if defined( __parallel )
    760788#if defined( __mpifh )
    761789       INCLUDE "mpif.h"
    762 #else
    763        USE MPI
    764 #endif
    765 #endif
    766        USE pegrid,                                                             &
    767            ONLY:  comm2d, ierr, myid
    768 
    769        USE transpose_indices,                                                  &
    770            ONLY:  nxl_yd, nxr_yd, nzb_yd, nzt_yd
    771 
    772 
    773        IMPLICIT NONE
     790#endif
     791#endif
    774792
    775793       INTEGER(iwp) ::  i         !<
  • palm/trunk/SOURCE/synthetic_turbulence_generator_mod.f90

    r2836 r2841  
    2525! -----------------
    2626! $Id$
     27! Bugfix: wrong placement of include 'mpif.h' corrected
     28!
     29! 2836 2018-02-26 13:40:05Z Giersch
    2730! The variables synthetic_turbulence_generator and
    2831! use_synthetic_turbulence_generator have been abbreviated + syn_turb_gen_prerun
     
    99102    USE kinds
    100103
     104#if !defined( __mpifh )
    101105    USE MPI
     106#endif
    102107
    103108    USE pegrid,                                                                &
     
    109114
    110115    IMPLICIT NONE
     116
     117#if defined( __mpifh )
     118    INCLUDE "mpif.h"
     119#endif
    111120
    112121    LOGICAL :: velocity_seed_initialized = .FALSE.  !< true after first call of stg_main
Note: See TracChangeset for help on using the changeset viewer.