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

palm/trunk/SOURCE/init_masks.f90

@@ -48 +48 @@
     ALLOCATE( mask(max_masks,3,mask_xyz_dimension), &
               mask_loop(max_masks,3,3) )
-!
-!-- Store netcdf file formats for masked data output in one shared array
-    nc_format_mask(:,0) = netcdf_format_mask
-    nc_format_mask(:,1) = netcdf_format_mask_av
     
-    IF ( ANY( nc_format_mask == 3 ) .OR. ANY( nc_format_mask == 4 )) THEN
-       format_parallel_io = .TRUE.
-    ENDIF
-
-    IF ( ANY( nc_format_mask < 1 ) .OR. ANY( nc_format_mask > 4 ) )  THEN
-       WRITE( message_string, * )  'illegal value: netcdf_format_mask and ', &
-            'netcdf_format_mask_av must be either 1, 2, 3 or 4'
-       IF ( ANY( nc_format_mask == 3 ) .OR. ANY( nc_format_mask == 4 ) )  THEN
-          message_string = TRIM( message_string ) // '&NetCDF file formats '// &
-               '3 (NetCDF 4) and 4 (NetCDF 4 Classic model)'// &
-               '&are currently not supported (not yet tested).'
-       ENDIF
+!
+!-- Parallel mask output not yet tested
+    IF ( netcdf_data_format > 2 )  THEN
+       message_string = 'NetCDF file formats '//                         &
+                        '3 (NetCDF 4) and 4 (NetCDF 4 Classic model)'//  &
+                        '&are currently not supported (not yet tested).'
        CALL message( 'init_masks', 'PA9998', 1, 2, 0, 6, 0 )
     ENDIF
@@ -162 +152 @@
 !
 !-- Global arrays are required by define_netcdf_header.
-    IF ( format_parallel_io )  THEN
-       ALLOCATE( mask_i_global(max_masks,nx+1), &
-                 mask_j_global(max_masks,ny+1), &
-                 mask_k_global(max_masks,nz+1) )
-       mask_i_global = -1; mask_j_global = -1; mask_k_global = -1
-    ELSEIF ( myid == 0 )  THEN
+    IF ( myid == 0  .OR.  netcdf_data_format > 2 )  THEN
        ALLOCATE( mask_i_global(max_masks,nx+1), &
                  mask_j_global(max_masks,ny+1), &
@@ -472 +457 @@
        CALL MPI_BARRIER( comm2d, ierr )
        
-       IF ( format_parallel_io )  THEN  
+       IF ( netcdf_data_format > 2 )  THEN  
          
-          CALL MPI_BCAST( mask_i_global(mid,:), nx+1, MPI_INTEGER, 0, comm2d, ierr )
-          CALL MPI_BCAST( mask_j_global(mid,:), ny+1, MPI_INTEGER, 0, comm2d, ierr )
-          CALL MPI_BCAST( mask_k_global(mid,:), nz+1, MPI_INTEGER, 0, comm2d, ierr ) 
+          CALL MPI_BCAST( mask_i_global(mid,:), nx+1, MPI_INTEGER, 0, comm2d, &
+                          ierr )
+          CALL MPI_BCAST( mask_j_global(mid,:), ny+1, MPI_INTEGER, 0, comm2d, &
+                          ierr )
+          CALL MPI_BCAST( mask_k_global(mid,:), nz+1, MPI_INTEGER, 0, comm2d, &
+                          ierr ) 
           
        ENDIF
@@ -496 +484 @@
 
  CONTAINS
+
     SUBROUTINE set_mask_locations( dim, dxyz, dxyz_string, nxyz, nxyz_string, &
                                    lb, ub )