Merge branch 'feature/ufs_case_gen_exact_mode' of https://github.com/…

…dustinswales/ccpp-scm into feature/ufs_case_gen_exact_mode
NCAR · Jul 25, 2024 · 01287aa · 01287aa
2 parents 48e6fe8 + b0fcbcd
commit 01287aa
Show file tree

Hide file tree

Showing 25 changed files with 333 additions and 591 deletions.
diff --git a/.github/workflows/ci_build_scm_ubuntu_22.04.yml b/.github/workflows/ci_build_scm_ubuntu_22.04.yml
@@ -21,7 +21,7 @@ jobs:
       sp_ROOT:    /home/runner/NCEPLIBS-sp
       w3emc_ROOT: /home/runner/myw3emc
       SCM_ROOT:   /home/runner/work/ccpp-scm/ccpp-scm
-      suites:     SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0,SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps
+      suites:     SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v16_RRTMGP,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0,SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v16_RRTMGP_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps,SCM_HRRR_gf,SCM_HRRR_gf_ps
 
     # Workflow steps
     steps:

diff --git a/.github/workflows/ci_run_scm_rts.yml b/.github/workflows/ci_run_scm_rts.yml
@@ -1,3 +1,4 @@
+
 name: CI test to build and run SCM regression tests
 
 on: [pull_request, workflow_dispatch]
@@ -21,8 +22,8 @@ jobs:
       sp_ROOT:    /home/runner/NCEPLIBS-sp
       w3emc_ROOT: /home/runner/myw3emc
       SCM_ROOT:   /home/runner/work/ccpp-scm/ccpp-scm
-      suites:     SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0,SCM_RRFS_v1,SCM_GFS_v17_HR3,SCM_GFS_v17_HR3_RRTMGP
-      suites_ps:  SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps,SCM_RRFS_v1_ps,SCM_GFS_v17_HR3_ps,SCM_GFS_v17_HR3_RRTMGP_ps
+      suites:     SCM_GFS_v15p2,SCM_GFS_v16,SCM_GFS_v17_p8,SCM_HRRR,SCM_RRFS_v1beta,SCM_RAP,SCM_WoFS_v0,SCM_HRRR_gf,SCM_GFS_v17_p8_ugwpv1,SCM_GFS_v16_RRTMGP
+      suites_ps:  SCM_GFS_v15p2_ps,SCM_GFS_v16_ps,SCM_GFS_v17_p8_ps,SCM_HRRR_ps,SCM_RRFS_v1beta_ps,SCM_RAP_ps,SCM_WoFS_v0_ps,SCM_HRRR_gf_ps,SCM_GFS_v17_p8_ugwpv1_ps,SCM_GFS_v16_RRTMGP_ps
       dir_rt:     /home/runner/work/ccpp-scm/ccpp-scm/test/artifact-${{matrix.build-type}}
       dir_bl:     /home/runner/work/ccpp-scm/ccpp-scm/test/BL-${{matrix.build-type}}
 

diff --git a/ccpp/framework b/ccpp/framework
diff --git a/ccpp/physics b/ccpp/physics
diff --git a/ccpp/physics_namelists/input_GFS_v17_HR3_RRTMGP.nml b/ccpp/physics_namelists/input_GFS_v17_HR3_RRTMGP.nml
diff --git a/ccpp/physics_namelists/input_GFS_v17_HR3_RRTMGP_ps.nml b/ccpp/physics_namelists/input_GFS_v17_HR3_RRTMGP_ps.nml
diff --git a/ccpp/physics_namelists/input_GFS_v17_HR3.nml → ...ics_namelists/input_GFS_v17_p8_ugwpv1.nml b/ccpp/physics_namelists/input_GFS_v17_HR3.nml → ...ics_namelists/input_GFS_v17_p8_ugwpv1.nml
diff --git a/...hysics_namelists/input_GFS_v17_HR3_ps.nml → ..._namelists/input_GFS_v17_p8_ugwpv1_ps.nml b/...hysics_namelists/input_GFS_v17_HR3_ps.nml → ..._namelists/input_GFS_v17_p8_ugwpv1_ps.nml
diff --git a/ccpp/physics_namelists/input_RRFS_v1.nml → ccpp/physics_namelists/input_HRRR_gf.nml b/ccpp/physics_namelists/input_RRFS_v1.nml → ccpp/physics_namelists/input_HRRR_gf.nml
+49 −0		.github/workflows/python.yaml
+3 −0		pytest.ini
+73 −11		scripts/ccpp_capgen.py
+342 −22		scripts/ccpp_datafile.py
+1 −1		scripts/ccpp_fortran_to_metadata.py
+37 −2		scripts/ccpp_suite.py
+216 −183		scripts/constituents.py
+91 −0		scripts/fortran_tools/offline_check_fortran_vs_metadata.py
+17 −3		scripts/fortran_tools/parse_fortran_file.py
+78 −5		scripts/host_cap.py
+33 −14		scripts/metadata_table.py
+13 −7		scripts/metavar.py
+0 −1		scripts/parse_tools/parse_source.py
+3 −3		scripts/suite_objects.py
+367 −37		src/ccpp_constituent_prop_mod.F90
+27 −0		test/advection_test/cld_ice.F90
+1 −0		test/advection_test/cld_ice.meta
+21 −0		test/advection_test/cld_liq.F90
+1 −0		test/advection_test/cld_liq.meta
+2 −0		test/advection_test/run_test
+392 −61		test/advection_test/test_host.F90
+3 −1		test/advection_test/test_host_mod.F90
+3 −0		test/advection_test/test_reports.py
+3 −1		test/capgen_test/run_test
+5 −5		test/capgen_test/temp_adjust.F90
+14 −0		test/capgen_test/temp_adjust.meta
+3 −1		test/capgen_test/temp_set.F90
+14 −0		test/capgen_test/temp_set.meta
+5 −4		test/capgen_test/test_reports.py
+1 −0		test/hash_table_tests/test_hash.F90
+1 −0		test/unit_tests/sample_files/test_host.meta
+96 −0		test/unit_tests/sample_scheme_files/duplicate_dyn_const.F90
+104 −0		test/unit_tests/sample_scheme_files/duplicate_dyn_const.meta
+75 −0		test/unit_tests/sample_scheme_files/dyn_const_not_present.F90
+104 −0		test/unit_tests/sample_scheme_files/dyn_const_not_present.meta
+100 −0		test/unit_tests/sample_scheme_files/dyn_const_not_present_nested.F90
+104 −0		test/unit_tests/sample_scheme_files/dyn_const_not_present_nested.meta
+21 −0		test/unit_tests/sample_scheme_files/temp_adjust.F90
+1 −0		test/unit_tests/sample_scheme_files/temp_adjust.meta
+35 −0		test/unit_tests/test_metadata_scheme_file.py
+3 −0		test/unit_tests/test_metadata_table.py
+2 −2		test/var_compatibility_test/test_reports.py
+1,235 −10		physics/GWD/drag_suite.F90
+8 −0		physics/GWD/drag_suite.meta
+38 −10		physics/GWD/ugwpv1_gsldrag.F90
+30 −0		physics/GWD/ugwpv1_gsldrag.meta
+46 −6		physics/GWD/unified_ugwp.F90
+30 −0		physics/GWD/unified_ugwp.meta