- Timestamp:
- Feb 25, 2019 4:54:16 PM (6 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/module_interface.f90
r3747 r3762 25 25 ! ----------------- 26 26 ! $Id$ 27 ! only pass required arguments to surface_data_output_rrd_local 28 ! 29 ! 3747 2019-02-16 15:15:23Z gronemeier 27 30 ! Call user_init_arrays 28 31 ! … … 1252 1255 found & 1253 1256 ) ! ToDo: change interface to pass variable 1254 1255 IF ( .NOT. found ) CALL surface_data_output_rrd_local( & 1256 file_index, map_index, & 1257 nxlf, nxlc, nxl_on_file, & 1258 nxrf, nxrc, nxr_on_file, & 1259 nynf, nync, nyn_on_file, & 1260 nysf, nysc, nys_on_file, & 1261 found & 1262 ) ! ToDo: change interface to pass variable 1257 ! 1258 !--Surface data do not need overlap data, so do not pass these information. 1259 IF ( .NOT. found ) CALL surface_data_output_rrd_local( found ) 1263 1260 1264 1261 IF ( .NOT. found ) CALL user_rrd_local( & -
palm/trunk/SOURCE/surface_data_output_mod.f90
r3745 r3762 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Remove unused variables and add preprocessor directives for variables that 28 ! are used only when netcdf4 is defined 29 ! 30 ! 3745 2019-02-15 18:57:56Z suehring 27 31 ! Output of waste_heat and innermost wall flux from indoor model 28 32 ! … … 156 160 INTEGER(iwp) :: average_count_surf = 0 !< number of ensemble members used for averaging 157 161 INTEGER(iwp) :: dosurf_no(0:1) = 0 !< number of surface output quantities 158 162 #if defined( __netcdf4_parallel ) 159 163 INTEGER(iwp) :: nc_stat !< error code for netcdf routines 160 164 INTEGER(iwp) :: oldmode !< save old set-fill-mode of netcdf file (not needed, but required for routine call) 161 165 166 INTEGER(iwp), DIMENSION(0:1) :: dosurf_time_count = 0 !< count of output time steps 162 167 INTEGER(iwp), DIMENSION(0:1) :: id_dim_s_surf !< netcdf ID for dimension s 163 168 INTEGER(iwp), DIMENSION(0:1) :: id_dim_time_surf !< netcdf ID for dimension time … … 172 177 INTEGER(iwp), DIMENSION(0:1) :: id_var_zenith_surf !< netcdf ID for variable zenith 173 178 INTEGER(iwp), DIMENSION(0:1) :: id_var_zs_surf !< netcdf ID for variable zs 174 INTEGER(iwp), DIMENSION(0:1) :: dosurf_time_count = 0 !< count of output time steps175 179 INTEGER(iwp), DIMENSION(0:1) :: ntdim_surf !< number of output time steps 176 180 177 181 INTEGER(iwp), DIMENSION(0:1,300) :: id_var_dosurf !< netcdf ID for output variables 182 #endif 178 183 179 184 LOGICAL :: first_output(0:1) = .FALSE. !< true if first output was already called … … 305 310 306 311 IMPLICIT NONE 307 312 313 #if defined( __netcdf4_parallel ) 308 314 CHARACTER (LEN=100) :: filename !< name of output file 309 315 CHARACTER (LEN=80) :: time_average_text !< string written to file attribute time_avg … … 311 317 312 318 INTEGER(iwp) :: av !< flag for averaged (=1) and non-averaged (=0) data 319 #endif 313 320 INTEGER(iwp) :: i !< grid index in x-direction, also running variable for counting non-average data output 314 321 INTEGER(iwp) :: j !< grid index in y-direction, also running variable for counting average data output … … 328 335 REAL(wp) :: off_x !< grid offset in x-direction between the stored grid index and the actual wall 329 336 REAL(wp) :: off_y !< grid offset in y-direction between the stored grid index and the actual wall 330 337 #if defined( __netcdf4_parallel ) 331 338 REAL(wp), DIMENSION(:), ALLOCATABLE :: netcdf_data_1d !< dummy array to output 1D data into netcdf file 339 #endif 332 340 333 341 ! … … 4493 4501 !> This routine reads the respective restart data. 4494 4502 !------------------------------------------------------------------------------! 4495 SUBROUTINE surface_data_output_rrd_local( i, k, nxlf, nxlc, nxl_on_file, & 4496 nxrf, nxrc, nxr_on_file, nynf, nync, nyn_on_file,& 4497 nysf, nysc, nys_on_file, found ) 4503 SUBROUTINE surface_data_output_rrd_local( found ) 4498 4504 4499 4505 … … 4503 4509 IMPLICIT NONE 4504 4510 4505 INTEGER(iwp) :: l !< index variable for surface type4506 INTEGER(iwp) :: i !< running index over input files4507 4511 INTEGER(iwp) :: k !< running index over previous input files covering current local domain 4508 INTEGER(iwp) :: ns_h_on_file_usm !< number of horizontal surface elements (urban type) on file4509 INTEGER(iwp) :: nxlc !< index of left boundary on current subdomain4510 INTEGER(iwp) :: nxlf !< index of left boundary on former subdomain4511 INTEGER(iwp) :: nxl_on_file !< index of left boundary on former local domain4512 INTEGER(iwp) :: nxrc !< index of right boundary on current subdomain4513 INTEGER(iwp) :: nxrf !< index of right boundary on former subdomain4514 INTEGER(iwp) :: nxr_on_file !< index of right boundary on former local domain4515 INTEGER(iwp) :: nync !< index of north boundary on current subdomain4516 INTEGER(iwp) :: nynf !< index of north boundary on former subdomain4517 INTEGER(iwp) :: nyn_on_file !< index of north boundary on former local domain4518 INTEGER(iwp) :: nysc !< index of south boundary on current subdomain4519 INTEGER(iwp) :: nysf !< index of south boundary on former subdomain4520 INTEGER(iwp) :: nys_on_file !< index of south boundary on former local domain4521 4512 4522 4513 LOGICAL, INTENT(OUT) :: found
Note: See TracChangeset
for help on using the changeset viewer.