Changeset 1783 for palm/trunk/SOURCE/header.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/header.f90 (modified) (10 diffs)

palm/trunk/SOURCE/header.f90

@@ -19 +19 @@
 ! Current revisions:
 ! -----------------
-!
+! netcdf module and variable names changed, output of netcdf_deflate
 !
 ! Former revisions:
@@ -249 +249 @@
         ONLY:  damp_level_ind_1d, dt_pr_1d, dt_run_control_1d, end_time_1d
         
+    USE netcdf_interface,                                                      &
+        ONLY:  netcdf_data_format, netcdf_data_format_string, netcdf_deflate
+
     USE particle_attributes,                                                   &
         ONLY:  bc_par_b, bc_par_lr, bc_par_ns, bc_par_t, collision_kernel,     &
@@ -1315 +1318 @@
 
        output_format = ''
-       output_format = output_format_netcdf
-       WRITE ( io, 344 )  output_format
+       output_format = netcdf_data_format_string
+       IF ( netcdf_deflate == 0 )  THEN
+          WRITE ( io, 344 )  output_format
+       ELSE
+          WRITE ( io, 354 )  TRIM( output_format ), netcdf_deflate
+       ENDIF
 
        DO  i = 1, dopr_n
@@ -1379 +1386 @@
 
           output_format = ''
-          output_format = output_format_netcdf
-          WRITE ( io, 344 )  output_format
+          output_format = netcdf_data_format_string
+          IF ( netcdf_deflate == 0 )  THEN
+             WRITE ( io, 344 )  output_format
+          ELSE
+             WRITE ( io, 354 )  TRIM( output_format ), netcdf_deflate
+          ENDIF
 
           IF ( do2d_xy /= ''  .AND.  section(1,1) /= -9999 )  THEN
@@ -1536 +1547 @@
           ENDIF
 
-          output_format = output_format_netcdf
-          WRITE ( io, 344 )  output_format
+          output_format = netcdf_data_format_string
+          IF ( netcdf_deflate == 0 )  THEN
+             WRITE ( io, 344 )  output_format
+          ELSE
+             WRITE ( io, 354 )  TRIM( output_format ), netcdf_deflate
+          ENDIF
 
           IF ( do3d_at_begin )  THEN
@@ -1595 +1610 @@
              ENDIF
 
-             output_format = output_format_netcdf
+             output_format = netcdf_data_format_string
 !--          Parallel output not implemented for mask data, hence
 !--          output_format must be adjusted.
              IF ( netcdf_data_format == 5 ) output_format = 'netCDF4/HDF5'
              IF ( netcdf_data_format == 6 ) output_format = 'netCDF4/HDF5 classic'
-             WRITE ( io, 344 )  output_format
+             IF ( netcdf_deflate == 0 )  THEN
+                WRITE ( io, 344 )  output_format
+             ELSE
+                WRITE ( io, 354 )  TRIM( output_format ), netcdf_deflate
+             ENDIF
 
              IF ( av == 0 )  THEN
@@ -1650 +1669 @@
        WRITE ( io, 340 )
 
-       output_format = output_format_netcdf
-       WRITE ( io, 344 )  output_format
+       output_format = netcdf_data_format_string
+       IF ( netcdf_deflate == 0 )  THEN
+          WRITE ( io, 344 )  output_format
+       ELSE
+          WRITE ( io, 354 )  TRIM( output_format ), netcdf_deflate
+       ENDIF
        WRITE ( io, 341 )  dt_dots
     ENDIF
@@ -1713 +1736 @@
        WRITE ( io, 370 )
 
-       output_format = output_format_netcdf
-       WRITE ( io, 344 )  output_format
+       output_format = netcdf_data_format_string
+       IF ( netcdf_deflate == 0 )  THEN
+          WRITE ( io, 344 )  output_format
+       ELSE
+          WRITE ( io, 354 )  TRIM( output_format ), netcdf_deflate
+       ENDIF
        WRITE ( io, 371 )  dt_dosp
        IF ( skip_time_dosp /= 0.0_wp )  WRITE ( io, 339 )  skip_time_dosp
@@ -1864 +1891 @@
              output_format = 'netcdf and binary'
           ENDIF
-          WRITE ( io, 344 )  output_format
+          IF ( netcdf_deflate == 0 )  THEN
+             WRITE ( io, 344 )  output_format
+          ELSE
+             WRITE ( io, 354 )  TRIM( output_format ), netcdf_deflate
+          ENDIF
        ENDIF
        IF ( dt_dopts /= 9999999.9_wp )  WRITE ( io, 494 )  dt_dopts
@@ -2176 +2207 @@
 352 FORMAT  (/'       Number of output time levels allowed: ',I3 /)
 353 FORMAT  (/'       Number of output time levels allowed: unlimited' /)
+354 FORMAT ('       Output format: ',A, '   compressed with level: ',I1/)
 #if defined( __dvrp_graphics )
 360 FORMAT ('    Plot-Sequence with dvrp-software:'/ &