Skip to content

Commit 72c51fc

Browse files
climbfujiclimbfuji
authored
Merge pull request #2 from mzhangw/HAFS_fer_hires
add Ferrier-Aligo MP scheme changes on host model side
2 parents 332fb61 + dc11553 commit 72c51fc

File tree

4 files changed

+368
-18
lines changed

4 files changed

+368
-18
lines changed

‎ccpp/config/ccpp_prebuild_config.py

+11
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
'FV3/ccpp/physics/physics/module_mp_radar.F90',
9494
'FV3/ccpp/physics/physics/module_mp_thompson.F90',
9595
'FV3/ccpp/physics/physics/module_mp_thompson_make_number_concentrations.F90',
96+
'FV3/ccpp/physics/physics/module_MP_FER_HIRES.F90',
9697
'FV3/ccpp/physics/physics/module_bl_mynn.F90',
9798
'FV3/ccpp/physics/physics/module_sf_mynn.F90',
9899
'FV3/ccpp/physics/physics/module_SF_JSFC.F90',
@@ -235,6 +236,8 @@
235236
'FV3/ccpp/physics/physics/sfc_nst.f' : [ 'slow_physics' ],
236237
'FV3/ccpp/physics/physics/sfc_ocean.F' : [ 'slow_physics' ],
237238
'FV3/ccpp/physics/physics/sfc_sice.f' : [ 'slow_physics' ],
239+
# HAFS FER_HIRES
240+
'FV3/ccpp/physics/physics/mp_fer_hires.F90' : [ 'slow_physics' ],
238241
# for testing the <init> and <finalize> sections
239242
'FV3/ccpp/physics/physics/GFS_suite_init_finalize_test.F90' : [ 'slow_physics' ],
240243
}
@@ -322,6 +325,14 @@
322325
'tendency_of_ice_friendly_aerosols_at_surface',
323326
],
324327
},
328+
'mp_fer_hires' : {
329+
'mp_fer_hires_init' : [
330+
'fraction_of_ice_water_cloud',
331+
'fraction_of_rain_water_cloud',
332+
'rime_factor',
333+
],
334+
},
335+
325336
#'subroutine_name_1' : 'all',
326337
#'subroutine_name_2' : 'none',
327338
#'subroutine_name_2' : [ 'var1', 'var3'],

‎ccpp/suites/suite_FV3_HAFS_ferhires_update_moist.xml

+87
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<suite name="FV3_HAFS_ferhires_update_moist" lib="ccppphys" ver="3">
4+
<!-- <init></init> -->
5+
<group name="time_vary">
6+
<subcycle loop="1">
7+
<scheme>GFS_time_vary_pre</scheme>
8+
<scheme>GFS_rrtmg_setup</scheme>
9+
<scheme>GFS_rad_time_vary</scheme>
10+
<scheme>GFS_phys_time_vary</scheme>
11+
</subcycle>
12+
</group>
13+
<group name="radiation">
14+
<subcycle loop="1">
15+
<scheme>GFS_suite_interstitial_rad_reset</scheme>
16+
<scheme>GFS_rrtmg_pre</scheme>
17+
<scheme>rrtmg_sw_pre</scheme>
18+
<scheme>rrtmg_sw</scheme>
19+
<scheme>rrtmg_sw_post</scheme>
20+
<scheme>rrtmg_lw_pre</scheme>
21+
<scheme>rrtmg_lw</scheme>
22+
<scheme>rrtmg_lw_post</scheme>
23+
<scheme>GFS_rrtmg_post</scheme>
24+
</subcycle>
25+
</group>
26+
<group name="physics">
27+
<subcycle loop="1">
28+
<scheme>GFS_suite_interstitial_phys_reset</scheme>
29+
<scheme>GFS_suite_stateout_reset</scheme>
30+
<scheme>get_prs_fv3</scheme>
31+
<scheme>GFS_suite_interstitial_1</scheme>
32+
<scheme>GFS_surface_generic_pre</scheme>
33+
<scheme>GFS_surface_composites_pre</scheme>
34+
<scheme>dcyc2t3</scheme>
35+
<scheme>GFS_surface_composites_inter</scheme>
36+
<scheme>GFS_suite_interstitial_2</scheme>
37+
</subcycle>
38+
<!-- Surface iteration loop -->
39+
<subcycle loop="2">
40+
<scheme>sfc_diff</scheme>
41+
<scheme>GFS_surface_loop_control_part1</scheme>
42+
<scheme>sfc_nst_pre</scheme>
43+
<scheme>sfc_nst</scheme>
44+
<scheme>sfc_nst_post</scheme>
45+
<scheme>lsm_noah</scheme>
46+
<scheme>sfc_sice</scheme>
47+
<scheme>GFS_surface_loop_control_part2</scheme>
48+
</subcycle>
49+
<!-- End of surface iteration loop -->
50+
<subcycle loop="1">
51+
<scheme>GFS_surface_composites_post</scheme>
52+
<scheme>dcyc2t3_post</scheme>
53+
<scheme>sfc_diag</scheme>
54+
<scheme>sfc_diag_post</scheme>
55+
<scheme>GFS_surface_generic_post</scheme>
56+
<scheme>GFS_PBL_generic_pre</scheme>
57+
<scheme>hedmf</scheme>
58+
<scheme>GFS_PBL_generic_post</scheme>
59+
<scheme>GFS_GWD_generic_pre</scheme>
60+
<scheme>cires_ugwp</scheme>
61+
<scheme>cires_ugwp_post</scheme>
62+
<scheme>GFS_GWD_generic_post</scheme>
63+
<scheme>rayleigh_damp</scheme>
64+
<scheme>GFS_suite_stateout_update</scheme>
65+
<scheme>ozphys</scheme>
66+
<scheme>GFS_DCNV_generic_pre</scheme>
67+
<scheme>get_phi_fv3</scheme>
68+
<scheme>GFS_suite_interstitial_3</scheme>
69+
<!-- <scheme>samfdeepcnv</scheme> -->
70+
<scheme>GFS_DCNV_generic_post</scheme>
71+
<scheme>GFS_SCNV_generic_pre</scheme>
72+
<scheme>GFS_SCNV_generic_post</scheme>
73+
<scheme>GFS_suite_interstitial_4</scheme>
74+
<scheme>cnvc90</scheme>
75+
<scheme>GFS_MP_generic_pre</scheme>
76+
<scheme>mp_fer_hires</scheme>
77+
<scheme>GFS_MP_generic_post</scheme>
78+
<scheme>maximum_hourly_diagnostics</scheme>
79+
</subcycle>
80+
</group>
81+
<group name="stochastics">
82+
<subcycle loop="1">
83+
<scheme>GFS_stochastics</scheme>
84+
</subcycle>
85+
</group>
86+
<!-- <finalize></finalize> -->
87+
</suite>

0 commit comments

Comments
 (0)