Changeset 2841 for palm/trunk/SOURCE/spectra_mod.f90

Timestamp:

Feb 27, 2018 3:02:57 PM (6 years ago)

Author:

knoop

Message:

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

File:

• palm/trunk/SOURCE/spectra_mod.f90 (modified) (4 diffs)

palm/trunk/SOURCE/spectra_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! Bugfix: wrong placement of include 'mpif.h' corrected
+! 
+! 2718 2018-01-02 08:49:38Z maronga
 ! Corrected "Former revisions" section
 ! 
@@ -507 +510 @@
 
 #if defined( __parallel )
+#if !defined( __mpifh )
+       USE MPI
+#endif
+#endif
+
+       USE pegrid,                                                             &
+           ONLY:  collective_wait, comm2d, ierr
+
+       USE statistics,                                                         &
+           ONLY:  hom
+
+
+       IMPLICIT NONE
+
+#if defined( __parallel )
 #if defined( __mpifh )
        INCLUDE "mpif.h"
-#else
-       USE MPI
-#endif
-#endif
-       USE pegrid,                                                             &
-           ONLY:  collective_wait, comm2d, ierr
-
-       USE statistics,                                                         &
-           ONLY:  hom
-
-
-       IMPLICIT NONE
+#endif
+#endif
 
        INTEGER(iwp) :: i  !<
@@ -616 +624 @@
 
 #if defined( __parallel )
+#if !defined( __mpifh )
+       USE MPI
+#endif
+#endif
+
+       USE pegrid,                                                             &
+           ONLY:  comm2d, ierr, myid
+
+       USE transpose_indices,                                                  &
+           ONLY:  nyn_x, nys_x, nzb_x, nzt_x
+
+
+       IMPLICIT NONE
+
+#if defined( __parallel )
 #if defined( __mpifh )
        INCLUDE "mpif.h"
-#else
-       USE MPI
-#endif
-#endif
-       USE pegrid,                                                             &
-           ONLY:  comm2d, ierr, myid
-
-       USE transpose_indices,                                                  &
-           ONLY:  nyn_x, nys_x, nzb_x, nzt_x
-
-
-       IMPLICIT NONE
+#endif
+#endif
 
        INTEGER(iwp) ::  i         !<
@@ -758 +771 @@
 
 #if defined( __parallel )
+#if !defined( __mpifh )
+       USE MPI
+#endif
+#endif
+
+       USE pegrid,                                                             &
+           ONLY:  comm2d, ierr, myid
+
+       USE transpose_indices,                                                  &
+           ONLY:  nxl_yd, nxr_yd, nzb_yd, nzt_yd
+
+
+       IMPLICIT NONE
+
+#if defined( __parallel )
 #if defined( __mpifh )
        INCLUDE "mpif.h"
-#else
-       USE MPI
-#endif
-#endif
-       USE pegrid,                                                             &
-           ONLY:  comm2d, ierr, myid
-
-       USE transpose_indices,                                                  &
-           ONLY:  nxl_yd, nxr_yd, nzb_yd, nzt_yd
-
-
-       IMPLICIT NONE
+#endif
+#endif
 
        INTEGER(iwp) ::  i         !<