Skip to content

Update support/HAFS from NCAR dtc/hwrf-physics 2020/06/19 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
climbfuji merged 63 commits into from
Jun 26, 2020
Merged

Update support/HAFS from NCAR dtc/hwrf-physics 2020/06/19 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
33e01da
Update .gitmodules and add CODEOWNERS for HWRF physics development
climbfuji Apr 3, 2020
cfa4d16
add hurricane-specific variables to GFS_typedefs.F90 for hurricane op…
grantfirl Dec 10, 2019
a9ba3a6
Update .gitmodules and submodule pointer for ccpp/physics for code re…
climbfuji Apr 6, 2020
338b0b1
Update submodule pointer for ccpp/physics
climbfuji Apr 6, 2020
1c35f1c
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Apr 7, 2020
fe3f57d
Merge pull request #37 from climbfuji/dtc-hwrf-physics-add-moninedmf
climbfuji Apr 7, 2020
84b35f9
add icloud=3 option for HWRF cloud fraction and optical property option
mzhangw Feb 11, 2020
ed1d67e
delete DCNV/SCNV interstitial in SDF for explicit simulation
mzhangw Feb 11, 2020
af6959c
add two dependency HWRF files
mzhangw Feb 13, 2020
c485be9
change radlw_main to F90 to accommodate WRF subroutines
mzhangw Feb 16, 2020
b651c1f
HRRTMG updates
mzhangw Mar 17, 2020
43d469c
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Apr 7, 2020
3ee4f6c
Apply bugfix for @mzhangw to correct the vertical dimensions of Inter…
climbfuji Apr 7, 2020
480a86c
gfsphysics/GFS_layer/GFS_diagnostics.F90: comment out the output of c…
climbfuji Apr 8, 2020
8a07199
Revert change of .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Apr 9, 2020
fd70a2c
Merge pull request #38 from climbfuji/dtc_hwrf-physics_add_rrtmg
climbfuji Apr 9, 2020
817fe36
Merge climbfuji:man_hafs_sas_for_develop into NCAR:dtc/hwrf-physics
climbfuji Apr 10, 2020
9468ee2
add HWRF physics SDF files
mzhangw Apr 13, 2020
d8b3118
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Apr 13, 2020
9e44026
Merge pull request #41 from climbfuji/merge_hwrf-sasas_into_dtc_hwrf-…
climbfuji Apr 13, 2020
da92cd1
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Apr 14, 2020
fbfc0c0
Merge mzhangw:HAFS_FER_hires into NCAR:dtc/hwrf-physics
mzhangw Apr 14, 2020
0aeeaad
Revert change of .gitmodules as a result of the merge
climbfuji Apr 14, 2020
882bfa7
add nogwdps SDF for HAFS and HWRF suite
mzhangw Apr 15, 2020
8415639
Merge branch 'dtc/hwrf-physics' of https://github.com/NCAR/fv3atm int…
mzhangw Apr 15, 2020
5aacb92
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Apr 16, 2020
fd9afd7
Merge pull request #43 from climbfuji/HAFS_fer_hires_for_dtc_hwrf-phy…
climbfuji Apr 16, 2020
388f805
bug fix in HAFS physics SDF
mzhangw Apr 17, 2020
c98fd52
Merge branch 'dtc/hwrf-physics' of https://github.com/NCAR/fv3atm int…
mzhangw Apr 17, 2020
def0b5b
add GFS_v15p2_FA SDF file
mzhangw Apr 30, 2020
d404cef
add stretched_FA SDF file
mzhangw May 1, 2020
fe607ea
Update .gitmodules and submodule pointer for ccpp-physics
climbfuji May 5, 2020
8a0c7fb
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji May 6, 2020
5d483d7
Merge pull request #47 from climbfuji/dtc-hwrf-physics-man-bugfix-fa
climbfuji May 6, 2020
4bae14b
Merge branch 'dtc/hwrf-physics' of https://github.com/NCAR/fv3atm int…
mzhangw May 10, 2020
1ad4e8e
modify default rhgrd to 1.0
mzhangw May 12, 2020
d96a34e
support HWRF Noah LSM and GFDL surface layer; add files to ccpp_prebu…
grantfirl May 13, 2020
dcc57dc
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji May 14, 2020
0f99e0a
Merge branch 'support/HAFS' of https://github.com/hafs-community/fv3a…
climbfuji May 14, 2020
8be9fec
Merge branch 'dtc_hwrf_physics' of https://github.com/mzhangw/fv3atm …
climbfuji May 14, 2020
418412f
Update submodule pointer for ccpp/physics
climbfuji May 15, 2020
065539c
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji May 20, 2020
db7ac62
Merge pull request #50 from climbfuji/update_dtc_hwrf_physics_from_ha…
climbfuji May 20, 2020
f778751
Merge branch 'dtc/hwrf-physics' into hwrf_sfc_PR
grantfirl May 28, 2020
eab67f5
Update .gitmodules and submodule pointer for code review and testing
climbfuji May 28, 2020
850ce5c
Merge pull request #1 from climbfuji/hwrf_sfc_PR_dom_for_grant
grantfirl May 28, 2020
89566cb
update submodule pointer for ccpp/physics
grantfirl May 28, 2020
2791a63
update submodule pointer for ccpp/physics and revert changes to .gitm…
grantfirl May 29, 2020
a261378
Merge pull request #49 from grantfirl/hwrf_sfc_PR
grantfirl May 29, 2020
c24b277
Merge branch 'support/HAFS' of https://github.com/hafs-community/fv3a…
climbfuji Jun 18, 2020
be66b10
Update .gitmodules and submodule pointers for GFDL_atmos_cubed_sphere…
climbfuji Jun 18, 2020
7a1c983
modify HWRF_nogwdps as HWRF physics test
mzhangw Jun 18, 2020
62fcad9
Merge branch 'nogwdps_sdf' of https://github.com/mzhangw/fv3atm into …
climbfuji Jun 18, 2020
7b95cd5
Correct CCPP version number in HWRF SDFs
climbfuji Jun 18, 2020
b2a2976
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Jun 19, 2020
156d0e6
Merge pull request #54 from climbfuji/update_dtc-hwrf-physics_from_ha…
climbfuji Jun 19, 2020
6c42a05
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Jun 19, 2020
73cd6b5
Update the ccpp/physics sumodule to point to the feature/hwrf_physics…
BinLiu-NOAA Jun 21, 2020
f294276
Rename or clean up some HAFS related ccpp suite definition files.
BinLiu-NOAA Jun 24, 2020
bc61cc5
Merge pull request #3 from hafs-community/feature/merge_hwrf_physics
climbfuji Jun 25, 2020
6059a09
Update .gitmodules and submodule pointer for ccpp-physics for code re…
climbfuji Jun 25, 2020
d90a13e
Remove suite_FV3_HAFS_FA_HWRF_RRTMG.xml
climbfuji Jun 25, 2020
6815e21
Revert change to .gitmodules and update submodule pointer for ccpp-ph…
climbfuji Jun 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ccpp/config/ccpp_prebuild_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,14 @@
'FV3/ccpp/physics/physics/module_mp_thompson.F90',
'FV3/ccpp/physics/physics/module_mp_thompson_make_number_concentrations.F90',
'FV3/ccpp/physics/physics/module_MP_FER_HIRES.F90',
'FV3/ccpp/physics/physics/HWRF_mersenne_twister.F90',
'FV3/ccpp/physics/physics/HWRF_mcica_random_numbers.F90',
'FV3/ccpp/physics/physics/module_bl_mynn.F90',
'FV3/ccpp/physics/physics/module_sf_mynn.F90',
'FV3/ccpp/physics/physics/module_SF_JSFC.F90',
'FV3/ccpp/physics/physics/module_BL_MYJPBL.F90',
'FV3/ccpp/physics/physics/module_sf_noahlsm.F90',
'FV3/ccpp/physics/physics/module_sf_noahlsm_glacial_only.F90',
'FV3/ccpp/physics/physics/module_sf_noahmp_glacier.f90',
'FV3/ccpp/physics/physics/module_sf_noahmplsm.f90',
'FV3/ccpp/physics/physics/cires_ugwp_module.F90',
Expand Down Expand Up @@ -171,6 +175,7 @@
'FV3/ccpp/physics/physics/namelist_soilveg_ruc.F90',
'FV3/ccpp/physics/physics/set_soilveg_ruc.F90',
'FV3/ccpp/physics/physics/module_soil_pre.F90',
'FV3/ccpp/physics/physics/module_sf_exchcoef.f90',
# RRTMGP
'FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90',
'FV3/ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics.F90',
Expand Down Expand Up @@ -239,6 +244,7 @@
'FV3/ccpp/physics/physics/get_prs_fv3.F90' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/gfdl_cloud_microphys.F90' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/gfdl_fv_sat_adj.F90' : [ 'fast_physics' ],
'FV3/ccpp/physics/physics/gfdl_sfc_layer.F90' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/gscond.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/gwdc.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/gwdps.f' : [ 'slow_physics' ],
Expand Down Expand Up @@ -272,8 +278,8 @@
'FV3/ccpp/physics/physics/ozphys.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/ozphys_2015.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/precpd.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/radlw_main.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/radsw_main.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/radlw_main.F90' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/radsw_main.F90' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/rascnv.F90' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/rayleigh_damp.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/rrtmg_lw_post.F90' : [ 'slow_physics' ],
Expand All @@ -287,6 +293,8 @@
'FV3/ccpp/physics/physics/sfc_cice.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/sfc_diff.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/sfc_drv.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/sfc_noah_wrfv4_interstitial.F90' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/sfc_noah_wrfv4.F90' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/sfc_noahmp_drv.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/sfc_nst.f' : [ 'slow_physics' ],
'FV3/ccpp/physics/physics/sfc_ocean.F' : [ 'slow_physics' ],
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 41 files
+0 −26 CMakeLists.txt
+169 −65 physics/GFS_rrtmg_pre.F90
+18 −9 physics/GFS_rrtmg_pre.meta
+2 −1 physics/GFS_rrtmg_setup.F90
+8 −8 physics/GFS_rrtmg_setup.meta
+41 −3 physics/GFS_rrtmgp_pre.F90
+8 −8 physics/GFS_rrtmgp_setup.meta
+18 −2 physics/GFS_suite_interstitial.F90
+41 −0 physics/GFS_suite_interstitial.meta
+6 −2 physics/GFS_surface_generic.F90
+109 −0 physics/HWRF_mcica_random_numbers.F90
+304 −0 physics/HWRF_mersenne_twister.F90
+2 −2 physics/docs/ccpp_doxyfile
+ − physics/docs/img/FA_DRI.png
+ − physics/docs/img/FA_MP_schematic.png
+ − physics/docs/img/FA_NOR_EQ.png
+20 −0 physics/docs/library.bib
+91 −0 physics/docs/pdftxt/HWRF_FAMP.txt
+1,820 −0 physics/gfdl_sfc_layer.F90
+810 −0 physics/gfdl_sfc_layer.meta
+243 −172 physics/module_MP_FER_HIRES.F90
+733 −0 physics/module_sf_exchcoef.f90
+4,793 −0 physics/module_sf_noahlsm.F90
+1,285 −0 physics/module_sf_noahlsm_glacial_only.F90
+323 −75 physics/moninedmf.f
+43 −0 physics/moninedmf.meta
+57 −78 physics/mp_fer_hires.F90
+18 −0 physics/mp_fer_hires.meta
+2 −0 physics/physparam.f
+1,109 −251 physics/radiation_clouds.f
+2,112 −20 physics/radlw_main.F90
+9 −9 physics/radlw_main.meta
+791 −27 physics/radsw_main.F90
+9 −9 physics/radsw_main.meta
+14 −1 physics/sfc_drv.f
+11 −0 physics/sfc_drv_ruc.F90
+261 −0 physics/sfc_noah_wrfv4.F90
+764 −0 physics/sfc_noah_wrfv4.meta
+758 −0 physics/sfc_noah_wrfv4_interstitial.F90
+1,098 −0 physics/sfc_noah_wrfv4_interstitial.meta
+13 −0 physics/sfc_noahmp_drv.f
5 changes: 3 additions & 2 deletions ccpp/suites/suite_HAFS_v0_gfdlmp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="HAFS_v0_gfdlmp" lib="ccppphys" ver="3">
<suite name="HAFS_v0_gfdlmp" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down Expand Up @@ -58,11 +58,12 @@
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
<scheme>GFS_PBL_generic_pre</scheme>
<scheme>hedmf_hafs</scheme>
<scheme>hedmf</scheme>
<scheme>GFS_PBL_generic_post</scheme>
<scheme>GFS_GWD_generic_pre</scheme>
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
Expand Down
5 changes: 3 additions & 2 deletions ccpp/suites/suite_HAFS_v0_gfdlmp_nocp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="HAFS_v0_gfdlmp_nocp" lib="ccppphys" ver="3">
<suite name="HAFS_v0_gfdlmp_nocp" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down Expand Up @@ -58,11 +58,12 @@
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
<scheme>GFS_PBL_generic_pre</scheme>
<scheme>hedmf_hafs</scheme>
<scheme>hedmf</scheme>
<scheme>GFS_PBL_generic_post</scheme>
<scheme>GFS_GWD_generic_pre</scheme>
<scheme>cires_ugwp</scheme>
<scheme>cires_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
Expand Down
4 changes: 2 additions & 2 deletions ccpp/suites/suite_HAFS_v0_gfdlmp_nocpugwd.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="HAFS_v0_gfdlmp_nocpugwd" lib="ccppphys" ver="3">
<suite name="HAFS_v0_gfdlmp_nocpugwd" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
Expand Down Expand Up @@ -58,7 +58,7 @@
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
<scheme>GFS_PBL_generic_pre</scheme>
<scheme>hedmf_hafs</scheme>
<scheme>hedmf</scheme>
<scheme>GFS_PBL_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
Expand Down
89 changes: 89 additions & 0 deletions ccpp/suites/suite_HAFS_v0_gfdlmp_nougwd.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="HAFS_v0_gfdlmp_nougwd" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="fast_physics">
<subcycle loop="1">
<scheme>fv_sat_adj</scheme>
</subcycle>
</group>
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
<scheme>GFS_rrtmg_setup</scheme>
<scheme>GFS_rad_time_vary</scheme>
<scheme>GFS_phys_time_vary</scheme>
</subcycle>
</group>
<group name="radiation">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
</subcycle>
</group>
<group name="physics">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_phys_reset</scheme>
<scheme>GFS_suite_stateout_reset</scheme>
<scheme>get_prs_fv3</scheme>
<scheme>GFS_suite_interstitial_1</scheme>
<scheme>GFS_surface_generic_pre</scheme>
<scheme>GFS_surface_composites_pre</scheme>
<scheme>dcyc2t3</scheme>
<scheme>GFS_surface_composites_inter</scheme>
<scheme>GFS_suite_interstitial_2</scheme>
</subcycle>
<!-- Surface iteration loop -->
<subcycle loop="2">
<scheme>sfc_diff</scheme>
<scheme>GFS_surface_loop_control_part1</scheme>
<scheme>sfc_nst_pre</scheme>
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>lsm_noah</scheme>
<scheme>sfc_sice</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
</subcycle>
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
<scheme>GFS_PBL_generic_pre</scheme>
<scheme>hedmf</scheme>
<scheme>GFS_PBL_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>samfdeepcnv</scheme>
<scheme>GFS_DCNV_generic_post</scheme>
<scheme>GFS_SCNV_generic_pre</scheme>
<scheme>samfshalcnv</scheme>
<scheme>GFS_SCNV_generic_post</scheme>
<scheme>GFS_suite_interstitial_4</scheme>
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>gfdl_cloud_microphys</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
</subcycle>
</group>
<group name="stochastics">
<subcycle loop="1">
<scheme>GFS_stochastics</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
</suite>
20 changes: 12 additions & 8 deletions .../suite_FV3_HAFS_ferhires_update_moist.xml → ccpp/suites/suite_HAFS_v0_hwrf.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_HAFS_ferhires_update_moist" lib="ccppphys" ver="4">
<suite name="HAFS_v0_hwrf" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
Expand All @@ -14,12 +14,12 @@
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
</subcycle>
</group>
Expand All @@ -37,12 +37,14 @@
</subcycle>
<!-- Surface iteration loop -->
<subcycle loop="2">
<scheme>sfc_diff</scheme>
<scheme>gfdl_sfc_layer</scheme>
<scheme>GFS_surface_loop_control_part1</scheme>
<scheme>sfc_nst_pre</scheme>
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>lsm_noah</scheme>
<scheme>sfc_noah_wrfv4_pre</scheme>
<scheme>sfc_noah_wrfv4</scheme>
<scheme>sfc_noah_wrfv4_post</scheme>
<scheme>sfc_sice</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
</subcycle>
Expand All @@ -61,13 +63,15 @@
<scheme>GFS_GWD_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<!-- <scheme>samfdeepcnv</scheme> -->
<scheme>samfdeepcnv</scheme>
<scheme>GFS_DCNV_generic_post</scheme>
<scheme>GFS_SCNV_generic_pre</scheme>
<scheme>samfshalcnv</scheme>
<scheme>GFS_SCNV_generic_post</scheme>
<scheme>GFS_suite_interstitial_4</scheme>
<scheme>cnvc90</scheme>
Expand Down
86 changes: 86 additions & 0 deletions ccpp/suites/suite_HAFS_v0_hwrf_nougwd.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="HAFS_v0_hwrf_nougwd" lib="ccppphys" ver="4">
<!-- <init></init> -->
<group name="time_vary">
<subcycle loop="1">
<scheme>GFS_time_vary_pre</scheme>
<scheme>GFS_rrtmg_setup</scheme>
<scheme>GFS_rad_time_vary</scheme>
<scheme>GFS_phys_time_vary</scheme>
</subcycle>
</group>
<group name="radiation">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_rad_reset</scheme>
<scheme>GFS_rrtmg_pre</scheme>
<scheme>rrtmg_lw_pre</scheme>
<scheme>rrtmg_lw</scheme>
<scheme>rrtmg_lw_post</scheme>
<scheme>rrtmg_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</scheme>
<scheme>GFS_rrtmg_post</scheme>
</subcycle>
</group>
<group name="physics">
<subcycle loop="1">
<scheme>GFS_suite_interstitial_phys_reset</scheme>
<scheme>GFS_suite_stateout_reset</scheme>
<scheme>get_prs_fv3</scheme>
<scheme>GFS_suite_interstitial_1</scheme>
<scheme>GFS_surface_generic_pre</scheme>
<scheme>GFS_surface_composites_pre</scheme>
<scheme>dcyc2t3</scheme>
<scheme>GFS_surface_composites_inter</scheme>
<scheme>GFS_suite_interstitial_2</scheme>
</subcycle>
<!-- Surface iteration loop -->
<subcycle loop="2">
<scheme>gfdl_sfc_layer</scheme>
<scheme>GFS_surface_loop_control_part1</scheme>
<scheme>sfc_nst_pre</scheme>
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>sfc_noah_wrfv4_pre</scheme>
<scheme>sfc_noah_wrfv4</scheme>
<scheme>sfc_noah_wrfv4_post</scheme>
<scheme>sfc_sice</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
</subcycle>
<!-- End of surface iteration loop -->
<subcycle loop="1">
<scheme>GFS_surface_composites_post</scheme>
<scheme>sfc_diag</scheme>
<scheme>sfc_diag_post</scheme>
<scheme>GFS_surface_generic_post</scheme>
<scheme>GFS_PBL_generic_pre</scheme>
<scheme>hedmf</scheme>
<scheme>GFS_PBL_generic_post</scheme>
<scheme>rayleigh_damp</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>ozphys_2015</scheme>
<scheme>h2ophys</scheme>
<scheme>GFS_DCNV_generic_pre</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>samfdeepcnv</scheme>
<scheme>GFS_DCNV_generic_post</scheme>
<scheme>GFS_SCNV_generic_pre</scheme>
<scheme>samfshalcnv</scheme>
<scheme>GFS_SCNV_generic_post</scheme>
<scheme>GFS_suite_interstitial_4</scheme>
<scheme>cnvc90</scheme>
<scheme>GFS_MP_generic_pre</scheme>
<scheme>mp_fer_hires</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
</subcycle>
</group>
<group name="stochastics">
<subcycle loop="1">
<scheme>GFS_stochastics</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
</suite>
2 changes: 1 addition & 1 deletion gfsphysics/GFS_layer/GFS_diagnostics.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3381,7 +3381,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
endif

!! Cloud effective radii from Microphysics
!if (Model%imp_physics == Model%imp_physics_thompson .or. Model%imp_physics == Model%imp_physics_wsm6) then
!if (Model%imp_physics == Model%imp_physics_thompson .or. Model%imp_physics == Model%imp_physics_wsm6 .or. Model%imp_physics == Model%imp_physics_fer_hires) then
! idx = idx + 1
! ExtDiag(idx)%axes = 3
! ExtDiag(idx)%name = 'cleffr'
Expand Down
Loading