Changes required

Author: manishvenu

visualCaseGen/config_vars/grid_vars.py

@@ -40,6 +40,9 @@ def initialize_custom_grid_variables(cime):
     # A preexisting ATM grid picked for custom grid
     ConfigVarStrMS("CUSTOM_ATM_GRID", default_value="0.9x1.25")
 
+    # The associated domain mesh
+    ConfigVarStrMS("CUSTOM_ATM_DOMAIN_MESH")
+
     # Custom ocean grid variables
     ConfigVarStr("OCN_GRID_MODE")  # Standard, Modify Existing, Create New
 
@@ -71,6 +74,8 @@ def initialize_custom_grid_variables(cime):
         "CUSTOM_LND_GRID",
         default_value="0.9x1.25"
     )  # A preexisting land grid picked for the custom grid
+    ConfigVarStr("CUSTOM_LND_DOMAIN_MESH")  # The associated domain mesh
+
 
     # Auto-fill the INPUT_MASK_MESH variable based on the CUSTOM_LND_GRID variable
     def default_input_mask_mesh():

visualCaseGen/custom_widget_types/case_creator.py

@@ -108,7 +108,7 @@ def create_case(self, do_exec):
         if cvars["GRID_MODE"].value == "Standard":
             resolution = cvars["GRID"].value
         elif cvars["GRID_MODE"].value == "Custom":
-            resolution = "a%" + cvars["CUSTOM_ATM_GRID"].value + "_l%" + cvars["CUSTOM_LND_GRID"].value + "_oi%VisualCaseGen_Custom_r%null_g%null_w%null_z%null_m%VisualCaseGen_Custom"
+            resolution = "visualCaseGen_Custom"
         else:
             raise RuntimeError(f"Unknown grid mode: {cvars['GRID_MODE'].value}")
 
@@ -117,6 +117,7 @@ def create_case(self, do_exec):
             print(f"{COMMENT}Creating case...{RESET}\n")
 
         # Run create_newcase
+        breakpoint()
         self._run_create_newcase(caseroot, compset, resolution, do_exec)
 
         # Add custom grid information to the case if needed:
@@ -230,6 +231,14 @@ def _update_component_grids(
 
             xmlchange("OCN_GRID", "VCG_Changed", do_exec, self._is_non_local(), self._out)
 
+            xmlchange("ATM_GRID", cvars["CUSTOM_ATM_GRID"].value, do_exec, self._is_non_local(), self._out)
+
+            xmlchange("LND_GRID", cvars["CUSTOM_LND_GRID"].value, do_exec, self._is_non_local(), self._out)
+
+            xmlchange("ATM_DOMAIN_MESH", cvars["CUSTOM_ATM_DOMAIN_MESH"].value, do_exec, self._is_non_local(), self._out)
+
+            xmlchange("LND_DOMAIN_MESH", cvars["CUSTOM_LND_DOMAIN_MESH"].value, do_exec, self._is_non_local(), self._out)
+
 
         lnd_grid_mode = cvars["LND_GRID_MODE"].value
         if lnd_grid_mode == "Modified":

visualCaseGen/specs/grid_options.py

@@ -125,6 +125,26 @@ def custom_atm_grid_options_func(comp_atm, grid_mode):
         func=custom_atm_grid_options_func, args=(cvars["COMP_ATM"], cvars["GRID_MODE"])
     )
 
+    # CUSTOM_ATM_DOMAIN_MESH options
+    def custom_atm_domain_mesh_options_func(comp_atm, grid_mode):
+        """Return the options and descriptions for the custom ATM grid variable."""
+        compset_lname = cvars["COMPSET_LNAME"].value
+        compatible_atm_grids = []
+        descriptions = []
+        meshes = []
+        for atm_grid in cime.domains["atm"].values():
+            if check_comp_grid("ATM", atm_grid, compset_lname) is False:
+                continue
+            compatible_atm_grids.append(atm_grid.mesh)
+            descriptions.append(atm_grid.desc)
+            meshes.append(atm_grid.mesh)
+        return meshes, descriptions
+
+    cv_custom_atm_domain_mesh = cvars["CUSTOM_ATM_DOMAIN_MESH"]
+    cv_custom_atm_domain_mesh.options_spec = OptionsSpec(
+        func=custom_atm_domain_mesh_options_func, args=(cvars["COMP_ATM"], cvars["GRID_MODE"])
+    )
+
 
 def set_custom_ocn_grid_options(cime):
     """Set the options and options specs for the custom OCN grid variables.
@@ -223,6 +243,33 @@ def custom_lnd_grid_options_func(comp_lnd, custom_atm_grid, lnd_grid_mode):
         args=(cvars["COMP_LND"], cvars["CUSTOM_ATM_GRID"], cvars["LND_GRID_MODE"]),
     )
 
+
+    # CUSTOM_LND_DOMAIN_MESH options
+    def custom_lnd_domain_mesh_options_func(comp_lnd, custom_atm_grid, lnd_grid_mode):
+        """Return the options and descriptions for the custom LND grid variable."""
+        if comp_lnd != "clm":
+            return [custom_atm_grid], [
+                "(When CLM is not selected, custom LND grid is automatically set to ATM grid.)"
+            ]
+        else:
+            compset_lname = cvars["COMPSET_LNAME"].value
+            compatible_lnd_grids = []
+            descriptions = []
+            meshes = []
+            for lnd_grid in cime.domains["lnd"].values():
+                if check_comp_grid("LND", lnd_grid, compset_lname) is False:
+                    continue
+                compatible_lnd_grids.append(lnd_grid.name)
+                descriptions.append(lnd_grid.desc)
+                meshes.append(lnd_grid.mesh)
+            return meshes, descriptions
+
+    cv_custom_lnd_domain_mesh = cvars["CUSTOM_LND_DOMAIN_MESH"]
+    cv_custom_lnd_domain_mesh.options_spec = OptionsSpec(
+        func=custom_lnd_domain_mesh_options_func,
+        args=(cvars["COMP_LND"], cvars["CUSTOM_ATM_GRID"], cvars["LND_GRID_MODE"]),
+    )
+
     cv_fsurdat_idealized = cvars["FSURDAT_IDEALIZED"]
     cv_fsurdat_idealized.options = ["True", "False"]