Changeset 1031 for palm/trunk/SOURCE/data_output_3d.f90

Timestamp:

Oct 19, 2012 2:35:30 PM (12 years ago)

Author:

raasch

Message:

netCDF4 without parallel file support implemented
additional define string netcdf4_parallel is required to switch on parallel file support

File:

• palm/trunk/SOURCE/data_output_3d.f90 (modified) (8 diffs)

palm/trunk/SOURCE/data_output_3d.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-!
+! netCDF4 without parallel file support implemented
 !
 ! Former revisions:
@@ -45 +45 @@
 !
 ! 493 2010-03-01 08:30:24Z raasch
-! NetCDF4 support (parallel output)
+! netCDF4 support (parallel output)
 !
 ! 355 2009-07-17 01:03:01Z letzel
-! simulated_time in NetCDF output replaced by time_since_reference_point.
-! Output of NetCDF messages with aid of message handling routine.
+! simulated_time in netCDF output replaced by time_since_reference_point.
+! Output of netCDF messages with aid of message handling routine.
 ! Output of messages replaced by message handling routine.
 ! Bugfix: to_be_resorted => s_av for time-averaged scalars
@@ -75 +75 @@
 ! Description:
 ! ------------
-! Output of the 3D-arrays in NetCDF and/or AVS format.
+! Output of the 3D-arrays in netCDF and/or AVS format.
 !------------------------------------------------------------------------------!
 
@@ -113 +113 @@
 !-- Open output file.
 !-- Also creates coordinate and fld-file for AVS.
-!-- For classic or 64bit NetCDF output or output of other (old) data formats,
+!-- For classic or 64bit netCDF output or output of other (old) data formats,
 !-- for a run on more than one PE, each PE opens its own file and
 !-- writes the data of its subdomain in binary format (regardless of the format
@@ -119 +119 @@
 !-- file by combine_plot_fields in the format requested by the user (netcdf
 !-- and/or avs).
-!-- For NetCDF4/HDF5 output, data is written in parallel into one file.
+!-- For netCDF4/HDF5 output, data is written in parallel into one file.
     IF ( netcdf_output )  THEN
-       IF ( netcdf_data_format < 3 )  THEN
+       IF ( netcdf_data_format < 5 )  THEN
           CALL check_open( 30 )
           IF ( myid == 0 )  CALL check_open( 106+av*10 )
@@ -136 +136 @@
 
 !
-!-- Update the NetCDF time axis
+!-- Update the netCDF time axis
 #if defined( __netcdf )
-    IF ( myid == 0  .OR.  netcdf_data_format > 2 )  THEN
+    IF ( myid == 0  .OR.  netcdf_data_format > 4 )  THEN
        do3d_time_count(av) = do3d_time_count(av) + 1
        IF ( netcdf_output )  THEN
@@ -456 +456 @@
 #if defined( __parallel )
           IF ( netcdf_output )  THEN
-             IF ( netcdf_data_format < 3 )  THEN
-!
-!--             Classic or 64bit format. Data is output in parallel in FORTRAN
-!--             binary format here, and later collected into one file by
+             IF ( netcdf_data_format < 5 )  THEN
+!
+!--             Non-parallel netCDF output. Data is output in parallel in
+!--             FORTRAN binary format here, and later collected into one file by
 !--             combine_plot_fields
                 IF ( myid == 0 )  THEN
@@ -478 +478 @@
 #if defined( __netcdf )
 !
-!--             Output in NetCDF4/HDF5 format.
+!--             Parallel output in netCDF4/HDF5 format.
 !--             Do not output redundant ghost point data except for the
 !--             boundaries of the total domain.