Ignore:
Timestamp:
Oct 19, 2012 2:35:30 PM (11 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:
1 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SOURCE/data_output_mask.f90

    r1008 r1031  
    44! Current revisions:
    55! -----------------
    6 !
     6! netCDF4 without parallel file support implemented
    77!
    88! Former revisions:
     
    3535! Description:
    3636! ------------
    37 ! Masked data output in NetCDF format for current mask (current value of mid).
     37! Masked data output in netCDF format for current mask (current value of mid).
    3838!------------------------------------------------------------------------------!
    3939
     
    7272!
    7373!-- Open output file.
    74     IF ( netcdf_output  .AND.  ( myid == 0  .OR.  netcdf_data_format > 2 ) ) &
     74    IF ( netcdf_output  .AND.  ( myid == 0  .OR.  netcdf_data_format > 4 ) ) &
    7575    THEN
    7676       CALL check_open( 200+mid+av*max_masks )
     
    8888
    8989!
    90 !-- Update the NetCDF time axis.
     90!-- Update the netCDF time axis.
    9191    domask_time_count(mid,av) = domask_time_count(mid,av) + 1
    92     IF ( netcdf_output  .AND.  ( myid == 0  .OR.  netcdf_data_format > 2 ) ) &
     92    IF ( netcdf_output  .AND.  ( myid == 0  .OR.  netcdf_data_format > 4 ) ) &
    9393    THEN
    9494       nc_stat = NF90_PUT_VAR( id_set_mask(mid,av), id_var_time_mask(mid,av), &
     
    106106!
    107107!--    Reallocate local_pf on PE 0 since its shape changes during MPI exchange
    108        IF ( netcdf_data_format < 3   .AND.  myid == 0  .AND.  if > 1 )  THEN
     108       IF ( netcdf_data_format < 5   .AND.  myid == 0  .AND.  if > 1 )  THEN
    109109          DEALLOCATE( local_pf )
    110110          ALLOCATE( local_pf(mask_size_l(mid,1),mask_size_l(mid,2), &
     
    366366!--    I/O block. I/O methods are implemented
    367367!--    (1) for parallel execution
    368 !--     a. with NetCDF 4 parallel I/O-enabled library
    369 !--     b. with NetCDF 3 library
     368!--     a. with netCDF 4 parallel I/O-enabled library
     369!--     b. with netCDF 3 library
    370370!--    (2) for serial execution.
    371371!--    The choice of method depends on the correct setting of preprocessor
    372 !--    directives __parallel and __netcdf4 as well as on the parameter
     372!--    directives __parallel and __netcdf4_parallel as well as on the parameter
    373373!--    netcdf_data_format.
    374374#if defined( __parallel )
    375 #if defined( __netcdf4 )
    376        IF ( netcdf_data_format > 2 )  THEN
    377 !
    378 !--       (1) a. Parallel I/O using NetCDF 4 (not yet tested)
     375#if defined( __netcdf4_parallel )
     376       IF ( netcdf_data_format > 4 )  THEN
     377!
     378!--       (1) a. Parallel I/O using netCDF 4 (not yet tested)
    379379          nc_stat = NF90_PUT_VAR( id_set_mask(mid,av),  &
    380380               id_var_domask(mid,av,if),  &
     
    463463!--       fast so that PE0 may receive wrong data on tag 0.
    464464          CALL MPI_BARRIER( comm2d, ierr )
    465 #if defined( __netcdf4 )
     465#if defined( __netcdf4_parallel )
    466466       ENDIF
    467467#endif
Note: See TracChangeset for help on using the changeset viewer.