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

Timestamp:

Mar 6, 2016 6:36:17 PM (8 years ago)

Author:

raasch

Message:

NetCDF routines modularized; new parameter netcdf_deflate; further changes in the pmc

File:

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

palm/trunk/SOURCE/time_integration.f90

@@ -19 +19 @@
 ! Current revisions:
 ! ------------------
-!
+! switch back of netcdf data format for mask output moved to the mask output
+! routine
 !
 ! Former revisions:
@@ -200 +201 @@
                intermediate_timestep_count_max, large_scale_forcing,           &
                loop_optimization, lsf_surf, lsf_vert, masks, mid, nest_domain, &
-               netcdf_data_format, neutral, nr_timesteps_this_run, nudging,    &
+               neutral, nr_timesteps_this_run, nudging,                        &
                ocean, on_device, passive_scalar, precipitation,                &
                prho_reference, pt_reference, pt_slope_offset, random_heatflux, &
@@ -280 +281 @@
     CHARACTER (LEN=9) ::  time_to_string          !< 
 
-    INTEGER(iwp)      ::  netcdf_data_format_save !< 
-
 !
 !-- At the beginning of a simulation determine the time step as well as
@@ -1048 +1047 @@
 
 !
-!--    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
+!--    Masked data output
        DO  mid = 1, masks
           IF ( time_domask(mid) >= dt_domask(mid) )  THEN
@@ -1061 +1055 @@
           ENDIF
        ENDDO
-       netcdf_data_format = netcdf_data_format_save
 
 !
@@ -1071 +1064 @@
           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