remove constants.py and related variables in other modules

Author: minghangli-uni

expts_manager/experiment_manager_tool/configuration_updater/f90nml_updater.py

@@ -1,12 +1,9 @@
 import os
 import numpy as np
 import f90nml
-from experiment_manager_tool.utils import constants
 from experiment_manager_tool.utils.util_functions import get_namelist_group
 
 class f90nmlUpdater:
-    def __init__(self):
-        self.combo_suffix = constants.COMBO_SUFFIX
 
     def update_nml_params(self, expt_path, param_dict, parameter_block, append_group_list: list =None, indx=None) -> None:
         """

expts_manager/experiment_manager_tool/manager/perturb_experiment.py

@@ -106,9 +106,6 @@ def _process_params_cross_files(self, filename: str, filecontent: dict) -> None:
         for groupname, name_dict in filecontent.items():
             self.tmp_count += 1
 
-            if not groupname.endswith(self.combo_suffix):
-                continue
-
             if name_dict:
                 self._generate_combined_dicts(groupname, name_dict, filename)
                 self.setup_expts(filename)

expts_manager/experiment_manager_tool/utils/base_manager.py

@@ -1,6 +1,5 @@
 import os
 from experiment_manager_tool.utils.ryaml_handler import read_yaml
-from experiment_manager_tool.utils import constants
 
 class BaseManager:
     """
@@ -12,10 +11,11 @@ def __init__(self, yamlfile: str) -> None:
         self._load_variables(self.yamlfile)
 
     def _load_variables(self, yamlfile: str) -> None:
+        print(yamlfile)
         self.indata = read_yaml(yamlfile)
+        print(self.indata)
         self.dir_manager = os.getcwd()
         self.test_path = self.indata.get("test_path")
         self.model = self.indata.get("model")
-        
-        self.combo_suffix = constants.COMBO_SUFFIX
-        self.branch_perturb = constants.BRANCH_PERTURB
+
+        self.branch_perturb = "perturb"

expts_manager/experiment_manager_tool/utils/constants.py

@@ -1,8 +1 @@
-MOM_PREFIX = "MOM_list"
-CONFIG_PREFIX = "config_list"
-RUNCONFIG_SUFFIX1 = "_attributes"
-RUNCONFIG_SUFFIX2 = "_modelio"
-NML_SUFFIX = "_nml"
-RUNSEQ_PREFIX = "runseq_list"
-COMBO_SUFFIX = "_combo"
 BRANCH_PERTURB = "perturb"

expts_manager/experiment_manager_tool/utils/util_functions.py

@@ -1,6 +1,5 @@
 import subprocess
 import os
-from experiment_manager_tool.utils import constants
 
 def update_diag_table(path: str, diag_path: str, diag_flag: bool, model: str) -> None:
     if diag_flag and diag_path:
@@ -24,9 +23,6 @@ def copy_diag_table(diag_path: str, path: str) -> None:
 
 def get_namelist_group(list_of_groupname: list[str], indx: int) -> str:
     nml_group = list_of_groupname[indx]
-    # rename the namlist by removing the suffix if the suffix with `_combo`
-    if nml_group.endswith(constants.COMBO_SUFFIX):
-        nml_group = nml_group[: -len(constants.COMBO_SUFFIX)]
     return nml_group
 
 def create_nested_dict(outer_key: str, inner_dict: dict[str, dict]) -> dict[str, dict]: