relax not_compset constraint for default grids

Author: alperaltuntas

visualCaseGen/cime_interface.py

@@ -14,7 +14,7 @@
 
 Compset = namedtuple("Compset", ["alias", "lname", "model"])
 Resolution = namedtuple("Resolution", ["alias", "compset", "not_compset", "desc"])
-ComponentGrid = namedtuple("ComponentGrid", ["name", "nx", "ny", "mesh", "desc", "compset_constr", "not_compset_constr"])
+ComponentGrid = namedtuple("ComponentGrid", ["name", "nx", "ny", "mesh", "desc", "compset_constr", "not_compset_constr", "is_default"])
 
 
 class CIME_interface:
@@ -399,6 +399,7 @@ def _get_domains(self):
                 desc=desc+support,
                 compset_constr=set(), # to be filled in later
                 not_compset_constr=set(), # to be filled in later
+                is_default=False # to be updated later
             )
 
         return domains
@@ -433,9 +434,8 @@ def _retrieve_domains_and_resolutions(self):
         self.resolutions = []
 
         # Loop through model grid defaults. i.e., default grids for each model, to populate self.domains
-        # We currently don't make use of the model grid defaults, but we still read them in case any
-        # domain is only listed in the model grid defaults and not in the model grids. In that case,
-        # we want to make sure that the domain is still included in the self.domains dict.
+        # We read them in case any domain is only listed in the model grid defaults and not in the model grids.
+        # In that case, we want to make sure that the domain is still included in the self.domains dict.
         model_grid_defaults = self._grids_obj.get_child("model_grid_defaults", root=grids)
         default_grids = self._grids_obj.get_children("grid", root=model_grid_defaults)
         for default_grid in default_grids:
@@ -454,6 +454,7 @@ def _retrieve_domains_and_resolutions(self):
                         desc=domains[comp_grid].desc,
                         compset_constr=set(),
                         not_compset_constr=set(),
+                        is_default=True
                     )
                     domain_found[comp_grid] = True
 
@@ -495,6 +496,7 @@ def _retrieve_domains_and_resolutions(self):
                         desc=domains[comp_grid].desc,
                         compset_constr=set(),
                         not_compset_constr=set(),
+                        is_default=False
                     )
                     domain_found[comp_grid] = True
 

visualCaseGen/specs/grid_options.py

@@ -96,7 +96,7 @@ def check_comp_grid(comp_class, proposed_grid, compset_lname):
         proposed_grid.compset_constr, compset_lname
     ):
         return False
-    if proposed_grid.not_compset_constr and re.search(
+    if (not proposed_grid.is_default) and proposed_grid.not_compset_constr and re.search(
         proposed_grid.not_compset_constr, compset_lname
     ):
         return False