Skip to content

Commit d042f58

Browse files
grantfirlgrantfirl
committed
changes to work with ccpp-physics PR #258 from ufs/dev
1 parent 565d548 commit d042f58

File tree

61 files changed

+326
-179
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+326
-179
lines changed

‎.gitmodules‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
branch = main
55
[submodule "ccpp-physics"]
66
path = ccpp/physics
7-
url = https://github.com/NCAR/ccpp-physics
8-
branch = main
7+
#url = https://github.com/NCAR/ccpp-physics
8+
#branch = main
9+
url = https://github.com/grantfirl/ccpp-physics
10+
branch = ufs-dev-PR258
911
[submodule "CMakeModules"]
1012
path = CMakeModules
1113
url = https://github.com/noaa-emc/CMakeModules

‎ccpp/config/ccpp_prebuild_config.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@
119119
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.F90' ,
120120
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.F90' ,
121121
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.F90' ,
122-
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_rad_reset.F90',
123-
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_phys_reset.F90',
124122
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_1.F90' ,
125123
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_2.F90' ,
126124
'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_reset.F90' ,

‎ccpp/physics‎

‎ccpp/suites/suite_HAFS_v0_hwrf.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
</group>
1313
<group name="radiation">
1414
<subcycle loop="1">
15-
<scheme>GFS_suite_interstitial_rad_reset</scheme>
1615
<scheme>GFS_rrtmg_pre</scheme>
1716
<scheme>GFS_radiation_surface</scheme>
1817
<scheme>rrtmg_lw</scheme>
@@ -23,9 +22,8 @@
2322
<scheme>GFS_rrtmg_post</scheme>
2423
</subcycle>
2524
</group>
26-
<group name="physics">
25+
<group name="phys_ps">
2726
<subcycle loop="1">
28-
<scheme>GFS_suite_interstitial_phys_reset</scheme>
2927
<scheme>GFS_suite_stateout_reset</scheme>
3028
<scheme>get_prs_fv3</scheme>
3129
<scheme>GFS_suite_interstitial_1</scheme>
@@ -60,6 +58,10 @@
6058
<scheme>cires_ugwp_post</scheme>
6159
<scheme>GFS_GWD_generic_post</scheme>
6260
<scheme>GFS_suite_stateout_update</scheme>
61+
</subcycle>
62+
</group>
63+
<group name="phys_ts">
64+
<subcycle loop="1">
6365
<scheme>GFS_photochemistry</scheme>
6466
<scheme>GFS_DCNV_generic_pre</scheme>
6567
<scheme>get_phi_fv3</scheme>

‎ccpp/suites/suite_HAFS_v0_hwrf_ps.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
</group>
1313
<group name="radiation">
1414
<subcycle loop="1">
15-
<scheme>GFS_suite_interstitial_rad_reset</scheme>
1615
<scheme>GFS_rrtmg_pre</scheme>
1716
<scheme>GFS_radiation_surface</scheme>
1817
<scheme>rrtmg_lw</scheme>
@@ -23,9 +22,8 @@
2322
<scheme>GFS_rrtmg_post</scheme>
2423
</subcycle>
2524
</group>
26-
<group name="physics">
25+
<group name="phys_ps">
2726
<subcycle loop="1">
28-
<scheme>GFS_suite_interstitial_phys_reset</scheme>
2927
<scheme>GFS_suite_stateout_reset</scheme>
3028
<scheme>get_prs_fv3</scheme>
3129
<scheme>GFS_suite_interstitial_1</scheme>
@@ -41,6 +39,10 @@
4139
<scheme>cires_ugwp_post</scheme>
4240
<scheme>GFS_GWD_generic_post</scheme>
4341
<scheme>GFS_suite_stateout_update</scheme>
42+
</subcycle>
43+
</group>
44+
<group name="phys_ts">
45+
<subcycle loop="1">
4446
<scheme>GFS_photochemistry</scheme>
4547
<scheme>GFS_DCNV_generic_pre</scheme>
4648
<scheme>get_phi_fv3</scheme>

‎ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
</group>
1313
<group name="radiation">
1414
<subcycle loop="1">
15-
<scheme>GFS_suite_interstitial_rad_reset</scheme>
1615
<!-- <scheme>sgscloud_radpre</scheme> -->
1716
<scheme>GFS_rrtmg_pre</scheme>
1817
<scheme>GFS_radiation_surface</scheme>
@@ -25,9 +24,8 @@
2524
<!-- <scheme>sgscloud_radpost</scheme> -->
2625
</subcycle>
2726
</group>
28-
<group name="physics">
27+
<group name="phys_ps">
2928
<subcycle loop="1">
30-
<scheme>GFS_suite_interstitial_phys_reset</scheme>
3129
<scheme>GFS_suite_stateout_reset</scheme>
3230
<scheme>get_prs_fv3</scheme>
3331
<scheme>GFS_suite_interstitial_1</scheme>
@@ -62,6 +60,10 @@
6260
<scheme>cires_ugwp_post</scheme>
6361
<scheme>GFS_GWD_generic_post</scheme>
6462
<scheme>GFS_suite_stateout_update</scheme>
63+
</subcycle>
64+
</group>
65+
<group name="phys_ts">
66+
<subcycle loop="1">
6567
<scheme>GFS_photochemistry</scheme>
6668
<scheme>GFS_DCNV_generic_pre</scheme>
6769
<scheme>get_phi_fv3</scheme>

‎ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
</group>
1313
<group name="radiation">
1414
<subcycle loop="1">
15-
<scheme>GFS_suite_interstitial_rad_reset</scheme>
1615
<!-- <scheme>sgscloud_radpre</scheme> -->
1716
<scheme>GFS_rrtmg_pre</scheme>
1817
<scheme>GFS_radiation_surface</scheme>
@@ -25,9 +24,8 @@
2524
<!-- <scheme>sgscloud_radpost</scheme> -->
2625
</subcycle>
2726
</group>
28-
<group name="physics">
27+
<group name="phys_ps">
2928
<subcycle loop="1">
30-
<scheme>GFS_suite_interstitial_phys_reset</scheme>
3129
<scheme>GFS_suite_stateout_reset</scheme>
3230
<scheme>get_prs_fv3</scheme>
3331
<scheme>GFS_suite_interstitial_1</scheme>
@@ -43,6 +41,10 @@
4341
<scheme>cires_ugwp_post</scheme>
4442
<scheme>GFS_GWD_generic_post</scheme>
4543
<scheme>GFS_suite_stateout_update</scheme>
44+
</subcycle>
45+
</group>
46+
<group name="phys_ts">
47+
<subcycle loop="1">
4648
<scheme>GFS_photochemistry</scheme>
4749
<scheme>GFS_DCNV_generic_pre</scheme>
4850
<scheme>get_phi_fv3</scheme>

‎ccpp/suites/suite_SCM_GFS_v15p2.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
</group>
1212
<group name="radiation">
1313
<subcycle loop="1">
14-
<scheme>GFS_suite_interstitial_rad_reset</scheme>
1514
<scheme>GFS_rrtmg_pre</scheme>
1615
<scheme>GFS_radiation_surface</scheme>
1716
<scheme>rad_sw_pre</scheme>
@@ -22,9 +21,8 @@
2221
<scheme>GFS_rrtmg_post</scheme>
2322
</subcycle>
2423
</group>
25-
<group name="physics">
24+
<group name="phys_ps">
2625
<subcycle loop="1">
27-
<scheme>GFS_suite_interstitial_phys_reset</scheme>
2826
<scheme>GFS_suite_stateout_reset</scheme>
2927
<scheme>get_prs_fv3</scheme>
3028
<scheme>GFS_suite_interstitial_1</scheme>
@@ -59,6 +57,10 @@
5957
<scheme>cires_ugwp_post</scheme>
6058
<scheme>GFS_GWD_generic_post</scheme>
6159
<scheme>GFS_suite_stateout_update</scheme>
60+
</subcycle>
61+
</group>
62+
<group name="phys_ts">
63+
<subcycle loop="1">
6264
<scheme>GFS_photochemistry</scheme>
6365
<scheme>get_phi_fv3</scheme>
6466
<scheme>GFS_suite_interstitial_3</scheme>

‎ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
</group>
1212
<group name="radiation">
1313
<subcycle loop="1">
14-
<scheme>GFS_suite_interstitial_rad_reset</scheme>
1514
<scheme>GFS_rrtmg_pre</scheme>
1615
<scheme>GFS_radiation_surface</scheme>
1716
<scheme>rad_sw_pre</scheme>
@@ -22,9 +21,8 @@
2221
<scheme>GFS_rrtmg_post</scheme>
2322
</subcycle>
2423
</group>
25-
<group name="physics">
24+
<group name="phys_ps">
2625
<subcycle loop="1">
27-
<scheme>GFS_suite_interstitial_phys_reset</scheme>
2826
<scheme>GFS_suite_stateout_reset</scheme>
2927
<scheme>get_prs_fv3</scheme>
3028
<scheme>GFS_suite_interstitial_1</scheme>
@@ -40,6 +38,10 @@
4038
<scheme>cires_ugwp_post</scheme>
4139
<scheme>GFS_GWD_generic_post</scheme>
4240
<scheme>GFS_suite_stateout_update</scheme>
41+
</subcycle>
42+
</group>
43+
<group name="phys_ts">
44+
<subcycle loop="1">
4345
<scheme>GFS_photochemistry</scheme>
4446
<scheme>get_phi_fv3</scheme>
4547
<scheme>GFS_suite_interstitial_3</scheme>

‎ccpp/suites/suite_SCM_GFS_v15p2_FA.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
</group>
1212
<group name="radiation">
1313
<subcycle loop="1">
14-
<scheme>GFS_suite_interstitial_rad_reset</scheme>
1514
<scheme>GFS_rrtmg_pre</scheme>
1615
<scheme>GFS_radiation_surface</scheme>
1716
<scheme>rad_sw_pre</scheme>
@@ -22,9 +21,8 @@
2221
<scheme>GFS_rrtmg_post</scheme>
2322
</subcycle>
2423
</group>
25-
<group name="physics">
24+
<group name="phys_ps">
2625
<subcycle loop="1">
27-
<scheme>GFS_suite_interstitial_phys_reset</scheme>
2826
<scheme>GFS_suite_stateout_reset</scheme>
2927
<scheme>get_prs_fv3</scheme>
3028
<scheme>GFS_suite_interstitial_1</scheme>
@@ -59,6 +57,10 @@
5957
<scheme>cires_ugwp_post</scheme>
6058
<scheme>GFS_GWD_generic_post</scheme>
6159
<scheme>GFS_suite_stateout_update</scheme>
60+
</subcycle>
61+
</group>
62+
<group name="phys_ts">
63+
<subcycle loop="1">
6264
<scheme>GFS_photochemistry</scheme>
6365
<scheme>get_phi_fv3</scheme>
6466
<scheme>GFS_suite_interstitial_3</scheme>

0 commit comments

Comments
 (0)