Changeset 1745 for palm/trunk/SOURCE/netcdf.f90
- Timestamp:
- Feb 5, 2016 1:06:51 PM (8 years ago)
- File:
-
- 1 edited
-
palm/trunk/SOURCE/netcdf.f90 (modified) (17 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/netcdf.f90
r1692 r1745 19 19 ! Current revisions: 20 20 ! ------------------ 21 ! 21 ! Bugfix: recalculating ntdim_3d, ntdim_2d_xy/xz/yz when checking the 22 ! extensibility of an existing file (only when using parallel NetCDF). 22 23 ! 23 24 ! Former revisions: … … 112 113 !> Parameter av can assume values 0 (non-averaged data) and 1 (time averaged 113 114 !> data) 115 !> 116 !> @todo calculation of output time levels for parallel NetCDF still does not 117 !> cover every exception (change of dt_do, end_time in restart) 114 118 !------------------------------------------------------------------------------! 115 119 #if defined( __ibmy_special ) … … 131 135 dopr_time_count, dopts_time_count, dots_time_count, & 132 136 dosp_time_count, do2d, do2d_xz_time_count, do3d, & 133 do2d_yz_time_count, mask_size, do2d_xy_time_count, & 134 do3d_time_count, domask_time_count, mask_i_global, & 137 do2d_yz_time_count, dt_data_output_av, dt_do2d_xy, dt_do2d_xz, & 138 dt_do2d_yz, dt_do3d, mask_size, do2d_xy_time_count, & 139 do3d_time_count, domask_time_count, end_time, mask_i_global, & 135 140 mask_j_global, mask_k_global, message_string, mid, & 136 141 netcdf_data_format, netcdf_precision, ntdim_2d_xy, & 137 142 ntdim_2d_xz, ntdim_2d_yz, ntdim_3d, nz_do3d, prt_time_count, & 138 run_description_header, section, simulated_time, topography 143 run_description_header, section, simulated_time, & 144 simulated_time_at_begin, skip_time_data_output_av, & 145 skip_time_do2d_xy, skip_time_do2d_xz, skip_time_do2d_yz, & 146 skip_time_do3d, topography 139 147 140 148 USE grid_variables, & … … 211 219 INTEGER(iwp) :: ns_do !< actual value of ns for soil model data 212 220 INTEGER(iwp) :: ns_old !< 213 INTEGER(iwp) :: ntime_count !< 221 INTEGER(iwp) :: ntime_count !< number of time levels found in file 214 222 INTEGER(iwp) :: nz_old !< 215 223 … … 233 241 LOGICAL, SAVE :: init_netcdf = .FALSE. !< 234 242 235 REAL(wp), DIMENSION(1) :: last_time_coordinate !< 243 REAL(wp), DIMENSION(1) :: last_time_coordinate !< last time value in file 236 244 237 245 REAL(wp), DIMENSION(:), ALLOCATABLE :: netcdf_data !< … … 1460 1468 1461 1469 IF ( netcdf_data_format > 4 ) THEN 1470 ! 1471 !-- Set needed time levels (ntdim) to 1472 !-- saved time levels + to be saved time levels. 1473 IF ( av == 0 ) THEN 1474 ntdim_3d(0) = do3d_time_count(0) + CEILING( & 1475 ( end_time - MAX( skip_time_do3d, & 1476 simulated_time_at_begin ) & 1477 ) / dt_do3d ) 1478 ELSE 1479 ntdim_3d(1) = do3d_time_count(1) + CEILING( & 1480 ( end_time - MAX( skip_time_data_output_av, & 1481 simulated_time_at_begin ) & 1482 ) / dt_data_output_av ) 1483 ENDIF 1484 1485 ! 1486 !-- Check if the needed number of output time levels is increased 1487 !-- compared to the number of time levels in the existing file. 1462 1488 IF ( ntdim_3d(av) > ntime_count ) THEN 1463 1489 message_string = 'netCDF file for volume data ' // & … … 1466 1492 'e the number of output time levels&has b' // & 1467 1493 'een increased compared to the previous s' // & 1468 'imulation.' // 1494 'imulation.' // & 1469 1495 '&New file is created instead.' 1470 1496 CALL message( 'define_netcdf_header', 'PA0388', 0, 1, 0, 6, 0 ) 1471 1497 do3d_time_count(av) = 0 1472 1498 extend = .FALSE. 1499 ! 1500 !-- Recalculate the needed time levels for the new file. 1501 IF ( av == 0 ) THEN 1502 ntdim_3d(0) = CEILING( & 1503 ( end_time - MAX( skip_time_do3d, & 1504 simulated_time_at_begin ) & 1505 ) / dt_do3d ) 1506 ELSE 1507 ntdim_3d(1) = CEILING( & 1508 ( end_time - MAX( skip_time_data_output_av, & 1509 simulated_time_at_begin ) & 1510 ) / dt_data_output_av ) 1511 ENDIF 1473 1512 RETURN 1474 1513 ENDIF … … 2219 2258 2220 2259 IF ( netcdf_data_format > 4 ) THEN 2260 ! 2261 !-- Set needed time levels (ntdim) to 2262 !-- saved time levels + to be saved time levels. 2263 IF ( av == 0 ) THEN 2264 ntdim_2d_xy(0) = do2d_xy_time_count(0) + CEILING( & 2265 ( end_time - MAX( skip_time_do2d_xy, & 2266 simulated_time_at_begin ) & 2267 ) / dt_do2d_xy ) 2268 ELSE 2269 ntdim_2d_xy(1) = do2d_xy_time_count(1) + CEILING( & 2270 ( end_time - MAX( skip_time_data_output_av, & 2271 simulated_time_at_begin ) & 2272 ) / dt_data_output_av ) 2273 ENDIF 2274 2275 ! 2276 !-- Check if the needed number of output time levels is increased 2277 !-- compared to the number of time levels in the existing file. 2221 2278 IF ( ntdim_2d_xy(av) > ntime_count ) THEN 2222 2279 message_string = 'netCDF file for cross sections ' // & … … 2225 2282 'e the number of output time levels&has b' // & 2226 2283 'een increased compared to the previous s' // & 2227 'imulation.' // 2284 'imulation.' // & 2228 2285 '&New file is created instead.' 2229 2286 CALL message( 'define_netcdf_header', 'PA0389', 0, 1, 0, 6, 0 ) 2230 2287 do2d_xy_time_count(av) = 0 2231 2288 extend = .FALSE. 2289 ! 2290 !-- Recalculate the needed time levels for the new file. 2291 IF ( av == 0 ) THEN 2292 ntdim_2d_xy(0) = CEILING( & 2293 ( end_time - MAX( skip_time_do2d_xy, & 2294 simulated_time_at_begin ) & 2295 ) / dt_do2d_xy ) 2296 ELSE 2297 ntdim_2d_xy(1) = CEILING( & 2298 ( end_time - MAX( skip_time_data_output_av, & 2299 simulated_time_at_begin ) & 2300 ) / dt_data_output_av ) 2301 ENDIF 2232 2302 RETURN 2233 2303 ENDIF … … 2879 2949 RETURN 2880 2950 ENDIF 2881 2951 2882 2952 IF ( netcdf_data_format > 4 ) THEN 2953 ! 2954 !-- Set needed time levels (ntdim) to 2955 !-- saved time levels + to be saved time levels. 2956 IF ( av == 0 ) THEN 2957 ntdim_2d_xz(0) = do2d_xz_time_count(0) + CEILING( & 2958 ( end_time - MAX( skip_time_do2d_xz, & 2959 simulated_time_at_begin ) & 2960 ) / dt_do2d_xz ) 2961 ELSE 2962 ntdim_2d_xz(1) = do2d_xz_time_count(1) + CEILING( & 2963 ( end_time - MAX( skip_time_data_output_av, & 2964 simulated_time_at_begin ) & 2965 ) / dt_data_output_av ) 2966 ENDIF 2967 2968 ! 2969 !-- Check if the needed number of output time levels is increased 2970 !-- compared to the number of time levels in the existing file. 2883 2971 IF ( ntdim_2d_xz(av) > ntime_count ) THEN 2884 2972 message_string = 'netCDF file for cross sections ' // & … … 2887 2975 'e the number of output time levels&has b' // & 2888 2976 'een increased compared to the previous s' // & 2889 'imulation.' // 2977 'imulation.' // & 2890 2978 '&New file is created instead.' 2891 2979 CALL message( 'define_netcdf_header', 'PA0390', 0, 1, 0, 6, 0 ) 2892 2980 do2d_xz_time_count(av) = 0 2893 2981 extend = .FALSE. 2982 ! 2983 !-- Recalculate the needed time levels for the new file. 2984 IF ( av == 0 ) THEN 2985 ntdim_2d_xz(0) = CEILING( & 2986 ( end_time - MAX( skip_time_do2d_xz, & 2987 simulated_time_at_begin ) & 2988 ) / dt_do2d_xz ) 2989 ELSE 2990 ntdim_2d_xz(1) = CEILING( & 2991 ( end_time - MAX( skip_time_data_output_av, & 2992 simulated_time_at_begin ) & 2993 ) / dt_data_output_av ) 2994 ENDIF 2894 2995 RETURN 2895 2996 ENDIF … … 3546 3647 3547 3648 IF ( netcdf_data_format > 4 ) THEN 3649 ! 3650 !-- Set needed time levels (ntdim) to 3651 !-- saved time levels + to be saved time levels. 3652 IF ( av == 0 ) THEN 3653 ntdim_2d_yz(0) = do2d_yz_time_count(0) + CEILING( & 3654 ( end_time - MAX( skip_time_do2d_yz, & 3655 simulated_time_at_begin ) & 3656 ) / dt_do2d_yz ) 3657 ELSE 3658 ntdim_2d_yz(1) = do2d_yz_time_count(1) + CEILING( & 3659 ( end_time - MAX( skip_time_data_output_av, & 3660 simulated_time_at_begin ) & 3661 ) / dt_data_output_av ) 3662 ENDIF 3663 3664 ! 3665 !-- Check if the needed number of output time levels is increased 3666 !-- compared to the number of time levels in the existing file. 3548 3667 IF ( ntdim_2d_yz(av) > ntime_count ) THEN 3549 3668 message_string = 'netCDF file for cross sections ' // & … … 3557 3676 do2d_yz_time_count(av) = 0 3558 3677 extend = .FALSE. 3678 ! 3679 !-- Recalculate the needed time levels for the new file. 3680 IF ( av == 0 ) THEN 3681 ntdim_2d_yz(0) = CEILING( & 3682 ( end_time - MAX( skip_time_do2d_yz, & 3683 simulated_time_at_begin ) & 3684 ) / dt_do2d_yz ) 3685 ELSE 3686 ntdim_2d_yz(1) = CEILING( & 3687 ( end_time - MAX( skip_time_data_output_av, & 3688 simulated_time_at_begin ) & 3689 ) / dt_data_output_av ) 3690 ENDIF 3559 3691 RETURN 3560 3692 ENDIF … … 5103 5235 IF ( netcdf_data_format == 1 ) THEN 5104 5236 ! 5105 !-- Classic netCDF format5106 nc_stat = NF90_CREATE( filename, NF90_NOCLOBBER, id )5237 !-- Classic netCDF format 5238 nc_stat = NF90_CREATE( filename, NF90_NOCLOBBER, id ) 5107 5239 5108 5240 ELSEIF ( netcdf_data_format == 2 ) THEN … … 5124 5256 !-- netCDF4/HDF5 format with classic model flag 5125 5257 nc_stat = NF90_CREATE( filename, & 5126 IOR( NF90_NOCLOBBER, 5258 IOR( NF90_NOCLOBBER, & 5127 5259 IOR( NF90_CLASSIC_MODEL, NF90_HDF5 ) ), id ) 5128 5260 … … 5132 5264 !-- netCDF4/HDF5 format, parallel 5133 5265 nc_stat = NF90_CREATE( filename, & 5134 IOR( NF90_NOCLOBBER, 5135 IOR( NF90_NETCDF4, NF90_MPIIO ) ), 5266 IOR( NF90_NOCLOBBER, & 5267 IOR( NF90_NETCDF4, NF90_MPIIO ) ), & 5136 5268 id, COMM = comm2d, INFO = MPI_INFO_NULL ) 5137 5269 … … 5140 5272 !-- netCDF4/HDF5 format with classic model flag, parallel 5141 5273 nc_stat = NF90_CREATE( filename, & 5142 IOR( NF90_NOCLOBBER, 5143 IOR( NF90_MPIIO, 5144 IOR( NF90_CLASSIC_MODEL, NF90_HDF5 ) ) ), 5274 IOR( NF90_NOCLOBBER, & 5275 IOR( NF90_MPIIO, & 5276 IOR( NF90_CLASSIC_MODEL, NF90_HDF5 ) ) ), & 5145 5277 id, COMM = comm2d, INFO = MPI_INFO_NULL ) 5146 5278
Note: See TracChangeset
for help on using the changeset viewer.
