Changeset 1783 for palm/trunk/SOURCE/data_output_mask.f90
- Timestamp:
- Mar 6, 2016 6:36:17 PM (8 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/data_output_mask.f90
r1692 r1783 19 19 ! Current revisions: 20 20 ! ----------------- 21 ! 21 ! name change of netcdf routines and module + related changes, 22 ! switch back of netcdf data format moved from time integration routine to here 22 23 ! 23 24 ! Former revisions: … … 96 97 97 98 USE control_parameters, & 98 ONLY: cloud_physics, domask, domask_no, domask_time_count, & 99 mask_i, mask_j, mask_k, mask_size, mask_size_l, & 100 mask_start_l, max_masks, message_string, mid, & 101 netcdf_data_format, nz_do3d, simulated_time 99 ONLY: cloud_physics, domask, domask_no, domask_time_count, mask_i, & 100 mask_j, mask_k, mask_size, mask_size_l, mask_start_l, & 101 max_masks, message_string, mid, nz_do3d, simulated_time 102 102 USE cpulog, & 103 103 ONLY: cpu_log, log_point 104 104 105 106 107 105 USE indices, & 108 106 ONLY: nbgp, nxl, nxr, nyn, nys, nzb, nzt … … 110 108 USE kinds 111 109 112 USE netcdf 113 114 USE netcdf_control 110 USE NETCDF 111 112 USE netcdf_interface, & 113 ONLY: id_set_mask, id_var_domask, id_var_time_mask, nc_stat, & 114 netcdf_data_format, netcdf_handle_error 115 115 116 116 USE particle_attributes, & … … 136 136 INTEGER(iwp) :: k !< 137 137 INTEGER(iwp) :: n !< 138 INTEGER(iwp) :: netcdf_data_format_save !< 138 139 INTEGER(iwp) :: psi !< 139 140 INTEGER(iwp) :: sender !< … … 158 159 159 160 CALL cpu_log (log_point(49),'data_output_mask','start') 161 162 ! 163 !-- Parallel netcdf output is not tested so far for masked data, hence 164 !-- netcdf_data_format is switched back to non-paralell output. 165 netcdf_data_format_save = netcdf_data_format 166 IF ( netcdf_data_format == 5 ) netcdf_data_format = 3 167 IF ( netcdf_data_format == 6 ) netcdf_data_format = 4 160 168 161 169 ! … … 183 191 start = (/ domask_time_count(mid,av) /), & 184 192 count = (/ 1 /) ) 185 CALL handle_netcdf_error( 'data_output_mask', 460 )193 CALL netcdf_handle_error( 'data_output_mask', 460 ) 186 194 ENDIF 187 195 … … 564 572 count = (/ mask_size_l(mid,1), mask_size_l(mid,2), & 565 573 mask_size_l(mid,3), 1 /) ) 566 CALL handle_netcdf_error( 'data_output_mask', 461 )574 CALL netcdf_handle_error( 'data_output_mask', 461 ) 567 575 ELSE 568 576 #endif … … 611 619 count = (/ mask_size(mid,1), mask_size(mid,2), & 612 620 mask_size(mid,3), 1 /) ) 613 CALL handle_netcdf_error( 'data_output_mask', 462 )621 CALL netcdf_handle_error( 'data_output_mask', 462 ) 614 622 615 623 ELSE … … 656 664 count = (/ mask_size_l(mid,1), mask_size_l(mid,2), & 657 665 mask_size_l(mid,3), 1 /) ) 658 CALL handle_netcdf_error( 'data_output_mask', 463 )666 CALL netcdf_handle_error( 'data_output_mask', 463 ) 659 667 #endif 660 668 … … 672 680 #endif 673 681 682 ! 683 !-- Switch back to original format given by user (see beginning of this routine) 684 netcdf_data_format = netcdf_data_format_save 674 685 675 686 CALL cpu_log( log_point(49), 'data_output_mask', 'stop' )
Note: See TracChangeset
for help on using the changeset viewer.