Changeset 4444 for palm/trunk/SOURCE/header.f90

Timestamp:

Mar 5, 2020 3:59:50 PM (4 years ago)

Author:

raasch

Message:

bugfix: cpp-directives for serial mode added

File:

• palm/trunk/SOURCE/header.f90 (modified) (10 diffs)

palm/trunk/SOURCE/header.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfix: cpp-directives for serial mode added
+! 
+! 4360 2020-01-07 11:25:50Z suehring
 ! Bugfix, character length too short, caused crash on NEC.
 ! 
@@ -123 +126 @@
     USE pmc_handle_communicator,                                               &
         ONLY:  pmc_get_model_info
-#endif
 
     USE pmc_interface,                                                         &
         ONLY:  nested_run, nesting_datatransfer_mode, nesting_mode
+#endif
 
     USE surface_mod,                                                           &
@@ -148 +151 @@
     CHARACTER (LEN=26) ::  ver_rev             !< string for run identification
 
+#if defined( __parallel )
     CHARACTER (LEN=32) ::  cpl_name            !< name of child domain (nesting mode only) 
+#endif
     
     CHARACTER (LEN=40) ::  output_format       !< netcdf format
@@ -185 +190 @@
     INTEGER(iwp) ::  ch             !< canyon depth in generic street-canyon setup
     INTEGER(iwp) ::  count          !< number of masked output locations
-    INTEGER(iwp) ::  cpl_parent_id  !< parent ID for the respective child model
     INTEGER(iwp) ::  cwx            !< canyon width along x in generic street-canyon setup
     INTEGER(iwp) ::  cwy            !< canyon width along y in generic street-canyon setup
@@ -198 +202 @@
     INTEGER(iwp) ::  ll             !< substring length
     INTEGER(iwp) ::  mid            !< masked output running index
+#if defined( __parallel )
+    INTEGER(iwp) ::  cpl_parent_id  !< parent ID for the respective child model
     INTEGER(iwp) ::  my_cpl_id      !< run id in a nested model setup
     INTEGER(iwp) ::  n              !< running index over number of couplers in a nested model setup
     INTEGER(iwp) ::  ncpl           !< number of coupler in a nested model setup
     INTEGER(iwp) ::  npe_total      !< number of total PEs in a coupler (parent + child)
+#endif
     
 
     REAL(wp) ::  cpuseconds_per_simulated_second  !< CPU time (in s) per simulated second
+#if defined( __parallel )
     REAL(wp) ::  lower_left_coord_x               !< x-coordinate of nest domain
     REAL(wp) ::  lower_left_coord_y               !< y-coordinate of nest domain
+#endif
 
 !
@@ -246 +255 @@
        CALL message( 'header', 'PA0191', 0, 0, 0, 6, 0 )
     ENDIF
+#if defined( __parallel )
     IF ( nested_run )  run_classification = 'nested ' // run_classification(1:63)
+#endif
     IF ( ocean_mode )  THEN
        run_classification = 'ocean - ' // run_classification(1:61)
@@ -300 +311 @@
 #endif
 
+#if defined( __parallel )
 !
 !-- Nesting informations
     IF ( nested_run )  THEN
 
-#if defined( __parallel )
        WRITE ( io, 600 )  TRIM( nesting_mode ),                                &
                           TRIM( nesting_datatransfer_mode )
@@ -324 +335 @@
                              TRIM( cpl_name )
        ENDDO
+
+    ENDIF
 #endif
 
-    ENDIF
     WRITE ( io, 99 )
 
@@ -1919 +1931 @@
             ' Time:                 ',A8,6X,'Run-No.:   ',I2.2/     &
             ' Run on host:        ',A10,6X,'En-No.:    ',I2.2)
+#if defined( __parallel )
 600 FORMAT (/' Nesting informations:'/ &
             ' --------------------'/ &
@@ -1926 +1939 @@
             ' (*=me)     id    of PEs      x (m)     y (m)' )
 601 FORMAT (2X,A1,1X,I2.2,6X,I2.2,5X,I5,5X,F8.2,2X,F8.2,5X,A)
+#endif
 
  END SUBROUTINE header