Skip to content

CCPP metadata-only changes; ccpp-framework update to head of "develop" branch #1034

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
DusanJovic-NOAA merged 8 commits into from
Dec 17, 2025
Merged

CCPP metadata-only changes; ccpp-framework update to head of "develop" branch #1034

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
86b4b48
Update .gitmodules and submodule pointers for ccpp/framework and ccpp…
climbfuji Nov 16, 2025
7247b33
ccpp/data/*.meta: relative_path --> dependencies_path
climbfuji Nov 18, 2025
8543803
Merge branch 'develop' of https://github.com/NOAA-EMC/ufsatm into fea…
climbfuji Nov 18, 2025
4a14806
Merge branch 'develop' of https://github.com/NOAA-EMC/ufsatm into fea…
climbfuji Dec 2, 2025
e197a02
Merge branch 'develop' of https://github.com/noaa-emc/ufsatm into HEAD
climbfuji Dec 15, 2025
caccfd7
Update submodule pointer for ccpp-framework
climbfuji Dec 15, 2025
7352f1a
For ccpp-framework, update submodule pointer to NCAR develop and reve…
climbfuji Dec 15, 2025
826bbcf
Revert .gitmodules and update submodule pointer for ccpp/physics
climbfuji Dec 17, 2025
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: 8 additions & 4 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,16 @@
branch = dev/emc
[submodule "ccpp/framework"]
path = ccpp/framework
url = https://github.com/NCAR/ccpp-framework
branch = main
#url = https://github.com/NCAR/ccpp-framework
#branch = develop
url = https://github.com/climbfuji/ccpp-framework
branch = feature/rel_path_dep_path
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/ufs-community/ccpp-physics
branch = ufs/dev
#url = https://github.com/ufs-community/ccpp-physics
#branch = ufs/dev
url = https://github.com/climbfuji/ccpp-physics
branch = feature/rel_path_dep_path
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
2 changes: 1 addition & 1 deletion ccpp/data/CCPP_typedefs.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3230,7 +3230,7 @@
[ccpp-table-properties]
name = CCPP_typedefs
type = module
relative_path = ../physics/physics
dependencies_path = ../physics/physics
dependencies = hooks/machine.F,photochem/module_ozphys.F90
dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f

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 @@ -10413,7 +10413,7 @@
[ccpp-table-properties]
name = GFS_typedefs
type = module
relative_path = ../physics/physics/
dependencies_path = ../physics/physics/
dependencies = hooks/machine.F,hooks/physcons.F90
dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f
dependencies = MP/TEMPO/TEMPO/module_mp_tempo_params.F90
Expand Down
2 changes: 1 addition & 1 deletion ccpp/data/MPAS_typedefs.meta
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[ccpp-table-properties]
name = MPAS_typedefs
type = module
relative_path = ../physics/physics/
dependencies_path = ../physics/physics/
dependencies = hooks/machine.F

[ccpp-arg-table]
Expand Down
2 changes: 1 addition & 1 deletion ccpp/framework
Open in desktop
Submodule framework updated 39 files
+2 −3 cmake/ccpp_capgen.cmake
+21 −16 scripts/ccpp_capgen.py
+2 −0 scripts/ccpp_suite.py
+111 −37 scripts/fortran_tools/parse_fortran.py
+236 −160 scripts/fortran_tools/parse_fortran_file.py
+4 −4 scripts/metadata_parser.py
+31 −13 scripts/metadata_table.py
+22 −20 scripts/metavar.py
+19 −11 scripts/suite_objects.py
+23 −2 test/capgen_test/CMakeLists.txt
+3 −0 test/capgen_test/README.md
+1 −0 test/capgen_test/capgen_test_reports.py
+12 −0 test/capgen_test/ddt2.F90
+1 −0 test/capgen_test/environ_conditions.meta
+11 −0 test/capgen_test/make_ddt.F90
+1 −0 test/capgen_test/make_ddt.meta
+0 −0 test/capgen_test/source_dir1/environ_conditions.F90
+0 −0 test/capgen_test/source_dir2/temp_set.F90
+20 −2 test/capgen_test/temp_adjust.F90
+13 −1 test/capgen_test/temp_adjust.meta
+13 −0 test/capgen_test/temp_calc_adjust.F90
+24 −0 test/capgen_test/temp_calc_adjust.meta
+1 −0 test/capgen_test/temp_set.meta
+1 −1 test/ddthost_test/temp_adjust.meta
+3 −3 test/test_stub.py
+33 −0 test/unit_tests/sample_files/fortran_files/array_parsing_test.F90
+1 −1 test/unit_tests/sample_files/test_dependencies_path.meta
+101 −0 test/unit_tests/test_fortran_parse.py
+1 −1 test/unit_tests/test_fortran_write.py
+8 −8 test/unit_tests/test_metadata_table.py
+1 −1 test/var_compatibility_test/CMakeLists.txt
+5 −0 test/var_compatibility_test/README.md
+32 −0 test/var_compatibility_test/effrs_calc.F90
+25 −0 test/var_compatibility_test/effrs_calc.meta
+1 −1 test/var_compatibility_test/test_host_mod.F90
+6 −1 test/var_compatibility_test/var_compatibility_suite.xml
+1 −1 test/var_compatibility_test/var_compatibility_test_reports.py
+1 −1 test_prebuild/test_track_variables/scheme_2.meta
+3 −3 test_prebuild/unit_tests/test_metadata_parser.py
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 25 files
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_cloud_diagnostics.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.fv3.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.mpas.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_post.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_pre.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.fv3.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.meta
+1 −1 physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta
+1 −1 physics/SFC_Layer/UFS/sfc_diag.meta
+1 −1 physics/SFC_Layer/UFS/sfc_diag_post.meta
+1 −1 physics/SFC_Layer/UFS/sfc_diff.meta
+1 −1 physics/SFC_Models/SeaIce/CICE/sfc_cice.meta
+1 −1 physics/SFC_Models/SeaIce/CICE/sfc_sice.meta