Changeset 4232 for palm/trunk

Timestamp:

Sep 20, 2019 9:34:22 AM (5 years ago)

Author:

knoop

Message:

Bugfix: wrong placement of INCLUDE "mpif.h" fixed.

Location:

palm/trunk/SOURCE

Files:

• data_output_binary_module.f90 (modified) (2 diffs)
• data_output_netcdf4_module.f90 (modified) (2 diffs)
• lagrangian_particle_model_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/data_output_binary_module.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-!
-!
+! 
+! 
 ! Former revisions:
 ! -----------------
 ! $Id$
+! Bugfix: INCLUDE "mpif.h" must be placed after IMPLICIT NONE statement
+!
+! 4147 2019-08-07 09:42:31Z gronemeier
 ! corrected indentation according to coding standard
 !
@@ -45 +48 @@
     USE kinds
 
-#if defined( __parallel )
-#if defined( __mpifh )
-    INCLUDE "mpif.h"
-#else
+#if defined( __parallel ) && !defined( __mpifh )
     USE MPI
 #endif
+
+    IMPLICIT NONE
+
+#if defined( __parallel ) && defined( __mpifh )
+    INCLUDE "mpif.h"
 #endif
-
-    IMPLICIT NONE
 
     INTEGER, PARAMETER ::  charlen = 100  !< maximum length of character variables

palm/trunk/SOURCE/data_output_netcdf4_module.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-!
-!
+! 
+! 
 ! Former revisions:
 ! -----------------
 ! $Id$
+! Bugfix: INCLUDE "mpif.h" must be placed after IMPLICIT NONE statement
+!
+! 4147 2019-08-07 09:42:31Z gronemeier
 ! corrected indentation according to coding standard
 !
@@ -44 +47 @@
     USE kinds
 
-#if defined( __parallel )
-#if defined( __mpifh )
+#if defined( __parallel ) && !defined( __mpifh )
+    USE MPI
+#endif
+
+#if defined( __netcdf4 )
+    USE NETCDF
+#endif
+
+    IMPLICIT NONE
+
+#if defined( __parallel ) && defined( __mpifh )
     INCLUDE "mpif.h"
-#else
-    USE MPI
-#endif
-#endif
-
-#if defined( __netcdf4 )
-    USE NETCDF
-#endif
-
-    IMPLICIT NONE
+#endif
 
     CHARACTER(LEN=800) ::  internal_error_message = ''  !< string containing the last error message

palm/trunk/SOURCE/lagrangian_particle_model_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Removed INCLUDE "mpif.h", as it is not needed because of USE pegrid
+! 
+! 4195 2019-08-28 13:44:27Z schwenkel
 ! Bugfix for simple_corrector interpolation method in case of ocean runs and
 ! output particle advection interpolation method into header
@@ -168 +171 @@
     USE MPI
 #endif
-
-#if defined( __parallel )  &&  defined( __mpifh )
-    INCLUDE "mpif.h"
-#endif      
 
 #if defined( __netcdf )