Skip to content
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.

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

Add/update HWRF physics #188

Merged
merged 120 commits into from
Nov 5, 2020
Merged
Show file tree
Hide file tree
Changes from 119 commits
Commits
Show all changes
120 commits
Select commit Hold shift + click to select a range
b88b8c3
output nested domain on cubed sphere grid
junwang-noaa Apr 4, 2019
f726448
output native cubed sphere grid for regional fv3 and nested fv3
junwang-noaa Apr 11, 2019
d095db6
add HWRF PBL and surface drag for HAFS (sfc_diff.f, moninedmf.f, GFS_…
JiliDong-NOAA May 10, 2019
5512fd7
Merge branch 'regionalfv3_cubed' into HAFS_writenativegrid
BinLiu-NOAA May 16, 2019
14e9157
merge master, revert back fractional landsea mask and add back HWRF P…
JiliDong-NOAA May 22, 2019
caf2856
add back HWRF PBL and sfc drag after master revert fractional land/se…
JiliDong-NOAA May 23, 2019
e258193
merge master into HAFS for GWD update
JiliDong-NOAA May 23, 2019
089a0c2
Enable outputing a grid from the write grid component, which is large…
BinLiu-NOAA May 26, 2019
7161e25
Merge remote-tracking branch 'remotes/origin/HAFS_writenativegrid' in…
BinLiu-NOAA May 28, 2019
85923cf
merge master into HAFS
JiliDong-NOAA Jun 28, 2019
c5353c1
update HAFS with HWRF PBL/sfc drag
JiliDong-NOAA Jul 2, 2019
674938d
Merge branch 'master' into HAFS
BinLiu-NOAA Jul 31, 2019
ffc1f7e
add option to switch GWD on/off
JiliDong-NOAA Aug 23, 2019
d69f8ad
Merge branch 'master' into HAFS
BinLiu-NOAA Sep 12, 2019
75ac7af
Merge branch 'master' into HAFS
BinLiu-NOAA Sep 17, 2019
60d02c6
Merge branch 'develop' into support/HAFS
BinLiu-NOAA Oct 25, 2019
1f4f023
Merge branch 'develop' into support/HAFS
BinLiu-NOAA Nov 8, 2019
12eb47c
Merge branch 'develop' into support/HAFS
BinLiu-NOAA Nov 18, 2019
68d5e0a
support/HAFS: Clean up before merging features back the develop branch.
BinLiu-NOAA Nov 18, 2019
83dc463
support/HAFS: Change the missing value in FV3GFS_io to default real t…
BinLiu-NOAA Nov 21, 2019
02865a8
Merge branch 'develop' into support/HAFS
BinLiu-NOAA Dec 2, 2019
f31e9a9
Changes to enable using CCPP in HAFS. (Qingfu, Chunxi, Bin)
BinLiu-NOAA Dec 18, 2019
dced11c
feature/hafs_ccpp: Update the suite names to match the suite file nam…
BinLiu-NOAA Dec 21, 2019
8076a27
Merge remote-tracking branch 'upstream/develop' into support/HAFS
JiliDong-NOAA Jan 16, 2020
6ca9eb1
Merge pull request #1 from JiliDong-NOAA/support/HAFS
BinLiu-NOAA Jan 17, 2020
c708c88
Merge branch 'support/HAFS' into feature/hafs_ccpp
BinLiu-NOAA Jan 23, 2020
a0886a3
Updated suite xml file: suite_HAFS_v0_gfdlmp.xml
ChunxiZhang-NOAA Jan 27, 2020
a38a8ce
Update ccpp/physics to point the support/HAFS branch with the HAFS CC…
BinLiu-NOAA Jan 27, 2020
15e02d9
Changes to the GFS diagnostics and GFS typedefs to output Eddy Diffus…
AndrewHazelton Mar 4, 2020
4337792
Merge pull request #2 from hafs-community/feature/add_km
JiliDong-NOAA Mar 5, 2020
c51c3ef
update ccpp/physics to add Km from Andrew Hazelton
Mar 5, 2020
be06189
Merge remote-tracking branch 'origin' into support/HAFS
Mar 5, 2020
4bc1e4d
Merge pull request #3 from hafs-community/feature/add_km_ccpp_submodu…
ZhanZhang-NOAA Mar 6, 2020
3690b63
Correction to the GFS physics driver for the add_km feature
AndrewHazelton Mar 7, 2020
4632d7c
Merge pull request #4 from hafs-community/feature/add_km
JiliDong-NOAA Mar 9, 2020
abe4966
Merge branch 'develop' into support/HAFS
BinLiu-NOAA Mar 24, 2020
0334101
Addition of km to GFS_typedefs.meta
AndrewHazelton Mar 25, 2020
df1fc93
Correct Version of GFS_typedefs.meta
AndrewHazelton Mar 25, 2020
38bb404
Merge branch 'feature/add_km' into support/HAFS
BinLiu-NOAA Mar 25, 2020
23c49d0
Remove dcyc2t3_post in the HAFS_v0_gfdlmp and HAFS_v0_gfdlmp_nocp ccp…
BinLiu-NOAA Mar 25, 2020
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
4afd8a4
Merge branch 'develop' into support/HAFS
BinLiu-NOAA 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
d589a5d
Add a new ccpp suite of suite_HAFS_v0_gfdlmp_nocpugwd.xml.
BinLiu-NOAA May 30, 2020
908c7d6
Merge remote-tracking branch 'remotes/upstream/develop' into support/…
BinLiu-NOAA Jun 6, 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
969448a
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
climbfuji Sep 22, 2020
edd99ad
gfsphysics/GFS_layer/GFS_typedefs.meta: update standard names after m…
climbfuji Oct 7, 2020
2e81670
Update .gitmodules and submodule pointers for ccpp-framework, ccpp-ph…
climbfuji Oct 13, 2020
452a24b
New suite definition file ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml
climbfuji Oct 13, 2020
3e6c41e
Remove unnecessary target attribute from argument to CCPP_step
climbfuji Oct 13, 2020
515770f
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into upd…
climbfuji Oct 13, 2020
9b291b7
Bugfixes following update from develop
climbfuji Oct 14, 2020
5a1c989
Remove unnecessary suite definition files
climbfuji Oct 14, 2020
c7673fe
gfsphysics/GFS_layer/GFS_typedefs.F90: always calculate Julian day, s…
climbfuji Oct 16, 2020
002f58d
Update .gitmodules and submodule pointers for GFDL_atmos_cubed_sphere…
climbfuji Oct 16, 2020
55bf7f4
Remove unnecessary suite definition files and revert changes to GFS_p…
climbfuji Oct 17, 2020
12a087e
Remove dkudiagnostics, remove moninedmf_hafs from CCPP
climbfuji Oct 17, 2020
7db8c63
Bugfix: remove dkudiagnostic from CCPP's satmedmfvdifq.meta
climbfuji Oct 17, 2020
1a9b20b
Abort model if Thompson MP is run with effr_in = .false.
climbfuji Oct 20, 2020
3c05c9d
Update submodule pointer for ccpp-physics
climbfuji Oct 20, 2020
ce252eb
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into dtc…
climbfuji Oct 22, 2020
3c68f05
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into dtc…
climbfuji Nov 3, 2020
d8fdd9d
Update submodule pointer for ccpp-physics
climbfuji Nov 3, 2020
28d418d
Revert change to .gitmodules and update submodule pointers for GFDL_a…
DomHeinzeller Nov 5, 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
8 changes: 4 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[submodule "atmos_cubed_sphere"]
path = atmos_cubed_sphere
url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere
branch = dev/emc
url = https://github.com/climbfuji/GFDL_atmos_cubed_sphere
branch = dtc/hwrf-physics
[submodule "ccpp/framework"]
path = ccpp/framework
url = https://github.com/NCAR/ccpp-framework
branch = master
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = master
url = https://github.com/climbfuji/ccpp-physics
branch = dtc/hwrf-physics
2 changes: 1 addition & 1 deletion atmos_cubed_sphere
10 changes: 6 additions & 4 deletions ccpp/config/ccpp_prebuild_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@
'ccpp/physics/physics/get_prs_fv3.F90',
'ccpp/physics/physics/gfdl_cloud_microphys.F90',
'ccpp/physics/physics/gfdl_fv_sat_adj.F90',
'ccpp/physics/physics/gfdl_sfc_layer.F90',
'ccpp/physics/physics/gscond.f',
'ccpp/physics/physics/gwdc.f',
'ccpp/physics/physics/gwdps.f',
Expand All @@ -138,7 +139,6 @@
'ccpp/physics/physics/cu_gf_driver.F90',
'ccpp/physics/physics/cu_gf_driver_post.F90',
'ccpp/physics/physics/moninedmf.f',
'ccpp/physics/physics/moninedmf_hafs.f',
'ccpp/physics/physics/moninshoc.f',
'ccpp/physics/physics/satmedmfvdif.F',
'ccpp/physics/physics/satmedmfvdifq.F',
Expand All @@ -157,8 +157,8 @@
'ccpp/physics/physics/ozphys_2015.f',
'ccpp/physics/physics/precpd.f',
'ccpp/physics/physics/phys_tend.F90',
'ccpp/physics/physics/radlw_main.f',
'ccpp/physics/physics/radsw_main.f',
'ccpp/physics/physics/radlw_main.F90',
'ccpp/physics/physics/radsw_main.F90',
'ccpp/physics/physics/rascnv.F90',
'ccpp/physics/physics/rayleigh_damp.f',
'ccpp/physics/physics/rrtmg_lw_post.F90',
Expand All @@ -172,12 +172,14 @@
'ccpp/physics/physics/sfc_cice.f',
'ccpp/physics/physics/sfc_diff.f',
'ccpp/physics/physics/sfc_drv.f',
'ccpp/physics/physics/sfc_noah_wrfv4_interstitial.F90',
'ccpp/physics/physics/sfc_noah_wrfv4.F90',
'ccpp/physics/physics/sfc_noahmp_drv.f',
'ccpp/physics/physics/flake_driver.F90',
'ccpp/physics/physics/sfc_nst.f',
'ccpp/physics/physics/sfc_ocean.F',
'ccpp/physics/physics/sfc_sice.f',
# HAFSFER_HIRES
# HAFS FER_HIRES
'ccpp/physics/physics/mp_fer_hires.F90',
# RRTMGP
'ccpp/physics/physics/rrtmgp_lw_gas_optics.F90',
Expand Down
2 changes: 1 addition & 1 deletion ccpp/driver/CCPP_driver.F90
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ subroutine CCPP_step (step, nblks, ierr)
implicit none

character(len=*), intent(in) :: step
integer, target, intent(in) :: nblks
integer, intent(in) :: nblks
integer, intent(out) :: ierr
! Local variables
integer :: nb, nt, ntX
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Submodule physics updated 46 files
+0 −22 CMakeLists.txt
+114 −30 physics/GFS_rrtmg_pre.F90
+17 −0 physics/GFS_rrtmg_pre.meta
+2 −1 physics/GFS_rrtmg_setup.F90
+5 −5 physics/GFS_rrtmg_setup.meta
+4 −4 physics/GFS_rrtmgp_setup.meta
+18 −2 physics/GFS_suite_interstitial.F90
+41 −0 physics/GFS_suite_interstitial.meta
+1 −0 physics/GFS_surface_composites.F90
+6 −2 physics/GFS_surface_generic.F90
+32 −35 physics/GFS_time_vary_pre.fv3.F90
+33 −35 physics/GFS_time_vary_pre.scm.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,823 −0 physics/gfdl_sfc_layer.F90
+816 −0 physics/gfdl_sfc_layer.meta
+258 −194 physics/module_MP_FER_HIRES.F90
+11 −10 physics/module_mp_thompson.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
+322 −76 physics/moninedmf.f
+41 −0 physics/moninedmf.meta
+0 −1,553 physics/moninedmf_hafs.f
+0 −524 physics/moninedmf_hafs.meta
+70 −90 physics/mp_fer_hires.F90
+21 −0 physics/mp_fer_hires.meta
+1,140 −272 physics/radiation_clouds.f
+2,111 −10 physics/radlw_main.F90
+10 −10 physics/radlw_main.meta
+776 −11 physics/radsw_main.F90
+10 −10 physics/radsw_main.meta
+1 −1 physics/samfdeepcnv.f
+14 −1 physics/sfc_drv.f
+11 −0 physics/sfc_drv_ruc.F90
+261 −0 physics/sfc_noah_wrfv4.F90
+770 −0 physics/sfc_noah_wrfv4.meta
+758 −0 physics/sfc_noah_wrfv4_interstitial.F90
+1,110 −0 physics/sfc_noah_wrfv4_interstitial.meta
+13 −0 physics/sfc_noahmp_drv.f
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" version="1">
<suite name="HAFS_v0_hwrf" version="1">
<!-- <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>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am curious, why do we change the order of sw/lw radiation computation?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because HWRF runs lw first and sw afterwards. @mzhangw or @ligiabernardet can explain this better, hopefully.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@climbfuji is correct. It is the practice in HWRF/WRF.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For what it's worth, I swapped the order and ran the HWRF regression tests against the newly created baseline with the original (HWRF) order:

diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml b/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml
index 76d9aed..cb13c16 100644
--- a/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml
+++ b/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml
@@ -15,12 +15,12 @@
       <scheme>GFS_suite_interstitial_rad_reset</scheme>
       <!-- <scheme>sgscloud_radpre</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>rrtmg_lw_pre</scheme>
+      <scheme>rrtmg_lw</scheme>
+      <scheme>rrtmg_lw_post</scheme>
       <scheme>GFS_rrtmg_post</scheme>
       <!-- <scheme>sgscloud_radpost</scheme> -->
     </subcycle>

The results were b4b identical.

<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>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is the difference between the sfc_dff and the gfdl_sfc_layer?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I defer this question to @grantfirl who added the GFDL surface layer scheme. As far as I understand, it is entirely different from the GFS surface layer scheme.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, it is the surface layer scheme from WRF called the "GFDL surface layer scheme" used in HWRF. It is not closely related to sfc_diff. It's been a long time since I worked on this and don't remember many of the details, but you're welcome to look at the PR when this was originally merged into the HWRF CCPP physics: (NCAR/ccpp-physics#452)

<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>GFS_DCNV_generic_pre</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
94 changes: 94 additions & 0 deletions ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="HAFS_v0_hwrf_thompson" version="1">
<!-- <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>sgscloud_radpre</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>
<!-- <scheme>sgscloud_radpost</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>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>
<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_thompson_pre</scheme>
<scheme>mp_thompson</scheme>
<scheme>mp_thompson_post</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
Original file line number Diff line number Diff line change
Expand Up @@ -3702,7 +3702,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