Changeset 493 for palm/trunk/SOURCE/close_file.f90

Timestamp:

Mar 1, 2010 8:30:24 AM (14 years ago)

Author:

raasch

Message:

New:
---
Output in NetCDF4-format. New d3par-parameter netcdf_data_format.

(check_open, check_parameters, close_file, data_output_2d, data_output_3d, header, modules, netcdf, parin)

Modules to be loaded for compilation (mbuild) or job execution (mrun)
can be given in the configuration file using variable modules. Example:

%modules ifort/11.0.069:netcdf lcsgih parallel

This method replaces the (undocumented) mpilib-variable.

WARNING: All fixed settings of modules in the scripts mbuild, mrun, and subjob
have been removed! Please set the modules variable appropriately in your
configuration file. (mbuild, mrun, subjob)

Changed:

---

Parameters netcdf_64bit and netcdf_64bit_3d have been removed. Use
netcdf_data_format = 2 for choosing the classic 64bit-offset format (this is
the default). The offset-format can not be set independently for the
3d-output-data any more.

Parameters netcdf_format_mask, netcdf_format_mask_av, and variables
nc_format_mask, format_parallel_io removed. They are replaced by the new
parameter netcdf_data_format. (check_open, close_file,
data_output_mask, header, init_masks, modules, parin)

Errors:

---

bugfix in trunk/UTIL/Makefile: forgot to compile for interpret_config

Bugfix: timeseries data have to be collected by PE0 (user_statistics)

File:

• palm/trunk/SOURCE/close_file.f90 (modified) (11 diffs)

palm/trunk/SOURCE/close_file.f90

@@ -4 +4 @@
 ! Current revisions:
 ! -----------------
-! 
+! Adjustments for NetCDF parallel data output
 !
 ! Former revisions:
@@ -409 +409 @@
              CASE ( 101 )
 
-                IF ( myid == 0  .AND.  netcdf_output )  THEN
+                IF ( netcdf_output  .AND.  &
+                     ( myid == 0  .OR.  netcdf_data_format > 2 ) )  THEN
                    nc_stat = NF90_CLOSE( id_set_xy(0) )
                    CALL handle_netcdf_error( 'close_file', 44 )
@@ -416 +417 @@
              CASE ( 102 )
 
-                IF ( myid == 0  .AND.  netcdf_output )  THEN
+                IF ( netcdf_output  .AND.  &
+                     ( myid == 0  .OR.  netcdf_data_format > 2 ) )  THEN
                    nc_stat = NF90_CLOSE( id_set_xz(0) )
                    CALL handle_netcdf_error( 'close_file', 45 )
@@ -423 +425 @@
              CASE ( 103 )
 
-                IF ( myid == 0  .AND.  netcdf_output )  THEN
+                IF ( netcdf_output  .AND.  &
+                     ( myid == 0  .OR.  netcdf_data_format > 2 ) )  THEN
                    nc_stat = NF90_CLOSE( id_set_yz(0) )
                    CALL handle_netcdf_error( 'close_file', 46 )
@@ -444 +447 @@
              CASE ( 106 )
 
-                IF ( myid == 0  .AND.  netcdf_output )  THEN
+                IF ( netcdf_output  .AND.  &
+                     ( myid == 0  .OR.  netcdf_data_format > 2 ) )  THEN
                    nc_stat = NF90_CLOSE( id_set_3d(0) )
                    CALL handle_netcdf_error( 'close_file', 49 )
@@ -472 +476 @@
              CASE ( 111 )
 
-                IF ( myid == 0  .AND.  netcdf_output )  THEN
+                IF ( netcdf_output  .AND.  &
+                     ( myid == 0  .OR.  netcdf_data_format > 2 ) )  THEN
                    nc_stat = NF90_CLOSE( id_set_xy(1) )
                    CALL handle_netcdf_error( 'close_file', 52 )
@@ -479 +484 @@
              CASE ( 112 )
 
-                IF ( myid == 0  .AND.  netcdf_output )  THEN
+                IF ( netcdf_output  .AND.  &
+                     ( myid == 0  .OR.  netcdf_data_format > 2 ) )  THEN
                    nc_stat = NF90_CLOSE( id_set_xz(1) )
                    CALL handle_netcdf_error( 'close_file', 352 )
@@ -486 +492 @@
              CASE ( 113 )
 
-                IF ( myid == 0  .AND.  netcdf_output )  THEN
+                IF ( netcdf_output  .AND.  &
+                     ( myid == 0  .OR.  netcdf_data_format > 2 ) )  THEN
                    nc_stat = NF90_CLOSE( id_set_yz(1) )
                    CALL handle_netcdf_error( 'close_file', 353 )
@@ -493 +500 @@
              CASE ( 116 )
 
-                IF ( myid == 0  .AND.  netcdf_output )  THEN
+                IF ( netcdf_output  .AND.  &
+                     ( myid == 0  .OR.  netcdf_data_format > 2 ) )  THEN
                    nc_stat = NF90_CLOSE( id_set_3d(1) )
                    CALL handle_netcdf_error( 'close_file', 353 )
@@ -500 +508 @@
              CASE ( 121:160 )
              
-                IF ( format_parallel_io ) THEN
+                IF ( netcdf_output  .AND.  &
+                     ( myid == 0  .OR.  netcdf_data_format > 2 ) )  THEN
 !
 !--                decompose fid into mid and av
@@ -513 +522 @@
                    CALL handle_netcdf_error( 'close_file', 9998 )
                 
-                ELSEIF ( myid == 0  .AND.  netcdf_output )  THEN
-!
-!--                decompose fid into mid and av
-                   IF ( fid <= 140 )  THEN
-                      mid = fid - 120
-                      av = 0
-                   ELSE
-                      mid = fid - 140
-                      av = 1
-                   ENDIF
-                   nc_stat = NF90_CLOSE( id_set_mask(mid,av) )
-                   CALL handle_netcdf_error( 'close_file', 9998 )
-                   
                 ENDIF