DRAFT: New test to demonstrate GNU failure

scripts/ccpp_suite.py

@@ -258,7 +258,8 @@ def groups(self):
 
     def find_variable(self, standard_name=None, source_var=None,
                       any_scope=True, clone=None,
-                      search_call_list=False, loop_subst=False):
+                      search_call_list=False, loop_subst=False,
+                      check_components=True):
         """Attempt to return the variable matching <standard_name>.
         if <standard_name> is None, the standard name from <source_var> is used.
         It is an error to pass both <standard_name> and <source_var> if
@@ -278,7 +279,8 @@ def find_variable(self, standard_name=None, source_var=None,
                                     any_scope=any_scope,
                                     clone=None,
                                     search_call_list=srch_clist,
-                                    loop_subst=loop_subst)
+                                    loop_subst=loop_subst,
+                                    check_components=check_components)
         if var is None:
             # No dice? Check for a group variable which can be promoted
             # Don't promote loop standard names
@@ -289,7 +291,8 @@ def find_variable(self, standard_name=None, source_var=None,
                                           source_var=source_var,
                                           any_scope=False,
                                           search_call_list=srch_clist,
-                                          loop_subst=loop_subst)
+                                          loop_subst=loop_subst,
+                                          check_components=check_components)
 
                 if var is not None:
                     # Promote variable to suite level
@@ -341,7 +344,8 @@ def find_variable(self, standard_name=None, source_var=None,
             # Guess it is time to clone a different variable
             var = super().find_variable(standard_name=standard_name,
                                         source_var=source_var,
-                                        any_scope=any_scope, clone=clone)
+                                        any_scope=any_scope, clone=clone,
+                                        check_components=check_components)
         # end if
         return var
 
@@ -459,7 +463,7 @@ def analyze(self, host_model, scheme_library, ddt_library, run_env):
                                                   for x in item.schemes()]))
             item.analyze(phase, self, scheme_library, ddt_library,
                          self.check_suite_state(phase),
-                         self.set_suite_state(phase))
+                         self.set_suite_state(phase), host_model)
             # Look for group variables that need to be promoted to the suite
             # We need to promote any variable used later to the suite, however,
             # we do not yet know if it will be used.
@@ -735,7 +739,8 @@ def __init__(self, sdfs, host_model, scheme_headers, run_env):
                     if group.phase() == phase:
                         self.__call_lists[phase].add_vars(group.call_list,
                                                           run_env,
-                                                          gen_unique=True)
+                                                          gen_unique=True,
+                                                          add_children=True)
                     # end if
                 # end for
              # end for

scripts/constituents.py

@@ -48,7 +48,8 @@ def __init__(self, name, parent_dict, run_env, variables=None):
 
     def find_variable(self, standard_name=None, source_var=None,
                       any_scope=True, clone=None,
-                      search_call_list=False, loop_subst=False):
+                      search_call_list=False, loop_subst=False,
+                      check_components=True):
         """Attempt to return the variable matching <standard_name>.
         if <standard_name> is None, the standard name from <source_var> is used.
         It is an error to pass both <standard_name> and <source_var> if
@@ -86,7 +87,8 @@ def find_variable(self, standard_name=None, source_var=None,
                                             source_var=source_var,
                                             any_scope=any_scope, clone=None,
                                             search_call_list=srch_clist,
-                                            loop_subst=loop_subst)
+                                            loop_subst=loop_subst,
+                                            check_components=check_components)
         else:
             var = None
         # end if

scripts/ddt_library.py

@@ -80,8 +80,8 @@ def intrinsic_elements(self, check_dict=None):
         # end if
         return pvalue
 
-    def clone(self, subst_dict, source_name=None, source_type=None,
-              context=None):
+    def clone(self, subst_dict=None, remove_intent=False,
+              source_name=None, source_type=None, context=None):
         """Create a clone of this VarDDT object's leaf Var with properties
         from <subst_dict> overriding this variable's properties.
         <subst_dict> may also be a string in which case only the local_name
@@ -288,7 +288,7 @@ def collect_ddt_fields(self, var_dict, var, run_env,
             # for a DDT, the variable also cannot be in our parent
             # dictionaries.
             stdname = dvar.get_prop_value('standard_name')
-            pvar = var_dict.find_variable(standard_name=stdname, any_scope=True)
+            pvar = var_dict.find_variable(standard_name=stdname, any_scope=True, check_components=False)
             if pvar and (not skip_duplicates):
                 ntx = context_string(dvar.context)
                 ctx = context_string(pvar.context)
@@ -300,6 +300,8 @@ def collect_ddt_fields(self, var_dict, var, run_env,
             if not pvar:
                 var_dict.add_variable(subvar, run_env)
             # end if
+            # Add this ddt variable to the parent DDT
+            var.add_component(subvar)
         # end for
 
     def ddt_modules(self, variable_list, ddt_mods=None):

scripts/host_cap.py

@@ -500,7 +500,7 @@ def suite_part_call_list(host_model, const_dict, suite_part, subst_loop_vars,
         var_dicts = [host_model, const_dict]
         # Figure out which dictionary has the variable
         for vdict in var_dicts:
-            hvar = vdict.find_variable(standard_name=stdname, any_scope=False)
+            hvar = vdict.find_variable(standard_name=stdname, any_scope=False, check_components=False)
             if hvar is not None:
                 var_dict = vdict
                 break
@@ -511,7 +511,7 @@ def suite_part_call_list(host_model, const_dict, suite_part, subst_loop_vars,
             raise CCPPError(errmsg)
         # End if
         if stdname not in CCPP_CONSTANT_VARS:
-            lname = var_dict.var_call_string(hvar, loop_vars=loop_vars)
+            lname = var_dict.var_call_string(hvar)
             hmvars.append(f"{sp_lname}={lname}")
         # End if
     # End for

scripts/host_model.py

@@ -203,15 +203,17 @@ def variable_locations(self):
 
     def find_variable(self, standard_name=None, source_var=None,
                       any_scope=False, clone=None,
-                      search_call_list=False, loop_subst=False):
+                      search_call_list=False, loop_subst=False,
+                      check_components=True):
         """Return the host model variable matching <standard_name> or None
         If <loop_subst> is True, substitute a begin:end range for an extent.
         """
         my_var = super().find_variable(standard_name=standard_name,
                                        source_var=source_var,
                                        any_scope=any_scope, clone=clone,
                                        search_call_list=search_call_list,
-                                       loop_subst=loop_subst)
+                                       loop_subst=loop_subst,
+                                       check_components=check_components)
         if my_var is None:
             # Check our DDT library
             if standard_name is None:
@@ -224,7 +226,8 @@ def find_variable(self, standard_name=None, source_var=None,
             # end if
             # Since we are the parent of the DDT library, only check that dict
             my_var = self.__ddt_dict.find_variable(standard_name=standard_name,
-                                                   any_scope=False)
+                                                   any_scope=False,
+                                                   check_components=check_components)
         # End if
         if loop_subst:
             if my_var is None:
@@ -257,7 +260,7 @@ def find_variable(self, standard_name=None, source_var=None,
                 vdims = [x.strip() for x in imatch.group(2).split(',')
                          if ':' not in x]
                 for vname in vdims:
-                    _ = self.find_variable(standard_name=vname)
+                    _ = self.find_variable(standard_name=vname, check_components=check_components)
                 # End for
             # End if
             if isinstance(my_var, VarDDT):

scripts/metadata_table.py

@@ -296,6 +296,7 @@ def register_ddts(file_list):
     """
     errors = ""
     ddt_names = set()
+    in_table = False
     for mfile in file_list:
         if os.path.exists(mfile):
             with open(mfile, 'r') as infile:
@@ -1201,13 +1202,15 @@ def variable_list(self, std_vars=True, loop_vars=True, consts=True):
                                               loop_vars=loop_vars,
                                               consts=consts)
 
-    def find_variable(self, std_name, use_local_name=False):
+    def find_variable(self, std_name, use_local_name=False, check_components=True):
         """Find a variable in this header's dictionary"""
         var = None
         if use_local_name:
             var = self.__variables.find_local_name(std_name)
         else:
-            var = self.__variables.find_variable(std_name, any_scope=False)
+            var = self.__variables.find_variable(std_name, 
+                                                 any_scope=False,
+                                                 check_components=check_components)
         # end if
         return var