Changeset 3870 for palm/trunk/SOURCE/advec_ws.f90
- Timestamp:
- Apr 8, 2019 1:44:34 PM (5 years ago)
- File:
-
- 1 edited
-
palm/trunk/SOURCE/advec_ws.f90 (modified) (10 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/advec_ws.f90
r3864 r3870 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Moving initialization of bcm specific flux arrays into bulk_cloud_model_mod 28 ! 29 ! 3864 2019-04-05 09:01:56Z monakurppa 27 30 ! Remove tailing white spaces 28 31 ! … … 325 328 326 329 USE arrays_3d, & 327 ONLY: diss_l_diss, diss_l_e, diss_l_ nc, diss_l_nr, diss_l_pt, &328 diss_l_q, diss_l_ qc, diss_l_qr, diss_l_s, diss_l_sa, &330 ONLY: diss_l_diss, diss_l_e, diss_l_pt, & 331 diss_l_q, diss_l_s, diss_l_sa, & 329 332 diss_l_u, diss_l_v, diss_l_w, flux_l_diss, flux_l_e, & 330 flux_l_ nc, flux_l_nr, flux_l_pt, flux_l_q, flux_l_qc,&331 flux_l_ qr, flux_l_s, flux_l_sa, flux_l_u, flux_l_v, &332 flux_l_w, diss_s_diss, diss_s_e, diss_s_nc, diss_s_nr,&333 diss_s_pt, diss_s_q, diss_s_ qc, diss_s_qr, diss_s_s, &333 flux_l_pt, flux_l_q, & 334 flux_l_s, flux_l_sa, flux_l_u, flux_l_v, & 335 flux_l_w, diss_s_diss, diss_s_e, & 336 diss_s_pt, diss_s_q, diss_s_s, & 334 337 diss_s_sa, diss_s_u, diss_s_v, diss_s_w, flux_s_diss, & 335 flux_s_e, flux_s_ nc, flux_s_nr, flux_s_pt, flux_s_q, &336 flux_s_ qc, flux_s_qr, flux_s_s, flux_s_sa, flux_s_u, &338 flux_s_e, flux_s_pt, flux_s_q, & 339 flux_s_s, flux_s_sa, flux_s_u, & 337 340 flux_s_v, flux_s_w 338 341 … … 346 349 USE kinds 347 350 348 USE bulk_cloud_model_mod, &349 ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert350 351 351 USE pegrid 352 352 … … 355 355 356 356 USE statistics, & 357 ONLY: sums_us2_ws_l, sums_vs2_ws_l, sums_ws2_ws_l, sums_wsncs_ws_l,&358 sums_ws nrs_ws_l,sums_wspts_ws_l, sums_wsqcs_ws_l, &359 sums_wsq rs_ws_l, sums_wsqs_ws_l, sums_wsss_ws_l, &357 ONLY: sums_us2_ws_l, sums_vs2_ws_l, sums_ws2_ws_l,& 358 sums_wspts_ws_l, & 359 sums_wsqs_ws_l, sums_wsss_ws_l, & 360 360 sums_wssas_ws_l, sums_wsss_ws_l, sums_wsus_ws_l, & 361 361 sums_wsvs_ws_l … … 397 397 sums_wsqs_ws_l = 0.0_wp 398 398 ENDIF 399 399 400 400 IF ( passive_scalar ) THEN 401 401 ALLOCATE( sums_wsss_ws_l(nzb:nzt+1,0:threads_per_task-1) ) 402 402 sums_wsss_ws_l = 0.0_wp 403 ENDIF404 405 IF ( bulk_cloud_model .AND. microphysics_morrison ) THEN406 ALLOCATE( sums_wsqcs_ws_l(nzb:nzt+1,0:threads_per_task-1) )407 ALLOCATE( sums_wsncs_ws_l(nzb:nzt+1,0:threads_per_task-1) )408 sums_wsqcs_ws_l = 0.0_wp409 sums_wsncs_ws_l = 0.0_wp410 ENDIF411 412 IF ( bulk_cloud_model .AND. microphysics_seifert ) THEN413 ALLOCATE( sums_wsqrs_ws_l(nzb:nzt+1,0:threads_per_task-1) )414 ALLOCATE( sums_wsnrs_ws_l(nzb:nzt+1,0:threads_per_task-1) )415 sums_wsqrs_ws_l = 0.0_wp416 sums_wsnrs_ws_l = 0.0_wp417 403 ENDIF 418 404 … … 477 463 diss_l_q(nzb+1:nzt,nys:nyn,0:threads_per_task-1) ) 478 464 ENDIF 479 465 480 466 IF ( passive_scalar ) THEN 481 467 ALLOCATE( flux_s_s(nzb+1:nzt,0:threads_per_task-1), & … … 483 469 ALLOCATE( flux_l_s(nzb+1:nzt,nys:nyn,0:threads_per_task-1), & 484 470 diss_l_s(nzb+1:nzt,nys:nyn,0:threads_per_task-1) ) 485 ENDIF486 487 IF ( bulk_cloud_model .AND. microphysics_morrison ) THEN488 ALLOCATE( flux_s_qc(nzb+1:nzt,0:threads_per_task-1), &489 diss_s_qc(nzb+1:nzt,0:threads_per_task-1), &490 flux_s_nc(nzb+1:nzt,0:threads_per_task-1), &491 diss_s_nc(nzb+1:nzt,0:threads_per_task-1) )492 ALLOCATE( flux_l_qc(nzb+1:nzt,nys:nyn,0:threads_per_task-1), &493 diss_l_qc(nzb+1:nzt,nys:nyn,0:threads_per_task-1), &494 flux_l_nc(nzb+1:nzt,nys:nyn,0:threads_per_task-1), &495 diss_l_nc(nzb+1:nzt,nys:nyn,0:threads_per_task-1) )496 ENDIF497 498 IF ( bulk_cloud_model .AND. microphysics_seifert ) THEN499 ALLOCATE( flux_s_qr(nzb+1:nzt,0:threads_per_task-1), &500 diss_s_qr(nzb+1:nzt,0:threads_per_task-1), &501 flux_s_nr(nzb+1:nzt,0:threads_per_task-1), &502 diss_s_nr(nzb+1:nzt,0:threads_per_task-1) )503 ALLOCATE( flux_l_qr(nzb+1:nzt,nys:nyn,0:threads_per_task-1), &504 diss_l_qr(nzb+1:nzt,nys:nyn,0:threads_per_task-1), &505 flux_l_nr(nzb+1:nzt,nys:nyn,0:threads_per_task-1), &506 diss_l_nr(nzb+1:nzt,nys:nyn,0:threads_per_task-1) )507 471 ENDIF 508 472 … … 1140 1104 ws_scheme_sca, salsa 1141 1105 1142 USE kinds 1143 1144 USE bulk_cloud_model_mod, & 1145 ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert 1106 USE kinds 1146 1107 1147 1108 USE salsa_util_mod, & … … 1149 1110 1150 1111 USE statistics, & 1151 ONLY: sums_us2_ws_l, sums_vs2_ws_l, sums_ws2_ws_l, sums_wsncs_ws_l,&1152 sums_ws nrs_ws_l, sums_wspts_ws_l, sums_wsqcs_ws_l, &1153 sums_wsq rs_ws_l, sums_wsqs_ws_l, sums_wsss_ws_l, &1112 ONLY: sums_us2_ws_l, sums_vs2_ws_l, sums_ws2_ws_l, & 1113 sums_wspts_ws_l, & 1114 sums_wsqs_ws_l, sums_wsss_ws_l, & 1154 1115 sums_wssas_ws_l, sums_wsus_ws_l, sums_wsvs_ws_l 1155 1116 … … 1177 1138 IF ( humidity ) sums_wsqs_ws_l = 0.0_wp 1178 1139 IF ( passive_scalar ) sums_wsss_ws_l = 0.0_wp 1179 IF ( bulk_cloud_model .AND. microphysics_morrison ) THEN1180 sums_wsqcs_ws_l = 0.0_wp1181 sums_wsncs_ws_l = 0.0_wp1182 ENDIF1183 IF ( bulk_cloud_model .AND. microphysics_seifert ) THEN1184 sums_wsqrs_ws_l = 0.0_wp1185 sums_wsnrs_ws_l = 0.0_wp1186 ENDIF1187 1140 IF ( ocean_mode ) sums_wssas_ws_l = 0.0_wp 1188 1141 IF ( salsa ) sums_salsa_ws_l = 0.0_wp
Note: See TracChangeset
for help on using the changeset viewer.
