Changeset 1308 for palm/trunk/SOURCE/time_integration.f90

Timestamp:

Mar 13, 2014 2:58:42 PM (10 years ago)

Author:

fricke

Message:

Adjustments for parallel NetCDF output for lccrayh/lccrayb (Cray XC30 systems)

File:

• palm/trunk/SOURCE/time_integration.f90 (modified) (5 diffs)

palm/trunk/SOURCE/time_integration.f90

@@ -20 +20 @@
 ! Current revisions:
 ! ------------------
-! 
+! +netcdf_data_format_save
+! For masked data, parallel netcdf output is not tested so far, hence 
+! netcdf_data_format is switched back to non-paralell output.
 !
 ! Former revisions:
@@ -186 +188 @@
 
     CHARACTER (LEN=9) ::  time_to_string
+    INTEGER           ::  netcdf_data_format_save
 
 !
@@ -810 +813 @@
 !
 !--    masked data output
+!--    Parallel netcdf output is not tested so far for masked data, hence 
+!--    netcdf_data_format is switched back to non-paralell output.
+       netcdf_data_format_save = netcdf_data_format
+       IF ( netcdf_data_format == 5 ) netcdf_data_format = 3
+       IF ( netcdf_data_format == 6 ) netcdf_data_format = 4
        DO  mid = 1, masks
           IF ( time_domask(mid) >= dt_domask(mid) )  THEN
@@ -817 +825 @@
           ENDIF
        ENDDO
+       netcdf_data_format = netcdf_data_format_save
 
 !
@@ -826 +835 @@
           CALL data_output_2d( 'yz', 1 )
           CALL data_output_3d( 1 )
+!--       Parallel netcdf output is not tested so far for masked data, hence 
+!--       netcdf_data_format is switched back to non-paralell output.
+          netcdf_data_format_save = netcdf_data_format
+          IF ( netcdf_data_format == 5 ) netcdf_data_format = 3
+          IF ( netcdf_data_format == 6 ) netcdf_data_format = 4
           DO  mid = 1, masks
              CALL data_output_mask( 1 )
           ENDDO
+          netcdf_data_format = netcdf_data_format_save
           time_do_av = MOD( time_do_av, MAX( dt_data_output_av, dt_3d ) )
        ENDIF