Changeset 4521
- Timestamp:
- May 6, 2020 11:39:49 AM (5 years ago)
- Location:
- palm/trunk/SOURCE
- Files:
-
- 6 edited
-
bulk_cloud_model_mod.f90 (modified) (47 diffs)
-
compute_vpt.f90 (modified) (3 diffs)
-
flow_statistics.f90 (modified) (3 diffs)
-
init_masks.f90 (modified) (4 diffs)
-
surface_mod.f90 (modified) (12 diffs)
-
time_integration.f90 (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
palm/trunk/SOURCE/bulk_cloud_model_mod.f90
r4517 r4521 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Rename variable 28 ! 29 ! 4517 2020-05-03 14:29:30Z raasch 27 30 ! added restart with MPI-IO for reading local arrays 28 31 ! … … 197 200 surf_bulk_cloud_model, & 198 201 surf_microphysics_morrison, surf_microphysics_seifert, & 199 surf_microphysics_ice_ extension, &202 surf_microphysics_ice_phase, & 200 203 surf_def_h, surf_def_v, surf_lsm_h, surf_lsm_v, surf_usm_h, & 201 204 surf_usm_v … … 220 223 221 224 LOGICAL :: call_microphysics_at_all_substeps = .FALSE. !< namelist parameter 222 LOGICAL :: microphysics_ice_ extension= .FALSE. !< use ice microphysics scheme225 LOGICAL :: microphysics_ice_phase = .FALSE. !< use ice microphysics scheme 223 226 LOGICAL :: microphysics_sat_adjust = .FALSE. !< use saturation adjust bulk scheme? 224 227 LOGICAL :: microphysics_kessler = .FALSE. !< use kessler bulk scheme? … … 325 328 microphysics_sat_adjust, & 326 329 microphysics_seifert, & 327 microphysics_ice_ extension, &330 microphysics_ice_phase, & 328 331 na_init, & 329 332 nc_const, & … … 454 457 ventilation_effect, & 455 458 ice_crystal_sedimentation, & 456 microphysics_ice_ extension, &459 microphysics_ice_phase, & 457 460 start_ice_microphysics, & 458 461 in_init … … 582 585 surf_microphysics_morrison = microphysics_morrison 583 586 surf_microphysics_seifert = microphysics_seifert 584 surf_microphysics_ice_ extension = microphysics_ice_extension587 surf_microphysics_ice_phase = microphysics_ice_phase 585 588 ! 586 589 !-- Check aerosol … … 629 632 630 633 CASE ( 'ni' ) 631 IF ( .NOT. microphysics_ice_ extension) THEN634 IF ( .NOT. microphysics_ice_phase ) THEN 632 635 message_string = 'output of "' // TRIM( var ) // '" ' // & 633 636 'requires ' // & 634 'microphysics_ice_ extension= ".TRUE."'637 'microphysics_ice_phase = ".TRUE."' 635 638 CALL message( 'check_parameters', 'PA0359', 1, 2, 0, 6, 0 ) 636 639 ENDIF … … 659 662 660 663 CASE ( 'qi' ) 661 IF ( .NOT. microphysics_ice_ extension) THEN664 IF ( .NOT. microphysics_ice_phase ) THEN 662 665 message_string = 'output of "' // TRIM( var ) // '" ' // & 663 666 'requires ' // & 664 'microphysics_ice_ extension= ".TRUE."'667 'microphysics_ice_phase = ".TRUE."' 665 668 CALL message( 'check_parameters', 'PA0359', 1, 2, 0, 6, 0 ) 666 669 ENDIF … … 758 761 759 762 CASE ( 'ni' ) 760 IF ( .NOT. microphysics_ice_ extension) THEN763 IF ( .NOT. microphysics_ice_phase ) THEN 761 764 message_string = 'data_output_pr = ' // & 762 765 TRIM( data_output_pr(var_count) ) // & 763 766 ' is not implemented for' // & 764 ' microphysics_ice_ extension= ".F."'767 ' microphysics_ice_phase = ".F."' 765 768 CALL message( 'check_parameters', 'PA0358', 1, 2, 0, 6, 0 ) 766 769 ENDIF … … 807 810 808 811 CASE ( 'qi' ) 809 IF ( .NOT. microphysics_ice_ extension) THEN812 IF ( .NOT. microphysics_ice_phase ) THEN 810 813 message_string = 'data_output_pr = ' // & 811 814 TRIM( data_output_pr(var_count) ) // & 812 815 ' is not implemented for' // & 813 ' microphysics_ice_ extension= ".F."'816 ' microphysics_ice_phase = ".F."' 814 817 CALL message( 'check_parameters', 'PA0358', 1, 2, 0, 6, 0 ) 815 818 ENDIF … … 894 897 ENDIF 895 898 896 IF ( microphysics_ice_ extension) THEN899 IF ( microphysics_ice_phase ) THEN 897 900 ! 898 901 !-- 3D-cloud drop water content, cloud drop concentration arrays … … 918 921 sums_wsnrs_ws_l = 0.0_wp 919 922 ENDIF 920 IF ( microphysics_ice_ extension) THEN923 IF ( microphysics_ice_phase ) THEN 921 924 ALLOCATE( sums_wsqis_ws_l(nzb:nzt+1,0:threads_per_task-1) ) 922 925 ALLOCATE( sums_wsnis_ws_l(nzb:nzt+1,0:threads_per_task-1) ) … … 953 956 diss_l_nr(nzb+1:nzt,nys:nyn,0:threads_per_task-1) ) 954 957 ENDIF 955 IF ( microphysics_ice_ extension) THEN958 IF ( microphysics_ice_phase ) THEN 956 959 ALLOCATE( flux_s_qi(nzb+1:nzt,0:threads_per_task-1), & 957 960 diss_s_qi(nzb+1:nzt,0:threads_per_task-1), & … … 980 983 nr => nr_1; nr_p => nr_2; tnr_m => nr_3 981 984 ENDIF 982 IF ( microphysics_ice_ extension) THEN985 IF ( microphysics_ice_phase ) THEN 983 986 qi => qi_1; qi_p => qi_2; tqi_m => qi_3 984 987 ni => ni_1; ni_p => ni_2; tni_m => ni_3 … … 1027 1030 ! 1028 1031 !-- Initialize the remaining quantities 1029 IF ( microphysics_ice_ extension) THEN1032 IF ( microphysics_ice_phase ) THEN 1030 1033 DO i = nxlg, nxrg 1031 1034 DO j = nysg, nyng … … 1056 1059 nr_p = nr 1057 1060 ENDIF 1058 IF ( microphysics_ice_ extension) THEN1061 IF ( microphysics_ice_phase ) THEN 1059 1062 tqi_m = 0.0_wp 1060 1063 tni_m = 0.0_wp … … 1203 1206 sums_wsnrs_ws_l = 0.0_wp 1204 1207 ENDIF 1205 IF ( microphysics_ice_ extension) THEN1208 IF ( microphysics_ice_phase ) THEN 1206 1209 sums_wsqis_ws_l = 0.0_wp 1207 1210 sums_wsnis_ws_l = 0.0_wp … … 1247 1250 sums_wsnrs_ws_l = 0.0_wp 1248 1251 ENDIF 1249 IF ( microphysics_ice_ extension) THEN1252 IF ( microphysics_ice_phase ) THEN 1250 1253 sums_wsqis_ws_l = 0.0_wp 1251 1254 sums_wsnis_ws_l = 0.0_wp … … 1319 1322 ELSEIF ( microphysics_seifert .AND. .NOT. microphysics_morrison ) THEN 1320 1323 CALL adjust_cloud 1321 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1324 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1322 1325 CALL ice_nucleation 1323 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1326 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1324 1327 CALL ice_deposition 1325 1328 CALL autoconversion … … 1329 1332 CALL sedimentation_rain 1330 1333 IF ( cloud_water_sedimentation ) CALL sedimentation_cloud 1331 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1334 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1332 1335 CALL adjust_ice 1333 IF ( ice_crystal_sedimentation .AND. microphysics_ice_ extension&1336 IF ( ice_crystal_sedimentation .AND. microphysics_ice_phase & 1334 1337 .AND. simulated_time > start_ice_microphysics ) CALL sedimentation_ice 1335 1338 … … 1340 1343 CALL activation 1341 1344 CALL condensation 1342 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1345 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1343 1346 CALL adjust_ice 1344 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1347 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1345 1348 CALL ice_nucleation 1346 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1349 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1347 1350 CALL ice_deposition 1348 1351 IF ( cloud_water_sedimentation ) CALL sedimentation_cloud … … 1355 1358 CALL activation 1356 1359 CALL condensation 1357 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1360 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1358 1361 CALL adjust_ice 1359 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1362 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1360 1363 CALL ice_nucleation 1361 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1364 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1362 1365 CALL ice_deposition 1363 1366 CALL autoconversion … … 1434 1437 ELSEIF ( microphysics_seifert .AND. .NOT. microphysics_morrison ) THEN 1435 1438 CALL adjust_cloud_ij( i,j ) 1436 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1439 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1437 1440 CALL ice_nucleation_ij( i,j ) 1438 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1441 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1439 1442 CALL ice_deposition_ij( i,j ) 1440 1443 CALL autoconversion_ij( i,j ) … … 1444 1447 CALL sedimentation_rain_ij( i,j ) 1445 1448 IF ( cloud_water_sedimentation ) CALL sedimentation_cloud_ij( i,j ) 1446 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1449 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1447 1450 CALL adjust_ice_ij ( i,j ) 1448 IF ( ice_crystal_sedimentation .AND. microphysics_ice_ extension&1451 IF ( ice_crystal_sedimentation .AND. microphysics_ice_phase & 1449 1452 .AND. simulated_time > start_ice_microphysics ) CALL sedimentation_ice_ij ( i,j ) 1450 1453 ! … … 1454 1457 CALL activation_ij( i,j ) 1455 1458 CALL condensation_ij( i,j ) 1456 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1459 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1457 1460 CALL adjust_ice_ij ( i,j ) 1458 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1461 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1459 1462 CALL ice_nucleation_ij( i,j ) 1460 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1463 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1461 1464 CALL ice_deposition_ij( i,j ) 1462 1465 IF ( cloud_water_sedimentation ) CALL sedimentation_cloud_ij( i,j ) … … 1469 1472 CALL activation_ij( i,j ) 1470 1473 CALL condensation_ij( i,j ) 1471 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1474 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1472 1475 CALL adjust_ice_ij ( i,j ) 1473 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1476 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1474 1477 CALL ice_nucleation_ij( i,j ) 1475 IF ( microphysics_ice_ extension.AND. simulated_time > start_ice_microphysics ) &1478 IF ( microphysics_ice_phase .AND. simulated_time > start_ice_microphysics ) & 1476 1479 CALL ice_deposition_ij( i,j ) 1477 1480 CALL autoconversion_ij( i,j ) … … 1514 1517 CALL exchange_horiz( nr, nbgp ) 1515 1518 ENDIF 1516 IF ( microphysics_ice_ extension) THEN1519 IF ( microphysics_ice_phase ) THEN 1517 1520 CALL exchange_horiz( qi, nbgp ) 1518 1521 CALL exchange_horiz( ni, nbgp ) … … 1736 1739 !-- If required, calculate prognostic equations for ice crystal content 1737 1740 !-- and ice crystal concentration 1738 IF ( microphysics_ice_ extension) THEN1741 IF ( microphysics_ice_phase ) THEN 1739 1742 1740 1743 CALL cpu_log( log_point(70), 'qi-equation', 'start' ) … … 2262 2265 !-- If required, calculate prognostic equations for ice crystal mixing ratio 2263 2266 !-- and ice crystal concentration 2264 IF ( microphysics_ice_ extension) THEN2267 IF ( microphysics_ice_phase ) THEN 2265 2268 ! 2266 2269 !-- Calculate prognostic equation for ice crystal mixing ratio … … 2537 2540 nr => nr_1; nr_p => nr_2 2538 2541 ENDIF 2539 IF ( microphysics_ice_ extension) THEN2542 IF ( microphysics_ice_phase ) THEN 2540 2543 qi => qi_1; qi_p => qi_2 2541 2544 ni => ni_1; ni_p => ni_2 … … 2552 2555 nr => nr_2; nr_p => nr_1 2553 2556 ENDIF 2554 IF ( microphysics_ice_ extension) THEN2557 IF ( microphysics_ice_phase ) THEN 2555 2558 qi => qi_2; qi_p => qi_1 2556 2559 ni => ni_2; ni_p => ni_1 … … 2601 2604 ENDIF 2602 2605 2603 IF ( microphysics_ice_ extension) THEN2606 IF ( microphysics_ice_phase ) THEN 2604 2607 ! 2605 2608 !-- Surface conditions ice crysral (Dirichlet) … … 2661 2664 nr_p(:,nys-1,:) = nr_p(:,nys,:) 2662 2665 ENDIF 2663 IF ( microphysics_ice_ extension) THEN2666 IF ( microphysics_ice_phase ) THEN 2664 2667 qi_p(:,nys-1,:) = qi_p(:,nys,:) 2665 2668 ni_p(:,nys-1,:) = ni_p(:,nys,:) … … 2674 2677 nr_p(:,nyn+1,:) = nr_p(:,nyn,:) 2675 2678 ENDIF 2676 IF ( microphysics_ice_ extension) THEN2679 IF ( microphysics_ice_phase ) THEN 2677 2680 qi_p(:,nyn+1,:) = qi_p(:,nyn,:) 2678 2681 ni_p(:,nyn+1,:) = ni_p(:,nyn,:) … … 2687 2690 nr_p(:,:,nxl-1) = nr_p(:,:,nxl) 2688 2691 ENDIF 2689 IF ( microphysics_ice_ extension) THEN2692 IF ( microphysics_ice_phase ) THEN 2690 2693 qi_p(:,:,nxl-1) = qi_p(:,:,nxl) 2691 2694 ni_p(:,:,nxl-1) = ni_p(:,:,nxl) … … 2700 2703 nr_p(:,:,nxr+1) = nr_p(:,:,nxr) 2701 2704 ENDIF 2702 IF ( microphysics_ice_ extension) THEN2705 IF ( microphysics_ice_phase ) THEN 2703 2706 qi_p(:,:,nxr+1) = qi_p(:,:,nxr) 2704 2707 ni_p(:,:,nxr+1) = ni_p(:,:,nxr) … … 3345 3348 READ ( 13 ) curvature_solution_effects_bulk 3346 3349 3347 CASE ( 'microphysics_ice_ extension' )3348 READ ( 13 ) microphysics_ice_ extension3350 CASE ( 'microphysics_ice_phase' ) 3351 READ ( 13 ) microphysics_ice_phase 3349 3352 3350 3353 CASE ( 'ice_crystal_sedimentation' ) … … 3389 3392 CALL rrd_mpi_io( 'curvature_solution_effects_bulk', curvature_solution_effects_bulk ) 3390 3393 CALL rrd_mpi_io( 'start_ice_microphysics', start_ice_microphysics ) 3391 CALL rrd_mpi_io( 'microphysics_ice_ extension', microphysics_ice_extension)3394 CALL rrd_mpi_io( 'microphysics_ice_phase', microphysics_ice_phase ) 3392 3395 CALL rrd_mpi_io( 'in_init', in_init ) 3393 3396 CALL rrd_mpi_io( 'ice_crystal_sedimentation', ice_crystal_sedimentation ) … … 3642 3645 ENDIF 3643 3646 3644 IF ( microphysics_ice_ extension) THEN3647 IF ( microphysics_ice_phase ) THEN 3645 3648 3646 3649 CALL rrd_mpi_io( 'ni', ni ) … … 3724 3727 WRITE ( 14 ) start_ice_microphysics 3725 3728 3726 CALL wrd_write_string( 'microphysics_ice_ extension' )3727 WRITE ( 14 ) microphysics_ice_ extension3729 CALL wrd_write_string( 'microphysics_ice_phase' ) 3730 WRITE ( 14 ) microphysics_ice_phase 3728 3731 3729 3732 CALL wrd_write_string( 'in_init' ) … … 3750 3753 CALL wrd_mpi_io( 'curvature_solution_effects_bulk', curvature_solution_effects_bulk ) 3751 3754 CALL wrd_mpi_io( 'start_ice_microphysics', start_ice_microphysics ) 3752 CALL wrd_mpi_io( 'microphysics_ice_ extension', microphysics_ice_extension)3755 CALL wrd_mpi_io( 'microphysics_ice_phase', microphysics_ice_phase ) 3753 3756 CALL wrd_mpi_io( 'in_init', in_init ) 3754 3757 CALL wrd_mpi_io( 'ice_crystal_sedimentation', ice_crystal_sedimentation ) … … 3815 3818 ENDIF 3816 3819 3817 IF ( microphysics_ice_ extension) THEN3820 IF ( microphysics_ice_phase ) THEN 3818 3821 3819 3822 CALL wrd_write_string( 'ni' ) … … 3877 3880 IF ( ALLOCATED( qr_av ) ) CALL wrd_mpi_io( 'qr_av', qr_av ) 3878 3881 ENDIF 3879 IF ( microphysics_ice_ extension) THEN3882 IF ( microphysics_ice_phase ) THEN 3880 3883 CALL wrd_mpi_io( 'ni', ni ) 3881 3884 IF ( ALLOCATED( ni_av ) ) CALL wrd_mpi_io( 'ni_av', ni_av ) … … 4452 4455 !-- Actual temperature, t_l is calculated directly before 4453 4456 !-- in supersaturation 4454 IF ( microphysics_ice_ extension) THEN4457 IF ( microphysics_ice_phase ) THEN 4455 4458 temp = t_l + lv_d_cp * ql(k,j,i) + ls_d_cp * qi(k,j,i) 4456 4459 ELSE … … 4539 4542 !-- Actual temperature, t_l is calculated directly before 4540 4543 !-- in supersaturation 4541 IF ( microphysics_ice_ extension) THEN4544 IF ( microphysics_ice_phase ) THEN 4542 4545 temp = t_l + lv_d_cp * ql(k,j,i) + ls_d_cp * qi(k,j,i) 4543 4546 ELSE … … 6551 6554 q_s = q_s * ( 1.0_wp + alpha * q(k,j,i) ) / ( 1.0_wp + alpha * q_s ) 6552 6555 6553 IF ( .NOT. microphysics_ice_ extension) THEN6556 IF ( .NOT. microphysics_ice_phase ) THEN 6554 6557 IF ( microphysics_seifert ) THEN 6555 6558 sat = ( q(k,j,i) - qr(k,j,i) - qc(k,j,i) ) / q_s - 1.0_wp … … 6633 6636 ! 6634 6637 !-- Compute the liquid water content 6635 IF ( .NOT. microphysics_ice_ extension) THEN6638 IF ( .NOT. microphysics_ice_phase ) THEN 6636 6639 IF ( microphysics_seifert .AND. .NOT. & 6637 6640 microphysics_morrison ) THEN -
palm/trunk/SOURCE/compute_vpt.f90
r4502 r4521 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Rename variable 28 ! 29 ! 4502 2020-04-17 16:14:16Z schwenkel 27 30 ! Implementation of ice microphysics 28 31 ! … … 59 62 60 63 USE bulk_cloud_model_mod, & 61 ONLY: bulk_cloud_model, microphysics_ice_ extension64 ONLY: bulk_cloud_model, microphysics_ice_phase 62 65 63 66 IMPLICIT NONE … … 67 70 IF ( .NOT. bulk_cloud_model .AND. .NOT. cloud_droplets ) THEN 68 71 vpt = pt * ( 1.0_wp + 0.61_wp * q ) 69 ELSEIF ( bulk_cloud_model .AND. .NOT. microphysics_ice_ extension) THEN72 ELSEIF ( bulk_cloud_model .AND. .NOT. microphysics_ice_phase ) THEN 70 73 DO k = nzb, nzt+1 71 74 vpt(k,:,:) = ( pt(k,:,:) + d_exner(k) * lv_d_cp * ql(k,:,:) ) * & 72 75 ( 1.0_wp + 0.61_wp * q(k,:,:) - 1.61_wp * ql(k,:,:) ) 73 76 ENDDO 74 ELSEIF ( bulk_cloud_model .AND. microphysics_ice_ extension) THEN77 ELSEIF ( bulk_cloud_model .AND. microphysics_ice_phase ) THEN 75 78 DO k = nzb, nzt+1 76 79 vpt(k,:,:) = ( pt(k,:,:) + d_exner(k) * lv_d_cp * ql(k,:,:) + & -
palm/trunk/SOURCE/flow_statistics.f90
r4502 r4521 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Rename variable 28 ! 29 ! 4502 2020-04-17 16:14:16Z schwenkel 27 30 ! Implementation of ice microphysics 28 31 ! … … 97 100 USE bulk_cloud_model_mod, & 98 101 ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert, & 99 microphysics_ice_ extension102 microphysics_ice_phase 100 103 101 104 USE chem_modules, & … … 1418 1421 flag 1419 1422 ENDIF 1420 IF ( microphysics_ice_ extension) THEN1423 IF ( microphysics_ice_phase ) THEN 1421 1424 sums_l(k,124,tn) = sums_l(k,124,tn) + ni(k,j,i) * & 1422 1425 rmask(j,i,sr) *& -
palm/trunk/SOURCE/init_masks.f90
r4502 r4521 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Rename variable 28 ! 29 ! 4502 2020-04-17 16:14:16Z schwenkel 27 30 ! Implementation of ice microphysics 28 31 ! … … 62 65 USE bulk_cloud_model_mod, & 63 66 ONLY: bulk_cloud_model, microphysics_morrison, microphysics_seifert, & 64 microphysics_ice_ extension67 microphysics_ice_phase 65 68 66 69 USE control_parameters, & … … 277 280 '" requires bulk_cloud_model = .TRUE.' 278 281 CALL message( 'init_masks', 'PA0108', 1, 2, 0, 6, 0 ) 279 ELSEIF ( .NOT. microphysics_ice_ extension) THEN282 ELSEIF ( .NOT. microphysics_ice_phase ) THEN 280 283 message_string = 'output of "' // TRIM( var ) // '" ' // & 281 'requires microphysics_ice_ extension= .TRUE.'284 'requires microphysics_ice_phase = .TRUE.' 282 285 CALL message( 'check_parameters', 'PA0359', 1, 2, 0, 6, 0 ) 283 286 ENDIF … … 355 358 'requires bulk_cloud_model = .TRUE.' 356 359 CALL message( 'check_parameters', 'PA0108', 1, 2, 0, 6, 0 ) 357 ELSEIF ( .NOT. microphysics_ice_ extension) THEN360 ELSEIF ( .NOT. microphysics_ice_phase ) THEN 358 361 message_string = 'output of "' // TRIM( var ) // '" ' // & 359 'requires microphysics_ice_ extension= .TRUE.'362 'requires microphysics_ice_phase = .TRUE.' 360 363 CALL message( 'check_parameters', 'PA0359', 1, 2, 0, 6, 0 ) 361 364 ENDIF -
palm/trunk/SOURCE/surface_mod.f90
r4517 r4521 26 26 ! ----------------- 27 27 ! $Id$ 28 ! Rename variable 29 ! 30 ! 4517 2020-05-03 14:29:30Z raasch 28 31 ! added restart with MPI-IO for reading local arrays 29 32 ! … … 479 482 LOGICAL :: surf_microphysics_morrison = .FALSE. !< use 2-moment Morrison (add. prog. eq. for nc and qc) 480 483 LOGICAL :: surf_microphysics_seifert = .FALSE. !< use 2-moment Seifert and Beheng scheme 481 LOGICAL :: surf_microphysics_ice_ extension= .FALSE. !< use 2-moment Seifert and Beheng scheme484 LOGICAL :: surf_microphysics_ice_phase = .FALSE. !< use 2-moment Seifert and Beheng scheme 482 485 483 486 … … 535 538 surf_def_h, surf_def_v, surf_lsm_h, surf_lsm_v, surf_usm_h, surf_usm_v, surf_type, & 536 539 vertical_surfaces_exist, surf_bulk_cloud_model, surf_microphysics_morrison, & 537 surf_microphysics_seifert, surf_microphysics_ice_ extension540 surf_microphysics_seifert, surf_microphysics_ice_phase 538 541 ! 539 542 !-- Public subroutines and functions … … 1315 1318 ! 1316 1319 !-- 1317 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_ extension) THEN1320 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_phase) THEN 1318 1321 DEALLOCATE ( surfaces%qis ) 1319 1322 DEALLOCATE ( surfaces%nis ) … … 1452 1455 ! 1453 1456 !-- 1454 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_ extension) THEN1457 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_phase) THEN 1455 1458 ALLOCATE ( surfaces%qis(1:surfaces%ns) ) 1456 1459 ALLOCATE ( surfaces%nis(1:surfaces%ns) ) … … 1611 1614 ! 1612 1615 !-- 1613 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_ extension) THEN1616 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_phase) THEN 1614 1617 DEALLOCATE ( surfaces%qisws ) 1615 1618 DEALLOCATE ( surfaces%nisws ) … … 1690 1693 ! 1691 1694 !-- 1692 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_ extension) THEN1695 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_phase) THEN 1693 1696 ALLOCATE ( surfaces%qisws(1:surfaces%ns) ) 1694 1697 ALLOCATE ( surfaces%nisws(1:surfaces%ns) ) … … 1875 1878 ENDIF 1876 1879 1877 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_ extension) THEN1880 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_phase) THEN 1878 1881 DEALLOCATE ( surfaces%qis ) 1879 1882 DEALLOCATE ( surfaces%nis ) … … 2008 2011 ENDIF 2009 2012 2010 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_ extension) THEN2013 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_phase) THEN 2011 2014 ALLOCATE ( surfaces%qis(1:surfaces%ns) ) 2012 2015 ALLOCATE ( surfaces%nis(1:surfaces%ns) ) … … 2657 2660 ENDIF 2658 2661 2659 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_ extension) THEN2662 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_phase) THEN 2660 2663 surf%qis(num_h) = 0.0_wp 2661 2664 surf%nis(num_h) = 0.0_wp … … 2838 2841 surf%qrsws(num_h) = 0.0_wp 2839 2842 ENDIF 2840 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_ extension) THEN2843 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_phase ) THEN 2841 2844 surf%nisws(num_h) = 0.0_wp 2842 2845 surf%qisws(num_h) = 0.0_wp … … 2982 2985 surf%nrsws(num_v) = 0.0_wp 2983 2986 ENDIF 2984 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_ extension) THEN2987 IF ( surf_bulk_cloud_model .AND. surf_microphysics_ice_phase) THEN 2985 2988 surf%qis(num_v) = 0.0_wp 2986 2989 surf%nis(num_v) = 0.0_wp -
palm/trunk/SOURCE/time_integration.f90
r4511 r4521 25 25 ! ----------------- 26 26 ! $Id$ 27 ! Rename variable 28 ! 29 ! 4511 2020-04-30 12:20:40Z raasch 27 30 ! chemistry decycling replaced by explicit setting of lateral boundary conditions 28 31 ! … … 233 236 USE bulk_cloud_model_mod, & 234 237 ONLY: bulk_cloud_model, calc_liquid_water_content, collision_turbulence, & 235 microphysics_ice_ extension, microphysics_morrison, microphysics_seifert238 microphysics_ice_phase, microphysics_morrison, microphysics_seifert 236 239 237 240 USE calc_mean_profile_mod, & … … 808 811 CALL exchange_horiz( nr_p, nbgp ) 809 812 ENDIF 810 IF ( bulk_cloud_model .AND. microphysics_ice_ extension) THEN813 IF ( bulk_cloud_model .AND. microphysics_ice_phase ) THEN 811 814 CALL exchange_horiz( qi_p, nbgp ) 812 815 CALL exchange_horiz( ni_p, nbgp ) … … 907 910 CALL exchange_horiz( nr, nbgp ) 908 911 ENDIF 909 IF ( bulk_cloud_model .AND. microphysics_ice_ extension) THEN912 IF ( bulk_cloud_model .AND. microphysics_ice_phase ) THEN 910 913 CALL exchange_horiz( qi, nbgp ) 911 914 CALL exchange_horiz( ni, nbgp )
Note: See TracChangeset
for help on using the changeset viewer.
