Changeset 3274 for palm/trunk/SOURCE/advec_ws.f90
- Timestamp:
- Sep 24, 2018 3:42:55 PM (6 years ago)
- File:
-
- 1 edited
-
palm/trunk/SOURCE/advec_ws.f90 (modified) (18 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/advec_ws.f90
r3241 r3274 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Modularization of all bulk cloud physics code components 28 ! 29 ! 3241 2018-09-12 15:02:00Z raasch 27 30 ! unused variables removed 28 31 ! … … 219 222 MODULE advec_ws 220 223 221 224 USE kinds 225 226 IMPLICIT NONE 227 228 REAL(wp) :: adv_mom_1 !< 1/4 - constant used in 5th-order advection scheme for momentum advection (1st-order part) 229 REAL(wp) :: adv_mom_3 !< 1/24 - constant used in 5th-order advection scheme for momentum advection (3rd-order part) 230 REAL(wp) :: adv_mom_5 !< 1/120 - constant used in 5th-order advection scheme for momentum advection (5th-order part) 231 REAL(wp) :: adv_sca_1 !< 1/2 - constant used in 5th-order advection scheme for scalar advection (1st-order part) 232 REAL(wp) :: adv_sca_3 !< 1/12 - constant used in 5th-order advection scheme for scalar advection (3rd-order part) 233 REAL(wp) :: adv_sca_5 !< 1/60 - constant used in 5th-order advection scheme for scalar advection (5th-order part) 222 234 223 235 PRIVATE … … 280 292 flux_s_v, flux_s_w 281 293 282 USE constants, &283 ONLY: adv_mom_1, adv_mom_3, adv_mom_5, adv_sca_1, adv_sca_3, &284 adv_sca_5285 286 294 USE control_parameters, & 287 ONLY: cloud_physics, humidity, loop_optimization, & 288 passive_scalar, microphysics_morrison, microphysics_seifert, & 289 ocean, rans_tke_e, ws_scheme_mom, ws_scheme_sca 295 ONLY: humidity, loop_optimization, passive_scalar, ocean, & 296 rans_tke_e, ws_scheme_mom, ws_scheme_sca 290 297 291 298 USE indices, & … … 293 300 294 301 USE kinds 295 302 303 USE bulk_cloud_model_mod, & 304 ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert 305 296 306 USE pegrid 297 307 … … 345 355 ENDIF 346 356 347 IF ( cloud_physics.AND. microphysics_morrison ) THEN357 IF ( bulk_cloud_model .AND. microphysics_morrison ) THEN 348 358 ALLOCATE( sums_wsqcs_ws_l(nzb:nzt+1,0:threads_per_task-1) ) 349 359 ALLOCATE( sums_wsncs_ws_l(nzb:nzt+1,0:threads_per_task-1) ) … … 352 362 ENDIF 353 363 354 IF ( cloud_physics.AND. microphysics_seifert ) THEN364 IF ( bulk_cloud_model .AND. microphysics_seifert ) THEN 355 365 ALLOCATE( sums_wsqrs_ws_l(nzb:nzt+1,0:threads_per_task-1) ) 356 366 ALLOCATE( sums_wsnrs_ws_l(nzb:nzt+1,0:threads_per_task-1) ) … … 422 432 ENDIF 423 433 424 IF ( cloud_physics.AND. microphysics_morrison ) THEN434 IF ( bulk_cloud_model .AND. microphysics_morrison ) THEN 425 435 ALLOCATE( flux_s_qc(nzb+1:nzt,0:threads_per_task-1), & 426 436 diss_s_qc(nzb+1:nzt,0:threads_per_task-1), & … … 433 443 ENDIF 434 444 435 IF ( cloud_physics.AND. microphysics_seifert ) THEN445 IF ( bulk_cloud_model .AND. microphysics_seifert ) THEN 436 446 ALLOCATE( flux_s_qr(nzb+1:nzt,0:threads_per_task-1), & 437 447 diss_s_qr(nzb+1:nzt,0:threads_per_task-1), & … … 1074 1084 1075 1085 USE control_parameters, & 1076 ONLY: cloud_physics, humidity, passive_scalar, ocean, & 1077 microphysics_morrison, microphysics_seifert, ws_scheme_mom, & 1078 ws_scheme_sca 1086 ONLY: humidity, passive_scalar, ocean, ws_scheme_mom, ws_scheme_sca 1079 1087 1080 1088 USE kinds 1089 1090 USE bulk_cloud_model_mod, & 1091 ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert 1081 1092 1082 1093 USE statistics, & … … 1104 1115 IF ( humidity ) sums_wsqs_ws_l = 0.0_wp 1105 1116 IF ( passive_scalar ) sums_wsss_ws_l = 0.0_wp 1106 IF ( cloud_physics.AND. microphysics_morrison ) THEN1117 IF ( bulk_cloud_model .AND. microphysics_morrison ) THEN 1107 1118 sums_wsqcs_ws_l = 0.0_wp 1108 1119 sums_wsncs_ws_l = 0.0_wp 1109 1120 ENDIF 1110 IF ( cloud_physics.AND. microphysics_seifert ) THEN1121 IF ( bulk_cloud_model .AND. microphysics_seifert ) THEN 1111 1122 sums_wsqrs_ws_l = 0.0_wp 1112 1123 sums_wsnrs_ws_l = 0.0_wp … … 1130 1141 USE arrays_3d, & 1131 1142 ONLY: ddzw, drho_air, tend, u, v, w, rho_air_zw 1132 1133 USE constants, &1134 ONLY: adv_sca_1, adv_sca_3, adv_sca_51135 1143 1136 1144 USE control_parameters, & … … 1704 1712 drho_air, rho_air_zw 1705 1713 1706 USE constants, &1707 ONLY: adv_mom_1, adv_mom_3, adv_mom_51708 1709 1714 USE control_parameters, & 1710 1715 ONLY: intermediate_timestep_count, u_gtrans, v_gtrans … … 2202 2207 drho_air, rho_air_zw 2203 2208 2204 USE constants, &2205 ONLY: adv_mom_1, adv_mom_3, adv_mom_52206 2207 2209 USE control_parameters, & 2208 2210 ONLY: intermediate_timestep_count, u_gtrans, v_gtrans … … 2707 2709 drho_air_zw, rho_air 2708 2710 2709 USE constants, &2710 ONLY: adv_mom_1, adv_mom_3, adv_mom_52711 2712 2711 USE control_parameters, & 2713 2712 ONLY: intermediate_timestep_count, u_gtrans, v_gtrans … … 3184 3183 USE arrays_3d, & 3185 3184 ONLY: ddzw, drho_air, tend, u, v, w, rho_air_zw 3186 3187 USE constants, &3188 ONLY: adv_sca_1, adv_sca_3, adv_sca_53189 3185 3190 3186 USE control_parameters, & … … 3740 3736 ONLY: ddzw, drho_air, tend, u, v, w, rho_air_zw 3741 3737 3742 USE constants, &3743 ONLY: adv_mom_1, adv_mom_3, adv_mom_53744 3745 3738 USE control_parameters, & 3746 3739 ONLY: intermediate_timestep_count, u_gtrans, v_gtrans … … 4234 4227 ONLY: ddzw, drho_air, tend, u, v, w, rho_air_zw 4235 4228 4236 USE constants, &4237 ONLY: adv_mom_1, adv_mom_3, adv_mom_54238 4239 4229 USE control_parameters, & 4240 4230 ONLY: intermediate_timestep_count, u_gtrans, v_gtrans … … 4738 4728 USE arrays_3d, & 4739 4729 ONLY: ddzu, drho_air_zw, tend, u, v, w, rho_air 4740 4741 USE constants, &4742 ONLY: adv_mom_1, adv_mom_3, adv_mom_54743 4730 4744 4731 USE control_parameters, &
Note: See TracChangeset
for help on using the changeset viewer.
