Changeset 493 for palm/trunk/SOURCE/data_output_mask.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/data_output_mask.f90 (modified) (4 diffs)

palm/trunk/SOURCE/data_output_mask.f90

@@ -53 +53 @@
     CALL cpu_log (log_point(49),'data_output_mask','start')
 
-!!
+!
 !-- Open output file.
-    IF ( format_parallel_io .AND. netcdf_output )  THEN
-       CALL check_open( 120+mid+av*max_masks )
-    ELSEIF (myid == 0  .AND.  netcdf_output ) THEN
+    IF ( netcdf_output  .AND.  ( myid == 0  .OR.  netcdf_data_format > 2 ) ) &
+    THEN
        CALL check_open( 120+mid+av*max_masks )
     ENDIF 
@@ -74 +73 @@
 !-- Update the NetCDF time axis.
     domask_time_count(mid,av) = domask_time_count(mid,av) + 1
-    IF ( format_parallel_io .AND. netcdf_output )  THEN
-       nc_stat = NF90_PUT_VAR( id_set_mask(mid,av), id_var_time_mask(mid,av), &
-                               (/ simulated_time /),                          &
-                               start = (/ domask_time_count(mid,av) /),       &
-                               count = (/ 1 /) )
-       CALL handle_netcdf_error( 'data_output_mask', 9998 )
-    ELSEIF ( myid == 0  .AND.  netcdf_output )  THEN
+    IF ( netcdf_output  .AND.  ( myid == 0  .OR.  netcdf_data_format > 2 ) ) &
+    THEN
        nc_stat = NF90_PUT_VAR( id_set_mask(mid,av), id_var_time_mask(mid,av), &
                                (/ simulated_time /),                          &
@@ -95 +89 @@
 !
 !--    Reallocate local_pf on PE 0 since its shape changes during MPI exchange
-       IF ( .NOT. format_parallel_io .AND. myid == 0 .AND. if > 1 )  THEN
+       IF ( netcdf_data_format < 3   .AND.  myid == 0  .AND.  if > 1 )  THEN
           DEALLOCATE( local_pf )
           ALLOCATE( local_pf(mask_size_l(mid,1),mask_size_l(mid,2), &
@@ -329 +323 @@
 !--    The choice of method depends on the correct setting of preprocessor
 !--    directives __parallel and __netcdf4 as well as on the parameter 
-!--    nc_format_mask(mid,av).
+!--    netcdf_data_format.
 #if defined( __parallel )
 #if defined( __netcdf4 )
-       IF ( nc_format_mask(mid,av) == 3 .OR. nc_format_mask(mid,av) == 4 )  THEN
+       IF ( netcdf_data_format > 2 )  THEN
 !
 !--       (1) a. Parallel I/O using NetCDF 4 (not yet tested)