Revert "Add support for scheme w/o run phase"

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)

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.
         #

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"

test/capgen_test/temp_scheme_files.txt

@@ -1,4 +1,3 @@
-setup_coeffs.meta
 temp_set.meta
 temp_adjust.meta
 temp_calc_adjust.meta

test/capgen_test/temp_suite.xml

@@ -2,7 +2,6 @@
 
 <suite name="temp_suite" version="1.0">
   <group name="physics1">
-    <scheme>setup_coeffs</scheme>
     <scheme>temp_set</scheme>
   </group>
   <group name="physics2">

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     ',                               &

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

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

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):