diff --git a/.gitmodules b/.gitmodules index 1c57f432..85c12576 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "ccpp-framework"] path = ccpp_framework url = https://github.com/NCAR/ccpp-framework - fxtag = 2024-10-31-dev + fxtag = 2024-11-07-dev fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/NCAR/ccpp-framework [submodule "history"] @@ -20,7 +20,7 @@ [submodule "ncar-physics"] path = src/physics/ncar_ccpp url = https://github.com/ESCOMP/atmospheric_physics - fxtag = atmos_phys0_06_000 + fxtag = 045b630a8c3b41d90b6c006392c3907af762dd39 fxrequired = AlwaysRequired fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics [submodule "ccs_config"] diff --git a/ccpp_framework b/ccpp_framework index 76dbf36d..27d0486f 160000 --- a/ccpp_framework +++ b/ccpp_framework @@ -1 +1 @@ -Subproject commit 76dbf36ddccbe1cf04fa9de04b38338c26b648aa +Subproject commit 27d0486f61e86d54921edc82139884e5f9c67700 diff --git a/src/data/write_init_files.py b/src/data/write_init_files.py index aa93962e..03e0bd93 100644 --- a/src/data/write_init_files.py +++ b/src/data/write_init_files.py @@ -23,6 +23,7 @@ 'number_of_ccpp_constituents', 'number_of_ccpp_advected_constituents', 'ccpp_constituents', + 'ccpp_constituent_tendencies', 'ccpp_constituent_properties', 'ccpp_constituent_minimum_values', 'ccpp_error_message', @@ -326,7 +327,7 @@ def gather_ccpp_req_vars(cap_database): for cvar in cap_database.call_list(phase).variable_list(): stdname = cvar.get_prop_value('standard_name') intent = cvar.get_prop_value('intent') - is_const = cvar.get_prop_value('advected') + is_const = cvar.get_prop_value('advected') or cvar.get_prop_value('constituent') if ((intent in _INPUT_TYPES) and (stdname not in req_vars) and (stdname not in _EXCLUDED_STDNAMES)): diff --git a/src/physics/ncar_ccpp b/src/physics/ncar_ccpp index 67927f15..045b630a 160000 --- a/src/physics/ncar_ccpp +++ b/src/physics/ncar_ccpp @@ -1 +1 @@ -Subproject commit 67927f15113eb9c5d4a57f2276d67b8ad88c5149 +Subproject commit 045b630a8c3b41d90b6c006392c3907af762dd39 diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_4D.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_4D.F90 index a0a4e78d..23cc8e0d 100644 --- a/test/unit/sample_files/write_init_files/phys_vars_init_check_4D.F90 +++ b/test/unit/sample_files/write_init_files/phys_vars_init_check_4D.F90 @@ -34,7 +34,7 @@ module phys_vars_init_check_4D integer, public, parameter :: READ_FROM_FILE = 3 ! Total number of physics-related variables: integer, public, parameter :: phys_var_num = 2 - integer, public, parameter :: phys_const_num = 15 + integer, public, parameter :: phys_const_num = 16 !Max length of physics-related variable standard names: integer, public, parameter :: std_name_len = 25 @@ -50,6 +50,7 @@ module phys_vars_init_check_4D character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ & "ccpp_constituent_minimum_values ", & "ccpp_constituent_properties ", & + "ccpp_constituent_tendencies ", & "ccpp_constituents ", & "ccpp_error_code ", & "ccpp_error_message ", & diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_bvd.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_bvd.F90 index e2442382..6f61f300 100644 --- a/test/unit/sample_files/write_init_files/phys_vars_init_check_bvd.F90 +++ b/test/unit/sample_files/write_init_files/phys_vars_init_check_bvd.F90 @@ -34,7 +34,7 @@ module phys_vars_init_check_bvd integer, public, parameter :: READ_FROM_FILE = 3 ! Total number of physics-related variables: integer, public, parameter :: phys_var_num = 2 - integer, public, parameter :: phys_const_num = 15 + integer, public, parameter :: phys_const_num = 16 !Max length of physics-related variable standard names: integer, public, parameter :: std_name_len = 25 @@ -50,6 +50,7 @@ module phys_vars_init_check_bvd character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ & "ccpp_constituent_minimum_values ", & "ccpp_constituent_properties ", & + "ccpp_constituent_tendencies ", & "ccpp_constituents ", & "ccpp_error_code ", & "ccpp_error_message ", & diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_cnst.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_cnst.F90 index 365fe4c7..6849ef70 100644 --- a/test/unit/sample_files/write_init_files/phys_vars_init_check_cnst.F90 +++ b/test/unit/sample_files/write_init_files/phys_vars_init_check_cnst.F90 @@ -34,7 +34,7 @@ module phys_vars_init_check_cnst integer, public, parameter :: READ_FROM_FILE = 3 ! Total number of physics-related variables: integer, public, parameter :: phys_var_num = 3 - integer, public, parameter :: phys_const_num = 15 + integer, public, parameter :: phys_const_num = 16 !Max length of physics-related variable standard names: integer, public, parameter :: std_name_len = 25 @@ -51,6 +51,7 @@ module phys_vars_init_check_cnst character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ & "ccpp_constituent_minimum_values ", & "ccpp_constituent_properties ", & + "ccpp_constituent_tendencies ", & "ccpp_constituents ", & "ccpp_error_code ", & "ccpp_error_message ", & diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt.F90 index eb05327e..a502252c 100644 --- a/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt.F90 +++ b/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt.F90 @@ -34,7 +34,7 @@ module phys_vars_init_check_ddt integer, public, parameter :: READ_FROM_FILE = 3 ! Total number of physics-related variables: integer, public, parameter :: phys_var_num = 2 - integer, public, parameter :: phys_const_num = 15 + integer, public, parameter :: phys_const_num = 16 !Max length of physics-related variable standard names: integer, public, parameter :: std_name_len = 25 @@ -50,6 +50,7 @@ module phys_vars_init_check_ddt character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ & "ccpp_constituent_minimum_values ", & "ccpp_constituent_properties ", & + "ccpp_constituent_tendencies ", & "ccpp_constituents ", & "ccpp_error_code ", & "ccpp_error_message ", & diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt2.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt2.F90 index 57476344..f56246e5 100644 --- a/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt2.F90 +++ b/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt2.F90 @@ -34,7 +34,7 @@ module phys_vars_init_check_ddt2 integer, public, parameter :: READ_FROM_FILE = 3 ! Total number of physics-related variables: integer, public, parameter :: phys_var_num = 2 - integer, public, parameter :: phys_const_num = 15 + integer, public, parameter :: phys_const_num = 16 !Max length of physics-related variable standard names: integer, public, parameter :: std_name_len = 25 @@ -50,6 +50,7 @@ module phys_vars_init_check_ddt2 character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ & "ccpp_constituent_minimum_values ", & "ccpp_constituent_properties ", & + "ccpp_constituent_tendencies ", & "ccpp_constituents ", & "ccpp_error_code ", & "ccpp_error_message ", & diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt_array.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt_array.F90 index b8053aeb..6f5a5391 100644 --- a/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt_array.F90 +++ b/test/unit/sample_files/write_init_files/phys_vars_init_check_ddt_array.F90 @@ -34,7 +34,7 @@ module phys_vars_init_check_ddt_array integer, public, parameter :: READ_FROM_FILE = 3 ! Total number of physics-related variables: integer, public, parameter :: phys_var_num = 2 - integer, public, parameter :: phys_const_num = 15 + integer, public, parameter :: phys_const_num = 16 !Max length of physics-related variable standard names: integer, public, parameter :: std_name_len = 25 @@ -50,6 +50,7 @@ module phys_vars_init_check_ddt_array character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ & "ccpp_constituent_minimum_values ", & "ccpp_constituent_properties ", & + "ccpp_constituent_tendencies ", & "ccpp_constituents ", & "ccpp_error_code ", & "ccpp_error_message ", & diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_host_var.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_host_var.F90 index 80bcd703..eb89c64a 100644 --- a/test/unit/sample_files/write_init_files/phys_vars_init_check_host_var.F90 +++ b/test/unit/sample_files/write_init_files/phys_vars_init_check_host_var.F90 @@ -34,7 +34,7 @@ module phys_vars_init_check_host_var integer, public, parameter :: READ_FROM_FILE = 3 ! Total number of physics-related variables: integer, public, parameter :: phys_var_num = 1 - integer, public, parameter :: phys_const_num = 15 + integer, public, parameter :: phys_const_num = 16 !Max length of physics-related variable standard names: integer, public, parameter :: std_name_len = 25 @@ -49,6 +49,7 @@ module phys_vars_init_check_host_var character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ & "ccpp_constituent_minimum_values ", & "ccpp_constituent_properties ", & + "ccpp_constituent_tendencies ", & "ccpp_constituents ", & "ccpp_error_code ", & "ccpp_error_message ", & diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_mf.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_mf.F90 index affe1bc7..36f485ee 100644 --- a/test/unit/sample_files/write_init_files/phys_vars_init_check_mf.F90 +++ b/test/unit/sample_files/write_init_files/phys_vars_init_check_mf.F90 @@ -34,7 +34,7 @@ module phys_vars_init_check_mf integer, public, parameter :: READ_FROM_FILE = 3 ! Total number of physics-related variables: integer, public, parameter :: phys_var_num = 2 - integer, public, parameter :: phys_const_num = 15 + integer, public, parameter :: phys_const_num = 16 !Max length of physics-related variable standard names: integer, public, parameter :: std_name_len = 25 @@ -50,6 +50,7 @@ module phys_vars_init_check_mf character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ & "ccpp_constituent_minimum_values ", & "ccpp_constituent_properties ", & + "ccpp_constituent_tendencies ", & "ccpp_constituents ", & "ccpp_error_code ", & "ccpp_error_message ", & diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_no_horiz.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_no_horiz.F90 index aa7f2cca..27a171c0 100644 --- a/test/unit/sample_files/write_init_files/phys_vars_init_check_no_horiz.F90 +++ b/test/unit/sample_files/write_init_files/phys_vars_init_check_no_horiz.F90 @@ -34,7 +34,7 @@ module phys_vars_init_check_no_horiz integer, public, parameter :: READ_FROM_FILE = 3 ! Total number of physics-related variables: integer, public, parameter :: phys_var_num = 2 - integer, public, parameter :: phys_const_num = 15 + integer, public, parameter :: phys_const_num = 16 !Max length of physics-related variable standard names: integer, public, parameter :: std_name_len = 25 @@ -50,6 +50,7 @@ module phys_vars_init_check_no_horiz character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ & "ccpp_constituent_minimum_values ", & "ccpp_constituent_properties ", & + "ccpp_constituent_tendencies ", & "ccpp_constituents ", & "ccpp_error_code ", & "ccpp_error_message ", & diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_noreq.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_noreq.F90 index 9e656376..b718c52c 100644 --- a/test/unit/sample_files/write_init_files/phys_vars_init_check_noreq.F90 +++ b/test/unit/sample_files/write_init_files/phys_vars_init_check_noreq.F90 @@ -34,7 +34,7 @@ module phys_vars_init_check_noreq integer, public, parameter :: READ_FROM_FILE = 3 ! Total number of physics-related variables: integer, public, parameter :: phys_var_num = 0 - integer, public, parameter :: phys_const_num = 15 + integer, public, parameter :: phys_const_num = 16 !Max length of physics-related variable standard names: integer, public, parameter :: std_name_len = 0 @@ -48,6 +48,7 @@ module phys_vars_init_check_noreq character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ & "ccpp_constituent_minimum_values ", & "ccpp_constituent_properties ", & + "ccpp_constituent_tendencies ", & "ccpp_constituents ", & "ccpp_error_code ", & "ccpp_error_message ", & diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_param.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_param.F90 index 0516bff5..8d7cc72e 100644 --- a/test/unit/sample_files/write_init_files/phys_vars_init_check_param.F90 +++ b/test/unit/sample_files/write_init_files/phys_vars_init_check_param.F90 @@ -34,7 +34,7 @@ module phys_vars_init_check_param integer, public, parameter :: READ_FROM_FILE = 3 ! Total number of physics-related variables: integer, public, parameter :: phys_var_num = 3 - integer, public, parameter :: phys_const_num = 15 + integer, public, parameter :: phys_const_num = 16 !Max length of physics-related variable standard names: integer, public, parameter :: std_name_len = 26 @@ -51,6 +51,7 @@ module phys_vars_init_check_param character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ & "ccpp_constituent_minimum_values ", & "ccpp_constituent_properties ", & + "ccpp_constituent_tendencies ", & "ccpp_constituents ", & "ccpp_error_code ", & "ccpp_error_message ", & diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_protect.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_protect.F90 index 5cbf54e3..830ef124 100644 --- a/test/unit/sample_files/write_init_files/phys_vars_init_check_protect.F90 +++ b/test/unit/sample_files/write_init_files/phys_vars_init_check_protect.F90 @@ -34,7 +34,7 @@ module phys_vars_init_check_protect integer, public, parameter :: READ_FROM_FILE = 3 ! Total number of physics-related variables: integer, public, parameter :: phys_var_num = 2 - integer, public, parameter :: phys_const_num = 15 + integer, public, parameter :: phys_const_num = 16 !Max length of physics-related variable standard names: integer, public, parameter :: std_name_len = 25 @@ -50,6 +50,7 @@ module phys_vars_init_check_protect character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ & "ccpp_constituent_minimum_values ", & "ccpp_constituent_properties ", & + "ccpp_constituent_tendencies ", & "ccpp_constituents ", & "ccpp_error_code ", & "ccpp_error_message ", & diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_scalar.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_scalar.F90 index b0ea0ae1..6332680d 100644 --- a/test/unit/sample_files/write_init_files/phys_vars_init_check_scalar.F90 +++ b/test/unit/sample_files/write_init_files/phys_vars_init_check_scalar.F90 @@ -34,7 +34,7 @@ module phys_vars_init_check_scalar integer, public, parameter :: READ_FROM_FILE = 3 ! Total number of physics-related variables: integer, public, parameter :: phys_var_num = 2 - integer, public, parameter :: phys_const_num = 15 + integer, public, parameter :: phys_const_num = 16 !Max length of physics-related variable standard names: integer, public, parameter :: std_name_len = 25 @@ -50,6 +50,7 @@ module phys_vars_init_check_scalar character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ & "ccpp_constituent_minimum_values ", & "ccpp_constituent_properties ", & + "ccpp_constituent_tendencies ", & "ccpp_constituents ", & "ccpp_error_code ", & "ccpp_error_message ", & diff --git a/test/unit/sample_files/write_init_files/phys_vars_init_check_simple.F90 b/test/unit/sample_files/write_init_files/phys_vars_init_check_simple.F90 index 5f471607..66f4d984 100644 --- a/test/unit/sample_files/write_init_files/phys_vars_init_check_simple.F90 +++ b/test/unit/sample_files/write_init_files/phys_vars_init_check_simple.F90 @@ -34,7 +34,7 @@ module phys_vars_init_check_simple integer, public, parameter :: READ_FROM_FILE = 3 ! Total number of physics-related variables: integer, public, parameter :: phys_var_num = 2 - integer, public, parameter :: phys_const_num = 15 + integer, public, parameter :: phys_const_num = 16 !Max length of physics-related variable standard names: integer, public, parameter :: std_name_len = 25 @@ -50,6 +50,7 @@ module phys_vars_init_check_simple character(len=36), public, protected :: phys_const_stdnames(phys_const_num) = (/ & "ccpp_constituent_minimum_values ", & "ccpp_constituent_properties ", & + "ccpp_constituent_tendencies ", & "ccpp_constituents ", & "ccpp_error_code ", & "ccpp_error_message ", &