Changeset 72 for palm/trunk/SOURCE
- Timestamp:
- Mar 19, 2007 8:20:46 AM (17 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 13 edited
-
CURRENT_MODIFICATIONS (modified) (3 diffs)
-
average_3d_data.f90 (modified) (3 diffs)
-
calc_precipitation.f90 (modified) (5 diffs)
-
check_parameters.f90 (modified) (6 diffs)
-
data_output_2d.f90 (modified) (3 diffs)
-
impact_of_latent_heat.f90 (modified) (5 diffs)
-
init_3d_model.f90 (modified) (4 diffs)
-
modules.f90 (modified) (5 diffs)
-
parin.f90 (modified) (2 diffs)
-
production_e.f90 (modified) (1 diff)
-
read_3d_binary.f90 (modified) (4 diffs)
-
sum_up_3d_data.f90 (modified) (5 diffs)
-
write_3d_binary.f90 (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/CURRENT_MODIFICATIONS
r63 r72 22 22 samples added to the user interface which show how to add user-define time series quantities. 23 23 24 calculation/output of precipitation amount, precipitation rate and z0 (by setting "pra*", "prr*", "z0*" with data_output). The time interval on which the precipitation amount is defined is set by new d3par-parameter precipitation_amount_interval 25 24 26 unit 9 opened for debug output (file DEBUG_<pe#>) 25 27 26 Makefile, advec_particles, buoyancy, check_open, check_parameters, diffusion_e, diffusion_u, diffusion_v, diffusion_w, diffusivities, header, init_particles, init_3d_model, modules, netcdf, parin, production_e, read_var_list, user_interface, write_var_list28 Makefile, advec_particles, average_3d_data, buoyancy, calc_precipitation, check_open, check_parameters, data_output_2d, diffusion_e, diffusion_u, diffusion_v, diffusion_w, diffusivities, header, impact_of_latent_heat, init_particles, init_3d_model, modules, netcdf, parin, production_e, read_var_list, read_3d_binary, sum_up_3d_data, user_interface, write_var_list, write_3d_binary 27 29 28 30 New: wall_fluxes … … 44 46 __vtk directives removed from main program. 45 47 48 The uitility routine interpret_config reads PALM environment variables from NAMELIST instead using the system call GETENV. 49 46 50 check_parameters, data_output_dvrp, data_output_ptseries, data_output_ts, flow_statistics, header, init_particles, init_3d_model, modules, palm, package_parin, parin, time_integration 47 51 … … 54 58 Bugfix in sample for reading user defined data from restart file (user_init) 55 59 60 Check for possible negative humidities in the initial humidity profile. 61 56 62 in Makefile, default suffixes removed from the suffix list to avoid calling of m2c in 57 63 # case of .mod files 58 64 59 65 Makefile 60 init_1d_model, user_interface66 check_parameters, init_1d_model, user_interface -
palm/trunk/SOURCE/average_3d_data.f90
r4 r72 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! Averaging the precipitation rate and roughness length (prr*, z0*) 7 7 ! 8 8 ! Former revisions: … … 90 90 ENDDO 91 91 92 CASE ( 'prr*' ) 93 DO i = nxl-1, nxr+1 94 DO j = nys-1, nyn+1 95 precipitation_rate_av(j,i) = precipitation_rate_av(j,i) / & 96 REAL( average_count_3d ) 97 ENDDO 98 ENDDO 99 92 100 CASE ( 'pt' ) 93 101 DO i = nxl-1, nxr+1 … … 213 221 ENDDO 214 222 223 CASE ( 'z0*' ) 224 DO i = nxl-1, nxr+1 225 DO j = nys-1, nyn+1 226 z0_av(j,i) = z0_av(j,i) / REAL( average_count_3d ) 227 ENDDO 228 ENDDO 229 215 230 CASE DEFAULT 216 231 ! -
palm/trunk/SOURCE/calc_precipitation.f90
r39 r72 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! Precipitation rate and amount are calculated/stored, 7 ! + module control_parameters 7 8 ! 8 9 ! Former revisions: … … 48 49 USE cloud_parameters 49 50 USE constants 51 USE control_parameters 50 52 USE indices 51 53 … … 53 55 54 56 INTEGER :: i, j, k 55 REAL :: precipitation_rate57 REAL :: dqdt_precip 56 58 59 60 precipitation_rate = 0.0 57 61 58 62 DO i = nxl, nxr … … 61 65 62 66 IF ( ql(k,j,i) > ql_crit ) THEN 63 precipitation_rate = prec_time_const * & 64 ( ql(k,j,i) - ql_crit ) 67 dqdt_precip = prec_time_const * ( ql(k,j,i) - ql_crit ) 65 68 ELSE 66 precipitation_rate= 0.069 dqdt_precip = 0.0 67 70 ENDIF 68 tend(k,j,i) = tend(k,j,i) - precipitation_rate 71 tend(k,j,i) = tend(k,j,i) - dqdt_precip 72 ! 73 !-- Precipitation rate in (kg * 0.001) / m**2 / s (because 1kg 74 !-- gives 1 mm) 75 precipitation_rate(j,i) = precipitation_rate(j,i) + & 76 dqdt_precip * dzw(k) * 0.001 69 77 70 78 ENDDO 79 ! 80 !-- Sum up the precipitation amount (unit kg * 0.001 / m**2) 81 IF ( intermediate_timestep_count == & 82 intermediate_timestep_count_max .AND. & 83 ( dt_do2d_xy-time_do2d_xy ) < precipitation_amount_interval )& 84 THEN 85 precipitation_amount(j,i) = precipitation_amount(j,i) + & 86 precipitation_rate(j,i) * dt_3d 87 ENDIF 71 88 ENDDO 72 89 ENDDO … … 83 100 USE cloud_parameters 84 101 USE constants 102 USE control_parameters 85 103 USE indices 86 104 87 105 IMPLICIT NONE 88 106 89 INTEGER :: i, j, k90 REAL :: precipitation_rate107 INTEGER :: i, j, k 108 REAL :: dqdt_precip 91 109 92 110 111 precipitation_rate(j,i) = 0.0 112 113 ! 114 !-- Ghostpoints are included (although not needed for tend) to avoid a later 115 !-- exchange of these data for the precipitation amount/rate arrays 93 116 DO k = nzb_2d(j,i)+1, nzt 94 117 95 118 IF ( ql(k,j,i) > ql_crit ) THEN 96 precipitation_rate= prec_time_const * ( ql(k,j,i) - ql_crit )119 dqdt_precip = prec_time_const * ( ql(k,j,i) - ql_crit ) 97 120 ELSE 98 precipitation_rate= 0.0121 dqdt_precip = 0.0 99 122 ENDIF 100 tend(k,j,i) = tend(k,j,i) - precipitation_rate 123 tend(k,j,i) = tend(k,j,i) - dqdt_precip 124 125 ! 126 !-- Precipitation rate in (kg * 0.001) / m**2 / s (because 1kg gives 1 mm) 127 ! precipitation_rate(j,i) = precipitation_rate(j,i) + dqdt_precip * & 128 ! dzw(k) * 0.001 129 precipitation_rate(j,i) = 1.0 101 130 102 131 ENDDO 132 133 ! 134 !-- Sum up the precipitation amount (unit kg * 0.001 / m**2) 135 IF ( intermediate_timestep_count == intermediate_timestep_count_max & 136 .AND. ( dt_do2d_xy-time_do2d_xy ) < precipitation_amount_interval )& 137 THEN 138 precipitation_amount(j,i) = precipitation_amount(j,i) + & 139 precipitation_rate(j,i) * dt_3d 140 ENDIF 103 141 104 142 END SUBROUTINE calc_precipitation_ij -
palm/trunk/SOURCE/check_parameters.f90
r63 r72 6 6 ! "by_user" allowed as initializing action, -data_output_ts, 7 7 ! leapfrog with non-flat topography not allowed any more, loop_optimization 8 ! and pt_reference are checked 8 ! and pt_reference are checked, 9 ! output of precipitation amount/rate and roughnes length + check 10 ! possible negative humidities are avoided in initial profile 9 11 ! 10 12 ! Former revisions: … … 351 353 352 354 IF ( cloud_physics .AND. .NOT. moisture ) THEN 353 IF ( myid == 0 ) PRINT*, '+++ check_parameters: moisture =', & 354 moisture, ' is not allowed with ', & 355 'cloud_physics=', cloud_physics 355 IF ( myid == 0 ) PRINT*, '+++ check_parameters: cloud_physics =', & 356 cloud_physics, ' is not allowed with ', & 357 'moisture =', moisture 358 CALL local_stop 359 ENDIF 360 361 IF ( precipitation .AND. .NOT. cloud_physics ) THEN 362 IF ( myid == 0 ) PRINT*, '+++ check_parameters: precipitation =', & 363 precipitation, ' is not allowed with ', & 364 'cloud_physics =', cloud_physics 356 365 CALL local_stop 357 366 ENDIF … … 570 579 q_init(k) = q_init(k-1) 571 580 ENDIF 581 ! 582 !-- Avoid negative humidities 583 IF ( q_init(k) < 0.0 ) THEN 584 q_init(k) = 0.0 585 ENDIF 572 586 ENDDO 573 587 … … 1163 1177 1164 1178 ! 1179 !-- Set the default value for the integration interval of precipitation amount 1180 IF ( precipitation ) THEN 1181 IF ( precipitation_amount_interval == 9999999.9 ) THEN 1182 precipitation_amount_interval = dt_do2d_xy 1183 ELSE 1184 IF ( precipitation_amount_interval > dt_do2d_xy ) THEN 1185 IF ( myid == 0 ) PRINT*, '+++ check_parameters: ', & 1186 'precipitation_amount_interval =', & 1187 precipitation_amount_interval, & 1188 ' must not be larger than dt_do2d_xy', & 1189 ' = ', dt_do2d_xy 1190 CALL local_stop 1191 ENDIF 1192 ENDIF 1193 ENDIF 1194 1195 ! 1165 1196 !-- Determine the number of output profiles and check whether they are 1166 1197 !-- permissible … … 1840 1871 unit = 'conc' 1841 1872 1842 CASE ( 'u*', 't*', 'lwp*' )1873 CASE ( 'u*', 't*', 'lwp*', 'pra*', 'prr*', 'z0*' ) 1843 1874 IF ( k == 0 .OR. data_output(i)(ilen-2:ilen) /= '_xy' ) THEN 1844 1875 IF ( myid == 0 ) THEN … … 1856 1887 CALL local_stop 1857 1888 ENDIF 1889 IF ( TRIM( var ) == 'pra*' .AND. .NOT. precipitation ) THEN 1890 IF ( myid == 0 ) THEN 1891 PRINT*, '+++ check_parameters: output of "', TRIM( var ), & 1892 '" requires precipitation = .TRUE.' 1893 ENDIF 1894 CALL local_stop 1895 ENDIF 1896 IF ( TRIM( var ) == 'pra*' .AND. j == 1 ) THEN 1897 IF ( myid == 0 ) THEN 1898 PRINT*, '+++ check_parameters: temporal averaging of ', & 1899 ' precipitation amount "', TRIM( var ), & 1900 '" not possible' 1901 ENDIF 1902 CALL local_stop 1903 ENDIF 1904 IF ( TRIM( var ) == 'prr*' .AND. .NOT. precipitation ) THEN 1905 IF ( myid == 0 ) THEN 1906 PRINT*, '+++ check_parameters: output of "', TRIM( var ), & 1907 '" requires precipitation = .TRUE.' 1908 ENDIF 1909 CALL local_stop 1910 ENDIF 1911 1912 1858 1913 IF ( TRIM( var ) == 'u*' ) unit = 'm/s' 1859 1914 IF ( TRIM( var ) == 't*' ) unit = 'K' 1860 1915 IF ( TRIM( var ) == 'lwp*' ) unit = 'kg/kg*m' 1916 IF ( TRIM( var ) == 'pra*' ) unit = 'mm' 1917 IF ( TRIM( var ) == 'prr*' ) unit = 'mm/s' 1918 IF ( TRIM( var ) == 'z0*' ) unit = 'm' 1861 1919 1862 1920 CASE ( 'p', 'pt', 'u', 'v', 'w' ) -
palm/trunk/SOURCE/data_output_2d.f90
r4 r72 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! Output of precipitation amount/rate and roughness length 7 7 ! 8 8 ! Former revisions: … … 257 257 ENDIF 258 258 259 CASE ( 'pra*_xy' ) ! 2d-array / integral quantity => no av 260 CALL exchange_horiz_2d( precipitation_amount ) 261 DO i = nxl-1, nxr+1 262 DO j = nys-1, nyn+1 263 local_pf(i,j,nzb+1) = precipitation_amount(j,i) 264 ENDDO 265 ENDDO 266 precipitation_amount = 0.0 ! reset for next integ. interval 267 resorted = .TRUE. 268 two_d = .TRUE. 269 level_z(nzb+1) = zu(nzb+1) 270 271 CASE ( 'prr*_xy' ) ! 2d-array 272 IF ( av == 0 ) THEN 273 CALL exchange_horiz_2d( precipitation_rate ) 274 DO i = nxl-1, nxr+1 275 DO j = nys-1, nyn+1 276 local_pf(i,j,nzb+1) = precipitation_rate(j,i) 277 ENDDO 278 ENDDO 279 ELSE 280 CALL exchange_horiz_2d( precipitation_rate_av ) 281 DO i = nxl-1, nxr+1 282 DO j = nys-1, nyn+1 283 local_pf(i,j,nzb+1) = precipitation_rate_av(j,i) 284 ENDDO 285 ENDDO 286 ENDIF 287 resorted = .TRUE. 288 two_d = .TRUE. 289 level_z(nzb+1) = zu(nzb+1) 290 259 291 CASE ( 'pt_xy', 'pt_xz', 'pt_yz' ) 260 292 IF ( av == 0 ) THEN … … 419 451 ENDIF 420 452 IF ( mode == 'xy' ) level_z = zw 453 454 CASE ( 'z0*_xy' ) ! 2d-array 455 IF ( av == 0 ) THEN 456 DO i = nxl-1, nxr+1 457 DO j = nys-1, nyn+1 458 local_pf(i,j,nzb+1) = z0(j,i) 459 ENDDO 460 ENDDO 461 ELSE 462 DO i = nxl-1, nxr+1 463 DO j = nys-1, nyn+1 464 local_pf(i,j,nzb+1) = z0_av(j,i) 465 ENDDO 466 ENDDO 467 ENDIF 468 resorted = .TRUE. 469 two_d = .TRUE. 470 level_z(nzb+1) = zu(nzb+1) 421 471 422 472 CASE DEFAULT -
palm/trunk/SOURCE/impact_of_latent_heat.f90
r39 r72 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! precipitation_rate renamed dqdt_precip 7 7 ! 8 8 ! Former revisions: … … 52 52 53 53 INTEGER :: i, j, k 54 REAL :: precipitation_rate54 REAL :: dqdt_precip 55 55 56 56 … … 60 60 61 61 IF ( ql(k,j,i) > ql_crit ) THEN 62 precipitation_rate = prec_time_const * & 63 ( ql(k,j,i) - ql_crit ) 62 dqdt_precip = prec_time_const * ( ql(k,j,i) - ql_crit ) 64 63 ELSE 65 precipitation_rate= 0.064 dqdt_precip = 0.0 66 65 ENDIF 67 tend(k,j,i) = tend(k,j,i) + precipitation_rate * l_d_cp * & 68 pt_d_t(k) 66 tend(k,j,i) = tend(k,j,i) + dqdt_precip * l_d_cp * pt_d_t(k) 69 67 70 68 ENDDO … … 87 85 IMPLICIT NONE 88 86 89 INTEGER :: i, j, k90 REAL :: precipitation_rate87 INTEGER :: i, j, k 88 REAL :: dqdt_precip 91 89 92 90 … … 94 92 95 93 IF ( ql(k,j,i) > ql_crit ) THEN 96 precipitation_rate= prec_time_const * ( ql(k,j,i) - ql_crit )94 dqdt_precip = prec_time_const * ( ql(k,j,i) - ql_crit ) 97 95 ELSE 98 precipitation_rate= 0.096 dqdt_precip = 0.0 99 97 ENDIF 100 tend(k,j,i) = tend(k,j,i) + precipitation_rate* l_d_cp * pt_d_t(k)98 tend(k,j,i) = tend(k,j,i) + dqdt_precip * l_d_cp * pt_d_t(k) 101 99 102 100 ENDDO -
palm/trunk/SOURCE/init_3d_model.f90
r63 r72 8 8 ! ----------------- 9 9 ! New initializing action "by_user" calls user_init_3d_model, 10 ! ts_value isallocated, +module netcdf_control,10 ! precipitation_amount/rate, ts_value are allocated, +module netcdf_control, 11 11 ! initial velocities at nzb+1 are regarded for volume 12 12 ! flow control in case they have been set zero before (to avoid small timesteps) … … 40 40 USE arrays_3d 41 41 USE averaging 42 USE cloud_parameters 42 43 USE constants 43 44 USE control_parameters … … 157 158 !-- Liquid water content 158 159 ALLOCATE ( ql_1(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) ) 160 ! 161 !-- Precipitation amount and rate (only needed if output is switched) 162 ALLOCATE( precipitation_amount(nys-1:nyn+1,nxl-1:nxr+1), & 163 precipitation_rate(nys-1:nyn+1,nxl-1:nxr+1) ) 159 164 ENDIF 160 165 … … 642 647 643 648 ! 644 !-- Treating cloud physics, liquid water content is zero at beginning of 645 !-- the simulation 646 IF ( cloud_physics ) ql = 0.0 649 !-- Treating cloud physics, liquid water content and precipitation amount 650 !-- are zero at beginning of the simulation 651 IF ( cloud_physics ) THEN 652 ql = 0.0 653 IF ( precipitation ) precipitation_amount = 0.0 654 ENDIF 647 655 648 656 ! -
palm/trunk/SOURCE/modules.f90
r63 r72 5 5 ! Actual revisions: 6 6 ! ----------------- 7 ! +array rif_wall 7 ! +arrays precipitation_amount, precipitation_rate, precipitation_rate_av, 8 ! rif_wall, z0_av 8 9 ! +loop_optimization, netcdf_64bit_3d, zu_s_inner, zw_w_inner, id_var_zusi_*, 9 10 ! id_var_zwwi_*, ts_value, u_nzb_p1_for_vfc, v_nzb_p1_for_vfc, pt_reference, 10 ! use_pt_reference, 11 ! use_pt_reference, precipitation_amount_interval 11 12 ! +age_m in particle_type 12 13 ! -data_output_ts, dots_n … … 128 129 !------------------------------------------------------------------------------! 129 130 130 REAL, DIMENSION(:,:), ALLOCATABLE :: lwp_av, ts_av, us_av 131 REAL, DIMENSION(:,:), ALLOCATABLE :: lwp_av, precipitation_rate_av, & 132 ts_av, us_av, z0_av 131 133 132 134 REAL, DIMENSION(:,:,:), ALLOCATABLE, TARGET :: & … … 156 158 REAL, DIMENSION(:), ALLOCATABLE :: hydro_press, pt_d_t, t_d_pt 157 159 160 REAL, DIMENSION(:,:), ALLOCATABLE :: precipitation_amount, & 161 precipitation_rate 162 158 163 SAVE 159 164 … … 211 216 CHARACTER (LEN=8) :: run_date, run_time 212 217 CHARACTER (LEN=9) :: simulated_time_chr 213 CHARACTER (LEN=12) :: version = 'PALM 3. 1c'218 CHARACTER (LEN=12) :: version = 'PALM 3.2' 214 219 CHARACTER (LEN=16) :: loop_optimization = 'default', & 215 220 momentum_advec = 'pw-scheme', & … … 333 338 overshoot_limit_u = 0.0, overshoot_limit_v = 0.0, & 334 339 overshoot_limit_w = 0.0, particle_maximum_age = 9999999.9, & 335 phi = 55.0, prandtl_number = 1.0, pt_reference = 9999999.9, & 340 phi = 55.0, prandtl_number = 1.0, & 341 precipitation_amount_interval = 9999999.9, & 342 pt_reference = 9999999.9, & 336 343 pt_slope_offset = 0.0, pt_surface = 300.0, & 337 344 pt_surface_initial_change = 0.0, q_surface = 0.0, & -
palm/trunk/SOURCE/parin.f90
r63 r72 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! +dt_max, netcdf_64bit_3d in d3par, +loop_optimization, pt_reference in7 ! inipar, -data_output_ts6 ! +dt_max, netcdf_64bit_3d, precipitation_amount_interval in d3par, 7 ! +loop_optimization, pt_reference in inipar, -data_output_ts 8 8 ! 9 9 ! Former revisions: … … 105 105 mg_switch_to_pe0_level, netcdf_64bit, netcdf_64bit_3d, & 106 106 ngsrb, normalizing_region, nsor, nz_do3d, omega_sor, & 107 prandtl_number, profile_columns, profile_rows, psolver, & 107 prandtl_number, precipitation_amount_interval, & 108 profile_columns, profile_rows, psolver, & 108 109 rayleigh_damping_factor, rayleigh_damping_height, & 109 110 residual_limit, restart_time, section_xy, section_xz, & -
palm/trunk/SOURCE/production_e.f90
r57 r72 910 910 !-- of the eddy diffusivity by km = u* * kappa * zp / phi_m. 911 911 !$OMP PARALLEL DO PRIVATE( ku, kv ) 912 DO i = nxl, nxr 913 DO j = nys, nyn 912 DO i = nxl, nxr+1 913 DO j = nys, nyn+1 914 914 915 915 ku = nzb_u_inner(j,i)+1 -
palm/trunk/SOURCE/read_3d_binary.f90
r51 r72 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! + rif_wall6 ! +precipitation_amount, precipitation_rate_av, rif_wall, z0_av 7 7 ! 8 8 ! Former revisions: … … 29 29 USE arrays_3d 30 30 USE averaging 31 USE cloud_parameters 31 32 USE control_parameters 32 33 USE cpulog … … 219 220 ALLOCATE( pr_av(nzb:nzt+1,nys-1:nyn+1,nxl-1:nxr+1) ) 220 221 READ ( 13 ) pr_av 222 CASE ( 'precipitation_amount' ) 223 READ ( 13 ) precipitation_amount 224 CASE ( 'precipitation_rate_a' ) 225 ALLOCATE( precipitation_rate_av(nys-1:nyn+1,nxl-1:nxr+1) ) 226 READ ( 13 ) precipitation_rate_av 221 227 CASE ( 'pt' ) 222 228 READ ( 13 ) pt … … 336 342 CASE ( 'z0' ) 337 343 READ ( 13 ) z0 344 CASE ( 'z0_av' ) 345 ALLOCATE( z0_av(nys-1:nyn+1,nxl-1:nxr+1) ) 346 READ ( 13 ) z0_av 338 347 339 348 CASE ( 'cross_linecolors' ) -
palm/trunk/SOURCE/sum_up_3d_data.f90
r4 r72 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! 6 ! +sum-up of precipitation rate and roughness length (prr*, z0*) 7 7 ! 8 8 ! Former revisions: … … 80 80 pr_av = 0.0 81 81 82 CASE ( 'prr*' ) 83 IF ( .NOT. ALLOCATED( precipitation_rate_av ) ) THEN 84 ALLOCATE( precipitation_rate_av(nys-1:nyn+1,nxl-1:nxr+1) ) 85 ENDIF 86 precipitation_rate_av = 0.0 87 82 88 CASE ( 'pt' ) 83 89 IF ( .NOT. ALLOCATED( pt_av ) ) THEN … … 163 169 ENDIF 164 170 w_av = 0.0 171 172 CASE ( 'z0*' ) 173 IF ( .NOT. ALLOCATED( z0_av ) ) THEN 174 ALLOCATE( z0_av(nys-1:nyn+1,nxl-1:nxr+1) ) 175 ENDIF 176 z0_av = 0.0 165 177 166 178 CASE DEFAULT … … 239 251 ENDDO 240 252 253 CASE ( 'pr*' ) 254 DO i = nxl-1, nxr+1 255 DO j = nys-1, nyn+1 256 precipitation_rate_av(j,i) = precipitation_rate_av(j,i) + & 257 precipitation_rate(j,i) 258 ENDDO 259 ENDDO 260 241 261 CASE ( 'pt' ) 242 262 IF ( .NOT. cloud_physics ) THEN … … 372 392 ENDDO 373 393 394 CASE ( 'z0*' ) 395 DO i = nxl-1, nxr+1 396 DO j = nys-1, nyn+1 397 z0_av(j,i) = z0_av(j,i) + z0(j,i) 398 ENDDO 399 ENDDO 400 374 401 CASE DEFAULT 375 402 ! -
palm/trunk/SOURCE/write_3d_binary.f90
r51 r72 4 4 ! Actual revisions: 5 5 ! ----------------- 6 ! + rif_wall6 ! +precipitation_amount, precipitation_rate_av, rif_wall, z0_av 7 7 ! 8 8 ! Former revisions: … … 29 29 USE arrays_3d 30 30 USE averaging 31 USE cloud_parameters 31 32 USE control_parameters 32 33 USE cpulog … … 93 94 WRITE ( 14 ) 'pr_av '; WRITE ( 14 ) pr_av 94 95 ENDIF 96 IF ( ALLOCATED( precipitation_amount ) ) THEN 97 WRITE ( 14 ) 'precipitation_amount'; WRITE ( 14 ) precipitation_amount 98 ENDIF 99 IF ( ALLOCATED( precipitation_rate_av ) ) THEN 100 WRITE ( 14 ) 'precipitation_rate_a'; WRITE ( 14 ) & 101 precipitation_rate_av 102 ENDIF 95 103 WRITE ( 14 ) 'pt '; WRITE ( 14 ) pt 96 104 IF ( ALLOCATED( pt_av ) ) THEN … … 195 203 WRITE ( 14 ) 'w_m '; WRITE ( 14 ) w_m 196 204 WRITE ( 14 ) 'z0 '; WRITE ( 14 ) z0 205 IF ( ALLOCATED( z0_av ) ) THEN 206 WRITE ( 14 ) 'z0_av '; WRITE ( 14 ) z0_av 207 ENDIF 197 208 198 209 WRITE ( 14 ) 'cross_linecolors '; WRITE ( 14 ) cross_linecolors
Note: See TracChangeset
for help on using the changeset viewer.
