Merge remote-tracking branch 'dom/bugfix/ccpp_prebuild_unit_conv' int…

…o cubed_sphere_chunks
NOAA-EMC · Oct 18, 2024 · 8e8df02 · 8e8df02
2 parents ceecedd + c304b42
commit 8e8df02
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -4,8 +4,10 @@
   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 = main
+  url = https://github.com/climbfuji/ccpp-framework
+  branch = bugfix/unit_conv_invalid_allocation_prebuild
 [submodule "ccpp/physics"]
   path = ccpp/physics
   url = https://github.com/ufs-community/ccpp-physics

diff --git a/ccpp/framework b/ccpp/framework
+3 −2		scripts/mkcap.py
+30 −5		scripts/mkstatic.py
+2 −1		test_prebuild/run_all_tests.sh
+11 −6		test_prebuild/test_blocked_data/main.F90
+5 −5		test_prebuild/test_chunked_data/main.F90
+98 −0		test_prebuild/test_unit_conv/CMakeLists.txt
+16 −0		test_prebuild/test_unit_conv/README.md
+13 −0		test_prebuild/test_unit_conv/ccpp_kinds.F90
+15 −0		test_prebuild/test_unit_conv/ccpp_kinds.meta
+82 −0		test_prebuild/test_unit_conv/ccpp_prebuild_config.py
+22 −0		test_prebuild/test_unit_conv/data.F90
+53 −0		test_prebuild/test_unit_conv/data.meta
+92 −0		test_prebuild/test_unit_conv/main.F90
+13 −0		test_prebuild/test_unit_conv/run_test.sh
+11 −0		test_prebuild/test_unit_conv/suite_unit_conv_suite.xml
+55 −0		test_prebuild/test_unit_conv/unit_conv_scheme_1.F90
+41 −0		test_prebuild/test_unit_conv/unit_conv_scheme_1.meta
+55 −0		test_prebuild/test_unit_conv/unit_conv_scheme_2.F90
+41 −0		test_prebuild/test_unit_conv/unit_conv_scheme_2.meta