Changeset 493 for palm/trunk/SOURCE/data_output_mask.f90
- Timestamp:
- Mar 1, 2010 8:30:24 AM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/data_output_mask.f90
r484 r493 53 53 CALL cpu_log (log_point(49),'data_output_mask','start') 54 54 55 ! !55 ! 56 56 !-- Open output file. 57 IF ( format_parallel_io .AND. netcdf_output ) THEN 58 CALL check_open( 120+mid+av*max_masks ) 59 ELSEIF (myid == 0 .AND. netcdf_output ) THEN 57 IF ( netcdf_output .AND. ( myid == 0 .OR. netcdf_data_format > 2 ) ) & 58 THEN 60 59 CALL check_open( 120+mid+av*max_masks ) 61 60 ENDIF … … 74 73 !-- Update the NetCDF time axis. 75 74 domask_time_count(mid,av) = domask_time_count(mid,av) + 1 76 IF ( format_parallel_io .AND. netcdf_output ) THEN 77 nc_stat = NF90_PUT_VAR( id_set_mask(mid,av), id_var_time_mask(mid,av), & 78 (/ simulated_time /), & 79 start = (/ domask_time_count(mid,av) /), & 80 count = (/ 1 /) ) 81 CALL handle_netcdf_error( 'data_output_mask', 9998 ) 82 ELSEIF ( myid == 0 .AND. netcdf_output ) THEN 75 IF ( netcdf_output .AND. ( myid == 0 .OR. netcdf_data_format > 2 ) ) & 76 THEN 83 77 nc_stat = NF90_PUT_VAR( id_set_mask(mid,av), id_var_time_mask(mid,av), & 84 78 (/ simulated_time /), & … … 95 89 ! 96 90 !-- Reallocate local_pf on PE 0 since its shape changes during MPI exchange 97 IF ( .NOT. format_parallel_io .AND. myid == 0 .AND.if > 1 ) THEN91 IF ( netcdf_data_format < 3 .AND. myid == 0 .AND. if > 1 ) THEN 98 92 DEALLOCATE( local_pf ) 99 93 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 330 324 !-- directives __parallel and __netcdf4 as well as on the parameter 331 !-- n c_format_mask(mid,av).325 !-- netcdf_data_format. 332 326 #if defined( __parallel ) 333 327 #if defined( __netcdf4 ) 334 IF ( n c_format_mask(mid,av) == 3 .OR. nc_format_mask(mid,av) == 4) THEN328 IF ( netcdf_data_format > 2 ) THEN 335 329 ! 336 330 !-- (1) a. Parallel I/O using NetCDF 4 (not yet tested)
Note: See TracChangeset
for help on using the changeset viewer.