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.

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

Refactor GFDLMP v1. Introduce GFDLMP v3. Fix initialization bug. #823

Open
wants to merge 48 commits into
base: develop
Choose a base branch
from
Open

Refactor GFDLMP v1. Introduce GFDLMP v3. Fix initialization bug. #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
6695d8e
removed gfdl mp v1 files from orginal directory and moved to newly ad…
RuiyuSun Jan 22, 2024
8559367
change the .gitmodules to use my ccpp/physics branch
RuiyuSun Jan 22, 2024
d77fdef
Merge remote-tracking branch 'origin/develop' into feature_gfdlmpv3
RuiyuSun Jan 22, 2024
ce28fae
add GFDLMP v3
RuiyuSun Feb 1, 2024
1efbd92
add two suites for gfdlmp v3
RuiyuSun Feb 1, 2024
1ee57b9
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into HEAD
dustinswales Mar 18, 2024
cbdf74c
GFDLv3
dustinswales Mar 18, 2024
0934d97
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
dustinswales Mar 18, 2024
3cb2e52
refactor gfdlmp. work in progress
dustinswales Mar 19, 2024
32d7d52
Update physics
dustinswales Mar 20, 2024
7b110d7
Update physics
dustinswales Mar 20, 2024
70782b3
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
dustinswales Mar 20, 2024
d0f8a40
Synced physics
dustinswales Apr 3, 2024
58e33c8
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
dustinswales Apr 3, 2024
6b5ec48
Additional cleanup
dustinswales Apr 3, 2024
1013041
Reverted some changes in physics
dustinswales Apr 3, 2024
2688c15
Update physics
dustinswales Apr 11, 2024
3ef708d
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
dustinswales Apr 11, 2024
14ba971
Some housekeeping in physics
dustinswales Apr 12, 2024
02cd74f
Revert "add GFDLMP v3"
dustinswales Apr 12, 2024
62be093
Update submodules in FV3
dustinswales Apr 12, 2024
bf9efa4
Some more changes
dustinswales Apr 12, 2024
e2ea427
Some reorg
dustinswales Apr 12, 2024
d766a64
Some more cleanup. Nearly done
dustinswales Apr 22, 2024
a609ad7
Move gfdlmp init call to fv_sat_adj init().
dustinswales May 23, 2024
0bf9698
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
dustinswales May 23, 2024
e42e1ce
Revert mp init move.
dustinswales May 23, 2024
f8ac2da
Revert "Move gfdlmp init call to fv_sat_adj init()."
dustinswales May 23, 2024
c162e03
Some more changes.
dustinswales Aug 26, 2024
2c3ef02
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
dustinswales Aug 26, 2024
1c2df6b
Some mroe changes
dustinswales Oct 22, 2024
cdca580
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
dustinswales Oct 22, 2024
20de3c6
Remove unecessary changes
dustinswales Oct 22, 2024
d2cf08a
Update GFDLMPV3 based SDFs
dustinswales Oct 22, 2024
2f91520
Some of the last changes
dustinswales Nov 7, 2024
bfeff8f
More changes!
dustinswales Nov 7, 2024
a7d4c3a
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
dustinswales Nov 7, 2024
cf0c776
Add call the GFDLMP register in FV3
dustinswales Nov 13, 2024
311bf52
Updated physics
dustinswales Nov 13, 2024
c2e0978
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
dustinswales Nov 13, 2024
0f7d5e0
Bugfix in physics
dustinswales Nov 18, 2024
7c46b87
Updated physics
dustinswales Nov 18, 2024
7193dbd
Updated physics
dustinswales Nov 18, 2024
4a19ef6
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
dustinswales Nov 18, 2024
0c4529c
Bug fix from GNU compile. Bug fix from merge.
dustinswales Nov 19, 2024
59164a6
Doh!
dustinswales Nov 21, 2024
dd0c88a
Update physics
dustinswales Dec 16, 2024
21d1609
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…
dustinswales Dec 16, 2024
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
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
branch = main
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/ufs-community/ccpp-physics
branch = ufs/dev
url = https://github.com/dustinswales/ccpp-physics
branch = feature/gfdlmpv3
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
3 changes: 2 additions & 1 deletion ccpp/config/ccpp_prebuild_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,8 +165,9 @@
'physics/physics/photochem/module_h2ophys.F90',
'physics/physics/photochem/module_ozphys.F90',
'physics/physics/MP/Ferrier_Aligo/mp_fer_hires.F90',
'physics/physics/MP/GFDL/gfdl_cloud_microphys.F90',
'physics/physics/MP/GFDL/v1_2019/gfdl_cloud_microphys.F90',
'physics/physics/MP/GFDL/fv_sat_adj.F90',
'physics/physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.F90',
'physics/physics/MP/Morrison_Gettelman/m_micro.F90',
'physics/physics/MP/Morrison_Gettelman/m_micro_pre.F90',
'physics/physics/MP/Morrison_Gettelman/m_micro_post.F90',
Expand Down
2 changes: 1 addition & 1 deletion ccpp/data/GFS_typedefs.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10115,7 +10115,7 @@
dependencies = hooks/machine.F,hooks/physcons.F90
dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f
dependencies = photochem/module_ozphys.F90,photochem/module_h2ophys.F90
dependencies = SFC_Models/Land/Noahmp/lnd_iau_mod.F90,MP/GFDL/GFDL_parse_tracers.F90
dependencies = SFC_Models/Land/Noahmp/lnd_iau_mod.F90,MP/GFDL_parse_tracers.F90

[ccpp-arg-table]
name = GFS_typedefs
Expand Down
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 15 files
+4 −2 CODEOWNERS
+6 −5 physics/MP/GFDL/fv_sat_adj.F90
+2 −2 physics/MP/GFDL/fv_sat_adj.meta
+413 −0 physics/MP/GFDL/module_gfdlmp_param.F90
+3 −3 physics/MP/GFDL/v1_2019/gfdl_cloud_microphys.F90
+4 −3 physics/MP/GFDL/v1_2019/gfdl_cloud_microphys.meta
+25 −196 physics/MP/GFDL/v1_2019/gfdl_cloud_microphys_mod.F90
+392 −0 physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.F90
+530 −0 physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.meta
+7,377 −0 physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3_mod.F90
+0 −0 physics/MP/GFDL_parse_tracers.F90
+0 −0 physics/MP/multi_gases.F90
+1 −1 physics/docs/ccpp_doxyfile
+1 −1 physics/docs/ccppsrw_doxyfile
+1 −1 physics/docs/pdftxt/suite_input.nml.txt
92 changes: 92 additions & 0 deletions ccpp/suites/suite_FV3_GFS_v16_gfdlmpv3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_GFS_v16_gfdlmpv3" version="1">
<!-- <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>GFS_radiation_surface</scheme>
<scheme>rad_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</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>satmedmfvdifq</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>GFS_suite_stateout_update</scheme>
<scheme>GFS_photochemistry</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>GFS_DCNV_generic_pre</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_v3</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>GFS_physics_post</scheme>
</subcycle>
</group>
<group name="stochastics">
<subcycle loop="1">
<scheme>GFS_stochastics</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
</suite>
92 changes: 92 additions & 0 deletions ccpp/suites/suite_FV3_HAFS_v1_gfdlmpv3_tedmf.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?xml version="1.0" encoding="UTF-8"?>

<suite name="FV3_HAFS_v1_gfdlmpv3_tedmf" version="1">
<!-- <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>GFS_radiation_surface</scheme>
<scheme>rad_sw_pre</scheme>
<scheme>rrtmg_sw</scheme>
<scheme>rrtmg_sw_post</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>satmedmfvdifq</scheme>
<scheme>GFS_PBL_generic_post</scheme>
<scheme>GFS_GWD_generic_pre</scheme>
<scheme>unified_ugwp</scheme>
<scheme>unified_ugwp_post</scheme>
<scheme>GFS_GWD_generic_post</scheme>
<scheme>GFS_suite_stateout_update</scheme>
<scheme>GFS_photochemistry</scheme>
<scheme>get_phi_fv3</scheme>
<scheme>GFS_suite_interstitial_3</scheme>
<scheme>GFS_DCNV_generic_pre</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_v3</scheme>
<scheme>GFS_MP_generic_post</scheme>
<scheme>maximum_hourly_diagnostics</scheme>
<scheme>GFS_physics_post</scheme>
</subcycle>
</group>
<group name="stochastics">
<subcycle loop="1">
<scheme>GFS_stochastics</scheme>
</subcycle>
</group>
<!-- <finalize></finalize> -->
</suite>
Loading