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

Jump to bottom

Change standard name and unit of CCPP error flag variable in CCPP framework and physics #467

Merged
merged 6 commits into from
Jan 26, 2022
Merged

Change standard name and unit of CCPP error flag variable in CCPP framework and physics #467

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
11a09b4
Update .gitmodules and submodule pointers for ccpp-framework and physics
climbfuji Jan 16, 2022
f63b235
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into ccp…
climbfuji Jan 16, 2022
a7c293b
Update submodule pointer for ccpp-framework
climbfuji Jan 17, 2022
df8ca8e
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into ccp…
climbfuji Jan 21, 2022
4c18527
Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into ccp…
climbfuji Jan 25, 2022
622bbaa
Revert .gitmodules and update submodule pointers for ccpp-framework a…
climbfuji Jan 26, 2022
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 = main
url = https://github.com/climbfuji/ccpp-framework
branch = ccpp_error_code_in_prebuild
[submodule "ccpp/physics"]
path = ccpp/physics
url = https://github.com/NCAR/ccpp-physics
branch = main
#url = https://github.com/NCAR/ccpp-physics
#branch = main
url = https://github.com/climbfuji/ccpp-physics
branch = ccpp_error_code_in_prebuild
[submodule "upp"]
path = upp
url = https://github.com/NOAA-EMC/UPP
Expand Down
2 changes: 1 addition & 1 deletion ccpp/framework
Open in desktop
Submodule framework updated 37 files
+3 −3 doc/HelloWorld/hello_scheme.meta
+1 −1 doc/HelloWorld/hello_world_host.meta
+3 −3 doc/HelloWorld/temp_adjust.meta
+2 −2 scripts/common.py
+12 −5 scripts/fortran_tools/parse_fortran_file.py
+9 −8 scripts/metadata_parser.py
+1 −1 scripts/metadata_table.py
+1 −1 scripts/metavar.py
+0 −1 scripts/mkcap.py
+2 −2 scripts/mkstatic.py
+0 −8 scripts/parse_tools/parse_checkers.py
+4 −4 src/ccpp_types.meta
+23 −0 test/advection_test/cld_ice.F90
+20 −2 test/advection_test/cld_ice.meta
+2 −2 test/advection_test/cld_liq.meta
+1 −1 test/advection_test/test_host.meta
+3 −3 test/capgen_test/environ_conditions.meta
+3 −3 test/capgen_test/make_ddt.meta
+3 −3 test/capgen_test/temp_adjust.meta
+28 −3 test/capgen_test/temp_calc_adjust.F90
+3 −3 test/capgen_test/temp_calc_adjust.meta
+4 −4 test/capgen_test/temp_set.meta
+1 −1 test/capgen_test/test_host.meta
+1 −1 test/unit_tests/sample_files/test_host.meta
+3 −3 test/unit_tests/sample_files/test_multi_ccpp_arg_tables.meta
+1 −1 test/unit_tests/sample_scheme_files/CCPPeq1_var_in_fort_meta.meta
+1 −1 test/unit_tests/sample_scheme_files/CCPPeq1_var_missing_in_fort.meta
+1 −1 test/unit_tests/sample_scheme_files/CCPPeq1_var_missing_in_meta.meta
+1 −1 test/unit_tests/sample_scheme_files/CCPPgt1_var_in_fort_meta.meta
+1 −1 test/unit_tests/sample_scheme_files/CCPPnotset_var_missing_in_meta.meta
+1 −1 test/unit_tests/sample_scheme_files/invalid_dummy_arg.meta
+1 −1 test/unit_tests/sample_scheme_files/invalid_subr_stmnt.meta
+3 −3 test/unit_tests/sample_scheme_files/mismatch_intent.meta
+2 −2 test/unit_tests/sample_scheme_files/missing_arg_table.meta
+3 −3 test/unit_tests/sample_scheme_files/missing_fort_header.meta
+3 −3 test/unit_tests/sample_scheme_files/reorder.meta
+3 −3 test/unit_tests/sample_scheme_files/temp_adjust.meta
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 115 files