Renamomg bugs

Author: manishvenu

tests/3_system/test_custom_compset_std_grid.py

@@ -16,7 +16,7 @@
 from visualCaseGen.initialize_stages import initialize_stages
 from visualCaseGen.specs.options import set_options
 from visualCaseGen.specs.relational_constraints import get_relational_constraints
-from regional_mom_workflows.CrocoDash.CrocoDash.visualCaseGen.visualCaseGen.custom_widget_types.mom6_forge_launcher import MOM6BathyLauncher
+from regional_mom_workflows.CrocoDash.CrocoDash.visualCaseGen.visualCaseGen.custom_widget_types.mom6_forge_launcher import MOM6ForgeLauncher
 from visualCaseGen.custom_widget_types.case_creator_widget import CaseCreatorWidget
 from tests.utils import safe_create_case
 

tests/3_system/test_custom_mom6_grid.py

@@ -16,7 +16,7 @@
 from visualCaseGen.initialize_stages import initialize_stages
 from visualCaseGen.specs.options import set_options
 from visualCaseGen.specs.relational_constraints import get_relational_constraints
-from regional_mom_workflows.CrocoDash.CrocoDash.visualCaseGen.visualCaseGen.custom_widget_types.mom6_forge_launcher import MOM6BathyLauncher
+from regional_mom_workflows.CrocoDash.CrocoDash.visualCaseGen.visualCaseGen.custom_widget_types.mom6_forge_launcher import MOM6ForgeLauncher
 from visualCaseGen.custom_widget_types.case_creator_widget import CaseCreatorWidget
 from tests.utils import safe_create_case
 
@@ -93,7 +93,7 @@ def test_custom_mom6_grid():
         # now launch the mom6_forge notebook
 
         mom6_forge_launcher_widget = Stage.active()._widget._main_body.children[-1]
-        assert isinstance(mom6_forge_launcher_widget, MOM6BathyLauncher)
+        assert isinstance(mom6_forge_launcher_widget, MOM6ForgeLauncher)
 
         # After setting all the required parameters, the launch button should be enabled
         assert mom6_forge_launcher_widget._btn_launch_mom6_forge.disabled is False

tests/3_system/test_f2000_custom_grid.py

@@ -18,7 +18,7 @@
 from visualCaseGen.specs.relational_constraints import get_relational_constraints
 from visualCaseGen.custom_widget_types.clm_modifier_launcher import MeshMaskModifierLauncher, FsurdatModifierLauncher
 from visualCaseGen.custom_widget_types.case_creator_widget import CaseCreatorWidget
-from regional_mom_workflows.CrocoDash.CrocoDash.visualCaseGen.visualCaseGen.custom_widget_types.mom6_forge_launcher import MOM6BathyLauncher
+from regional_mom_workflows.CrocoDash.CrocoDash.visualCaseGen.visualCaseGen.custom_widget_types.mom6_forge_launcher import MOM6ForgeLauncher
 from tests.utils import safe_create_case
 
 
@@ -311,7 +311,7 @@ def construct_custom_res_from_new_mom6_grid_modified_clm_grid(cime):
         # now launch the mom6_forge notebook
 
         mom6_forge_launcher_widget = Stage.active()._widget._main_body.children[-1]
-        assert isinstance(mom6_forge_launcher_widget, MOM6BathyLauncher)
+        assert isinstance(mom6_forge_launcher_widget, MOM6ForgeLauncher)
 
         # After setting all the required parameters, the launch button should be enabled
         assert mom6_forge_launcher_widget._btn_launch_mom6_forge.disabled is False

visualCaseGen/custom_widget_types/case_creator.py

@@ -9,7 +9,7 @@
 import math 
 
 from ProConPy.config_var import cvars
-from regional_mom_workflows.CrocoDash.CrocoDash.visualCaseGen.visualCaseGen.custom_widget_types.mom6_forge_launcher import MOM6BathyLauncher
+from visualCaseGen.custom_widget_types.mom6_forge_launcher import MOM6ForgeLauncher
 from visualCaseGen.custom_widget_types.dummy_output import DummyOutput
 from visualCaseGen.custom_widget_types.case_tools import xmlchange, run_case_setup, append_user_nl, is_ccs_config_writeable
 
@@ -642,10 +642,10 @@ def _apply_mom_namelist_changes(self, do_exec):
                 ocn_grid_mode == "Create New"
             ), f"Unknown ocean grid mode: {ocn_grid_mode}"
 
-        supergrid_file_path = MOM6BathyLauncher.supergrid_file_path()
-        topo_file_path = MOM6BathyLauncher.topo_file_path()
-        vgrid_file_path = MOM6BathyLauncher.vgrid_file_path()
-        ocn_grid_path = MOM6BathyLauncher.get_custom_ocn_grid_path()
+        supergrid_file_path = MOM6ForgeLauncher.supergrid_file_path()
+        topo_file_path = MOM6ForgeLauncher.topo_file_path()
+        vgrid_file_path = MOM6ForgeLauncher.vgrid_file_path()
+        ocn_grid_path = MOM6ForgeLauncher.get_custom_ocn_grid_path()
 
         # read in min and max depth from the MOM6 topo file:
         ds_topo = xr.open_dataset(topo_file_path)
@@ -752,7 +752,7 @@ def _apply_cice_namelist_changes(self, do_exec):
         if not comp_ice.startswith("cice"):
             return
 
-        cice_grid_file_path = MOM6BathyLauncher.cice_grid_file_path()
+        cice_grid_file_path = MOM6ForgeLauncher.cice_grid_file_path()
         self._apply_user_nl_changes(
             "cice",
             [

visualCaseGen/custom_widget_types/mom6_forge_launcher.py

@@ -14,7 +14,7 @@
 logger = logging.getLogger("\t" + __name__.split(".")[-1])
 
 
-class MOM6BathyLauncher(VBox):
+class MOM6ForgeLauncher(VBox):
     """A widget to create and launch a new mom6_forge notebook. The widget is enabled when all the
     required parameters for mom6_forge are set."""
 
@@ -139,7 +139,7 @@ def _on_btn_confirm_completion_clicked(self, b):
         files are created. If so, it confirms completion of mom6_forge. If not, it displays a
         warning message."""
 
-        custom_ocn_grid_path = MOM6BathyLauncher.get_custom_ocn_grid_path()
+        custom_ocn_grid_path = MOM6ForgeLauncher.get_custom_ocn_grid_path()
         if custom_ocn_grid_path is None:
             alert_warning(
                 "No custom_ocn_grid_path found. Cannot confirm completion of mom6_forge"
@@ -162,10 +162,10 @@ def _on_btn_confirm_completion_clicked(self, b):
         )
 
         # See if all required files are created:
-        mom6_supergrid_file = MOM6BathyLauncher.supergrid_file_path()
-        mom6_topog_file = MOM6BathyLauncher.topo_file_path()
-        esmf_mesh_file = MOM6BathyLauncher.esmf_mesh_file_path()
-        cice_grid_file = MOM6BathyLauncher.cice_grid_file_path()
+        mom6_supergrid_file = MOM6ForgeLauncher.supergrid_file_path()
+        mom6_topog_file = MOM6ForgeLauncher.topo_file_path()
+        esmf_mesh_file = MOM6ForgeLauncher.esmf_mesh_file_path()
+        cice_grid_file = MOM6ForgeLauncher.cice_grid_file_path()
         required_files = [mom6_supergrid_file, mom6_topog_file, esmf_mesh_file]
         if "CICE" in cvars["COMP_ICE_PHYS"].value:
             required_files.append(cice_grid_file)
@@ -186,9 +186,9 @@ def _on_btn_confirm_completion_clicked(self, b):
     def _launch_mom6_forge(self, nb_filepath):
         """Generate a new mom6_forge notebook and open it in a new tab. This method gets called when
         the user clicks the "Launch mom6_forge" button."""
-        nb = MOM6BathyLauncher._create_notebook_object()
-        MOM6BathyLauncher._write_notebook(nb, nb_filepath)
-        MOM6BathyLauncher._open_notebook_in_browser(nb_filepath)
+        nb = MOM6ForgeLauncher._create_notebook_object()
+        MOM6ForgeLauncher._write_notebook(nb, nb_filepath)
+        MOM6ForgeLauncher._open_notebook_in_browser(nb_filepath)
 
     @staticmethod
     def _create_notebook_object():
@@ -210,7 +210,7 @@ def _create_notebook_object():
         attempt_id = cvars['MB_ATTEMPT_ID'].value
 
         # if custom_grid_path doesn't exist, create it:
-        custom_ocn_grid_path = MOM6BathyLauncher.get_custom_ocn_grid_path()
+        custom_ocn_grid_path = MOM6ForgeLauncher.get_custom_ocn_grid_path()
         os.makedirs(custom_ocn_grid_path, exist_ok=True)
 
         # Create a new notebook:
@@ -314,22 +314,22 @@ def _create_notebook_object():
         save_files_cmd = (
             "# Do NOT modify this cell!\n\n"
             "# MOM6 supergrid file.\n"
-            f'grid.write_supergrid(f"{MOM6BathyLauncher.supergrid_file_path()}")\n\n'
+            f'grid.write_supergrid(f"{MOM6ForgeLauncher.supergrid_file_path()}")\n\n'
             "# Save MOM6 topography file:\n"
-            f'topo.write_topo(f"{MOM6BathyLauncher.topo_file_path()}")\n\n'
+            f'topo.write_topo(f"{MOM6ForgeLauncher.topo_file_path()}")\n\n'
             "# Save MOM6 vertical grid file:\n"
-            f'vgrid.write(f"{MOM6BathyLauncher.vgrid_file_path()}")\n\n'
+            f'vgrid.write(f"{MOM6ForgeLauncher.vgrid_file_path()}")\n\n'
         )
 
         if "CICE" in cvars["COMP_ICE_PHYS"].value:
             save_files_cmd += (
                 "# CICE grid file:\n"
-                f'topo.write_cice_grid(f"{MOM6BathyLauncher.cice_grid_file_path()}")\n\n'
+                f'topo.write_cice_grid(f"{MOM6ForgeLauncher.cice_grid_file_path()}")\n\n'
             )
 
         save_files_cmd += (
             "# Save ESMF mesh file:\n"
-            f'topo.write_esmf_mesh(f"{MOM6BathyLauncher.esmf_mesh_file_path()}")'
+            f'topo.write_esmf_mesh(f"{MOM6ForgeLauncher.esmf_mesh_file_path()}")'
         )
 
         nb["cells"].extend(
@@ -396,30 +396,30 @@ def nc_file_suffix():
 
     @staticmethod
     def supergrid_file_path():
-        custom_ocn_grid_path = MOM6BathyLauncher.get_custom_ocn_grid_path()
-        return custom_ocn_grid_path / f"ocean_hgrid_{MOM6BathyLauncher.nc_file_suffix()}"
+        custom_ocn_grid_path = MOM6ForgeLauncher.get_custom_ocn_grid_path()
+        return custom_ocn_grid_path / f"ocean_hgrid_{MOM6ForgeLauncher.nc_file_suffix()}"
 
     @staticmethod
     def topo_file_path():
-        custom_ocn_grid_path = MOM6BathyLauncher.get_custom_ocn_grid_path()
-        return custom_ocn_grid_path / f"ocean_topog_{MOM6BathyLauncher.nc_file_suffix()}"
+        custom_ocn_grid_path = MOM6ForgeLauncher.get_custom_ocn_grid_path()
+        return custom_ocn_grid_path / f"ocean_topog_{MOM6ForgeLauncher.nc_file_suffix()}"
 
     @staticmethod
     def vgrid_file_path():
-        custom_ocn_grid_path = MOM6BathyLauncher.get_custom_ocn_grid_path()
-        return custom_ocn_grid_path / f"ocean_vgrid_{MOM6BathyLauncher.nc_file_suffix()}"
+        custom_ocn_grid_path = MOM6ForgeLauncher.get_custom_ocn_grid_path()
+        return custom_ocn_grid_path / f"ocean_vgrid_{MOM6ForgeLauncher.nc_file_suffix()}"
 
     @staticmethod
     def scrip_grid_file_path():
-        custom_ocn_grid_path = MOM6BathyLauncher.get_custom_ocn_grid_path()
-        return custom_ocn_grid_path / f"scrip_{MOM6BathyLauncher.nc_file_suffix()}"
+        custom_ocn_grid_path = MOM6ForgeLauncher.get_custom_ocn_grid_path()
+        return custom_ocn_grid_path / f"scrip_{MOM6ForgeLauncher.nc_file_suffix()}"
 
     @staticmethod
     def esmf_mesh_file_path():
-        custom_ocn_grid_path = MOM6BathyLauncher.get_custom_ocn_grid_path()
-        return custom_ocn_grid_path / f"ESMF_mesh_{MOM6BathyLauncher.nc_file_suffix()}"
+        custom_ocn_grid_path = MOM6ForgeLauncher.get_custom_ocn_grid_path()
+        return custom_ocn_grid_path / f"ESMF_mesh_{MOM6ForgeLauncher.nc_file_suffix()}"
 
     @staticmethod
     def cice_grid_file_path():
-        custom_ocn_grid_path = MOM6BathyLauncher.get_custom_ocn_grid_path()
-        return custom_ocn_grid_path / f"cice_grid_{MOM6BathyLauncher.nc_file_suffix()}"
+        custom_ocn_grid_path = MOM6ForgeLauncher.get_custom_ocn_grid_path()
+        return custom_ocn_grid_path / f"cice_grid_{MOM6ForgeLauncher.nc_file_suffix()}"

visualCaseGen/custom_widget_types/runoff_mapping_generator.py

@@ -6,7 +6,7 @@
 from ProConPy.config_var import cvars
 from ProConPy.dialog import alert_warning
 from mom6_forge import mapping
-from regional_mom_workflows.CrocoDash.CrocoDash.visualCaseGen.visualCaseGen.custom_widget_types.mom6_forge_launcher import MOM6BathyLauncher
+from visualCaseGen.custom_widget_types.mom6_forge_launcher import MOM6ForgeLauncher
 
 class RunoffMappingGenerator(VBox):
     """Widget to generate runoff to ocean mapping for custom grids.
@@ -138,7 +138,7 @@ def get_ocn_grid_and_mesh(self):
                 ocn_mesh_path = self.cime.get_mesh_path("ocnice", ocn_grid)
             case "Create New":
                 ocn_grid = cvars["CUSTOM_OCN_GRID_NAME"].value
-                ocn_mesh_path = MOM6BathyLauncher.esmf_mesh_file_path()
+                ocn_mesh_path = MOM6ForgeLauncher.esmf_mesh_file_path()
             case _:
                 assert False, f"Unsupported OCN_GRID_MODE: {ocn_grid_mode}"
 

visualCaseGen/stages/grid_stages.py

@@ -9,7 +9,7 @@
 from ProConPy.stage import Stage, Guard
 from ProConPy.out_handler import handler as owh
 from visualCaseGen.custom_widget_types.stage_widget import StageWidget
-from regional_mom_workflows.CrocoDash.CrocoDash.visualCaseGen.visualCaseGen.custom_widget_types.mom6_forge_launcher import MOM6BathyLauncher
+from visualCaseGen.custom_widget_types.mom6_forge_launcher import MOM6ForgeLauncher
 from visualCaseGen.custom_widget_types.clm_modifier_launcher import MeshMaskModifierLauncher, FsurdatModifierLauncher
 from visualCaseGen.custom_widget_types.runoff_mapping_generator import RunoffMappingGenerator
 
@@ -109,7 +109,7 @@ def initialize_grid_stages(cime):
         "button to proceed to the next stage.",
         widget=StageWidget(
             VBox,
-            supplementary_widgets=[MOM6BathyLauncher()]
+            supplementary_widgets=[MOM6ForgeLauncher()]
         ),
         parent=Guard(
             title="Custom Ocn Grid",