From 60676b92c39293adbfbe3d4823e66bdc8f58ed6e Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Tue, 19 Mar 2024 09:09:37 -0600 Subject: [PATCH] Revert "Add support for scheme w/o run phase (#548)" This reverts commit 8dafc9458192f35ac1087eb5078b114dbd45bee4. --- scripts/ccpp_datafile.py | 3 --- scripts/suite_objects.py | 16 +++++--------- test/capgen_test/run_test | 13 ++++-------- test/capgen_test/setup_coeffs.F90 | 24 --------------------- test/capgen_test/setup_coeffs.meta | 29 -------------------------- test/capgen_test/temp_scheme_files.txt | 1 - test/capgen_test/temp_suite.xml | 1 - test/capgen_test/test_host.F90 | 9 +++----- test/capgen_test/test_host_mod.F90 | 1 - test/capgen_test/test_host_mod.meta | 6 ------ test/capgen_test/test_reports.py | 5 +---- 11 files changed, 13 insertions(+), 95 deletions(-) delete mode 100644 test/capgen_test/setup_coeffs.F90 delete mode 100644 test/capgen_test/setup_coeffs.meta diff --git a/scripts/ccpp_datafile.py b/scripts/ccpp_datafile.py index 194a46ea..3c5092ed 100755 --- a/scripts/ccpp_datafile.py +++ b/scripts/ccpp_datafile.py @@ -704,9 +704,6 @@ def _new_scheme_entry(parent, scheme, group_name, scheme_headers): emsg = "Scheme entry already exists for {} but name is {}" raise CCPPDatatableError(emsg.format(sch_name, pname)) # end if - # Special case: Scheme w/o run phase. - if not scheme._has_run_phase: - return else: phase_entry = ET.SubElement(sch_entry, sch_tag) phase_entry.set("name", sch_name) diff --git a/scripts/suite_objects.py b/scripts/suite_objects.py index f611c5d2..37978d54 100755 --- a/scripts/suite_objects.py +++ b/scripts/suite_objects.py @@ -1098,7 +1098,6 @@ def __init__(self, scheme_xml, context, parent, run_env): self.__var_debug_checks = list() self.__forward_transforms = list() self.__reverse_transforms = list() - self._has_run_phase = True self.__optional_vars = list() super().__init__(name, context, parent, run_env, active_call_list=True) @@ -1144,9 +1143,6 @@ def analyze(self, phase, group, scheme_library, suite_vars, level): if phase in func: my_header = func[phase] self.__subroutine_name = my_header.title - else: - self._has_run_phase = False - return set() # end if else: estr = 'No schemes found for {}' @@ -1731,13 +1727,11 @@ def write(self, outfile, errcode, errmsg, indent): # # Write the scheme call. # - if self._has_run_phase: - stmt = 'call {}({})' - outfile.write('',indent+1) - outfile.write('! Call scheme', indent+1) - outfile.write(stmt.format(self.subroutine_name, my_args), indent+1) - outfile.write('',indent+1) - # end if + stmt = 'call {}({})' + outfile.write('',indent+1) + outfile.write('! Call scheme', indent+1) + outfile.write(stmt.format(self.subroutine_name, my_args), indent+1) + outfile.write('',indent+1) # # Copy any local pointers. # diff --git a/test/capgen_test/run_test b/test/capgen_test/run_test index 6798f584..0d5d44f7 100755 --- a/test/capgen_test/run_test +++ b/test/capgen_test/run_test @@ -129,7 +129,7 @@ ccpp_files="${ccpp_files},${build_dir}/ccpp/test_host_ccpp_cap.F90" ccpp_files="${ccpp_files},${build_dir}/ccpp/ccpp_ddt_suite_cap.F90" ccpp_files="${ccpp_files},${build_dir}/ccpp/ccpp_temp_suite_cap.F90" process_list="setter=temp_set,adjusting=temp_calc_adjust" -module_list="environ_conditions,make_ddt,setup_coeffs,temp_adjust,temp_calc_adjust,temp_set" +module_list="environ_conditions,make_ddt,temp_adjust,temp_calc_adjust,temp_set" dependencies="bar.F90,foo.F90,qux.F90" suite_list="ddt_suite;temp_suite" required_vars_ddt="ccpp_error_code,ccpp_error_message,horizontal_dimension" @@ -145,9 +145,7 @@ input_vars_ddt="${input_vars_ddt},model_times,number_of_model_times" input_vars_ddt="${input_vars_ddt},surface_air_pressure" output_vars_ddt="ccpp_error_code,ccpp_error_message" output_vars_ddt="${output_vars_ddt},model_times,number_of_model_times" -required_vars_temp="ccpp_error_code,ccpp_error_message" -required_vars_temp="${required_vars_temp},coefficients_for_interpolation" -required_vars_temp="${required_vars_temp},horizontal_dimension" +required_vars_temp="ccpp_error_code,ccpp_error_message,horizontal_dimension" required_vars_temp="${required_vars_temp},horizontal_loop_begin" required_vars_temp="${required_vars_temp},horizontal_loop_end" required_vars_temp="${required_vars_temp},index_of_water_vapor_specific_humidity" @@ -159,8 +157,7 @@ required_vars_temp="${required_vars_temp},time_step_for_physics" required_vars_temp="${required_vars_temp},vertical_interface_dimension" required_vars_temp="${required_vars_temp},vertical_layer_dimension" required_vars_temp="${required_vars_temp},water_vapor_specific_humidity" -input_vars_temp="coefficients_for_interpolation" -input_vars_temp="${input_vars_temp},horizontal_dimension" +input_vars_temp="horizontal_dimension" input_vars_temp="${input_vars_temp},horizontal_loop_begin" input_vars_temp="${input_vars_temp},horizontal_loop_end" input_vars_temp="${input_vars_temp},index_of_water_vapor_specific_humidity" @@ -171,9 +168,7 @@ input_vars_temp="${input_vars_temp},surface_air_pressure,time_step_for_physics" input_vars_temp="${input_vars_temp},vertical_interface_dimension" input_vars_temp="${input_vars_temp},vertical_layer_dimension" input_vars_temp="${input_vars_temp},water_vapor_specific_humidity" -output_vars_temp="ccpp_error_code,ccpp_error_message" -output_vars_temp="${output_vars_temp},coefficients_for_interpolation" -output_vars_temp="${output_vars_temp},potential_temperature" +output_vars_temp="ccpp_error_code,ccpp_error_message,potential_temperature" output_vars_temp="${output_vars_temp},potential_temperature_at_interface" output_vars_temp="${output_vars_temp},surface_air_pressure" output_vars_temp="${output_vars_temp},water_vapor_specific_humidity" diff --git a/test/capgen_test/setup_coeffs.F90 b/test/capgen_test/setup_coeffs.F90 deleted file mode 100644 index 09452780..00000000 --- a/test/capgen_test/setup_coeffs.F90 +++ /dev/null @@ -1,24 +0,0 @@ -module setup_coeffs - use ccpp_kinds, ONLY: kind_phys - implicit none - - public :: setup_coeffs_timestep_init - -contains - !> \section arg_table_setup_coeffs_timestep_init Argument Table - !! \htmlinclude arg_table_setup_coeffs_timestep_init.html - !! - subroutine setup_coeffs_timestep_init(coeffs, errmsg, errflg) - - real(kind_phys), intent(inout) :: coeffs(:) - character(len=512), intent(out) :: errmsg - integer, intent(out) :: errflg - - errmsg = '' - errflg = 0 - - coeffs(:) = 1._kind_phys - - end subroutine setup_coeffs_timestep_init - -end module setup_coeffs diff --git a/test/capgen_test/setup_coeffs.meta b/test/capgen_test/setup_coeffs.meta deleted file mode 100644 index 8d0fc5f4..00000000 --- a/test/capgen_test/setup_coeffs.meta +++ /dev/null @@ -1,29 +0,0 @@ -[ccpp-table-properties] - name = setup_coeffs - type = scheme -[ccpp-arg-table] - name = setup_coeffs_timestep_init - type = scheme -[ coeffs ] - standard_name = coefficients_for_interpolation - long_name = coefficients for interpolation - units = none - dimensions = (horizontal_dimension) - type = real - kind = kind_phys - intent = inout -[ errmsg ] - standard_name = ccpp_error_message - long_name = Error message for error handling in CCPP - units = none - dimensions = () - type = character - kind = len=512 - intent = out -[ errflg ] - standard_name = ccpp_error_code - long_name = Error flag for error handling in CCPP - units = 1 - dimensions = () - type = integer - intent = out diff --git a/test/capgen_test/temp_scheme_files.txt b/test/capgen_test/temp_scheme_files.txt index 6c831539..c2b56c0f 100644 --- a/test/capgen_test/temp_scheme_files.txt +++ b/test/capgen_test/temp_scheme_files.txt @@ -1,4 +1,3 @@ -setup_coeffs.meta temp_set.meta temp_adjust.meta temp_calc_adjust.meta diff --git a/test/capgen_test/temp_suite.xml b/test/capgen_test/temp_suite.xml index 7a4795c4..6fa836db 100644 --- a/test/capgen_test/temp_suite.xml +++ b/test/capgen_test/temp_suite.xml @@ -2,7 +2,6 @@ - setup_coeffs temp_set diff --git a/test/capgen_test/test_host.F90 b/test/capgen_test/test_host.F90 index ec352ae6..056b30a0 100644 --- a/test/capgen_test/test_host.F90 +++ b/test/capgen_test/test_host.F90 @@ -358,26 +358,23 @@ program test character(len=cs), target :: test_parts1(2) = (/ 'physics1 ', & 'physics2 ' /) character(len=cs), target :: test_parts2(1) = (/ 'data_prep ' /) - character(len=cm), target :: test_invars1(7) = (/ & + character(len=cm), target :: test_invars1(6) = (/ & 'potential_temperature ', & 'potential_temperature_at_interface ', & - 'coefficients_for_interpolation ', & 'surface_air_pressure ', & 'water_vapor_specific_humidity ', & 'potential_temperature_increment ', & 'time_step_for_physics ' /) - character(len=cm), target :: test_outvars1(7) = (/ & + character(len=cm), target :: test_outvars1(6) = (/ & 'potential_temperature ', & 'potential_temperature_at_interface ', & - 'coefficients_for_interpolation ', & 'surface_air_pressure ', & 'water_vapor_specific_humidity ', & 'ccpp_error_code ', & 'ccpp_error_message ' /) - character(len=cm), target :: test_reqvars1(9) = (/ & + character(len=cm), target :: test_reqvars1(8) = (/ & 'potential_temperature ', & 'potential_temperature_at_interface ', & - 'coefficients_for_interpolation ', & 'surface_air_pressure ', & 'water_vapor_specific_humidity ', & 'potential_temperature_increment ', & diff --git a/test/capgen_test/test_host_mod.F90 b/test/capgen_test/test_host_mod.F90 index 43be333a..d2f91136 100644 --- a/test/capgen_test/test_host_mod.F90 +++ b/test/capgen_test/test_host_mod.F90 @@ -17,7 +17,6 @@ module test_host_mod integer, parameter :: index_qv = 1 real(kind_phys), allocatable :: temp_midpoints(:,:) real(kind_phys) :: temp_interfaces(ncols, pverP) - real(kind_phys) :: coeffs(ncols) real(kind_phys), dimension(DiagDimStart:ncols, DiagDimStart:pver) :: & diag1, & diag2 diff --git a/test/capgen_test/test_host_mod.meta b/test/capgen_test/test_host_mod.meta index a450ee67..0d53f320 100644 --- a/test/capgen_test/test_host_mod.meta +++ b/test/capgen_test/test_host_mod.meta @@ -90,9 +90,3 @@ dimensions = (number_of_model_times) type = integer allocatable = True -[ coeffs ] - standard_name = coefficients_for_interpolation - long_name = coefficients for interpolation - units = none - dimensions = (horizontal_dimension) - type = real | kind = kind_phys \ No newline at end of file diff --git a/test/capgen_test/test_reports.py b/test/capgen_test/test_reports.py index 8682a7b0..da02aeea 100644 --- a/test/capgen_test/test_reports.py +++ b/test/capgen_test/test_reports.py @@ -68,7 +68,7 @@ def usage(errmsg=None): os.path.join(_BUILD_DIR, "ccpp", "ccpp_ddt_suite_cap.F90"), os.path.join(_BUILD_DIR, "ccpp", "ccpp_temp_suite_cap.F90")] _PROCESS_LIST = ["setter=temp_set", "adjusting=temp_calc_adjust"] -_MODULE_LIST = ["environ_conditions", "make_ddt", "setup_coeffs", "temp_adjust", +_MODULE_LIST = ["environ_conditions", "make_ddt", "temp_adjust", "temp_calc_adjust", "temp_set"] _SUITE_LIST = ["ddt_suite", "temp_suite"] _INPUT_VARS_DDT = ["model_times", "number_of_model_times", @@ -85,20 +85,17 @@ def usage(errmsg=None): _REQUIRED_VARS_TEMP = ["ccpp_error_code", "ccpp_error_message", "potential_temperature", "potential_temperature_at_interface", - "coefficients_for_interpolation", "potential_temperature_increment", "surface_air_pressure", "time_step_for_physics", "water_vapor_specific_humidity"] _INPUT_VARS_TEMP = ["potential_temperature", "potential_temperature_at_interface", - "coefficients_for_interpolation", "potential_temperature_increment", "surface_air_pressure", "time_step_for_physics", "water_vapor_specific_humidity"] _OUTPUT_VARS_TEMP = ["ccpp_error_code", "ccpp_error_message", "potential_temperature", "potential_temperature_at_interface", - "coefficients_for_interpolation", "surface_air_pressure", "water_vapor_specific_humidity"] def fields_string(field_type, field_list, sep):