Refactor model.py

NextGen_Forcings_Engine_BMI/NextGen_Forcings_Engine/bmi_model.py

@@ -353,7 +353,7 @@ def initialize(self, config_file: str, output_path: str | None = None) -> None:
         self._values["time_step_size"] = self.cfg_bmi["time_step_seconds"]
 
         # Initialize the Forcings Engine model
-        self._model = NWMv3ForcingEngineModel()
+        self._model = NWMv3ForcingEngineModel(self)
 
         # Set catchment ids if using hydrofabric
         if self._grid_type == "hydrofabric":
@@ -469,33 +469,15 @@ def update_until(self, future_time: float):
             == future_time
             == self.cfg_bmi["initial_time"]
         ):
-            self._model.run(
-                self._values,
-                future_time,
-                self._job_meta,
-                self.geo_meta,
-                self._input_forcing_mod,
-                self._supp_pcp_mod,
-                self._mpi_meta,
-                self._output_obj,
-            )
+            self._model.run(future_time)
         else:
             # Start a while loop to iterate the model time step by step until the
             # current model time reaches or exceeds the future_time.
             while self._values["current_model_time"] < future_time:
                 # Advance the model time by the defined time step size.
                 self._values["current_model_time"] += self._values["time_step_size"]
                 # Run the model for the new current time and update the state.
-                self._model.run(
-                    self._values,
-                    self._values["current_model_time"],
-                    self._job_meta,
-                    self.geo_meta,
-                    self._input_forcing_mod,
-                    self._supp_pcp_mod,
-                    self._mpi_meta,
-                    self._output_obj,
-                )
+                self._model.run(self._values["current_model_time"])
 
     # ------------------------------------------------------------
     def finalize(self):

NextGen_Forcings_Engine_BMI/NextGen_Forcings_Engine/core/consts.py

@@ -955,6 +955,22 @@
         "precipBiasCorrectOpt",
     ],
 }
+
+MODEL = {
+    # Used by method `model.NWMv3ForcingEngineModel.update_bmi_output_dict`
+    "update_dict_base_vars": [
+        "U2D",
+        "V2D",
+        "LWDOWN",
+        "RAINRATE",
+        "T2D",
+        "Q2D",
+        "PSFC",
+        "SWDOWN",
+    ],
+    "update_dict_var_include_lqfraq": "LQFRAC",
+}
+
 TEST_UTILS = {
     "OLD_NEW_VAR_MAP": {
         "q2dBiasCorrectOpt": "q2BiasCorrectOpt",