Changeset 4435 for palm/trunk/SOURCE

Timestamp:

Mar 3, 2020 10:38:41 AM (4 years ago)

Author:

raasch

Message:

bugfix for message that reports about files that are read from in case that the virtual PE grid has chenged (in case of large number of files format was exceeded), detailed messages about the files are now output to the debug file, temporary bugfix to avoid compile problems with older NetCDFD libraries on IMUK machines

Location:

palm/trunk/SOURCE

Files:

• netcdf_data_input_mod.f90 (modified) (2 diffs)
• read_restart_data_mod.f90 (modified) (2 diffs)

palm/trunk/SOURCE/netcdf_data_input_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! temporary bugfix to avoid compile problems with older NetCDFD libraries on IMUK machines
+! 
+! 4434 2020-03-03 10:02:18Z oliver.maas
 ! added optional netcdf data input for wtm array input parameters
 ! 
@@ -5642 +5645 @@
        INTEGER(iwp)              ::  id_var      !< netCDF variable id (varid)
 
+#if defined( __imuk_old )
+       INTEGER(iwp)              ::  fill_value_int  !< fill value workaround
+#endif
        REAL(wp), INTENT(OUT)     ::  fill_value  !< fill value
 
 #if defined( __netcdf )
        nc_stat = NF90_INQ_VARID( id, TRIM( var_name ), id_var )
+#if defined( __imuk_old )
+       nc_stat = NF90_INQ_VAR_FILL(id, id_var, no_fill, fill_value_int )
+       fill_value = fill_value_int
+#else
        nc_stat = NF90_INQ_VAR_FILL(id, id_var, no_fill, fill_value )
+#endif
 #endif
 !

palm/trunk/SOURCE/read_restart_data_mod.f90

@@ -25 +25 @@
 ! -----------------
 ! $Id$
+! bugfix for message that reports about files that are read from in case that the virtual PE grid
+! has chenged (in case of large number of files format was exceeded), detailed messages about the
+! files are now output to the debug file
+! 
+! 4431 2020-02-27 23:23:01Z gronemeier
 ! added u_center_av, v_center_av, wspeed_av
 !
@@ -1169 +1174 @@
 
     IF ( files_to_be_opened /= 1  .OR.  numprocs /= numprocs_previous_run )  THEN
-       WRITE( message_string, * ) 'number of PEs or virtual PE-grid changed ',                     &
-                                  'in restart run & PE', myid, ' will read from files ',           &
-                                  file_list(1:files_to_be_opened)
+       WRITE( message_string, * ) 'number of PEs or virtual PE-grid changed in restart run. & ',   &
+                                  'Set debug_output =.T. to get a list of files from which the & ',&
+                                  'single PEs will read respectively'
        CALL message( 'rrd_local', 'PA0285', 0, 0, 0, 6, 0 )
+       IF ( debug_output )  THEN
+          IF ( files_to_be_opened <= 120 )  THEN
+             WRITE( debug_string, '(2A,1X,120(I6.6,1X))' )                                         &
+                  'number of PEs or virtual PE-grid changed in restart run.  PE will read from ',  &
+                  'files ', file_list(1:files_to_be_opened)
+          ELSE
+             WRITE( debug_string, '(3A,1X,120(I6.6,1X),A)' )                                      &
+                  'number of PEs or virtual PE-grid changed in restart run.  PE will read from ',  &
+                  'files ', file_list(1:120), '... and more'
+          ENDIF
+          CALL debug_message( 'rrd_local', 'info' )
+       ENDIF
     ENDIF