add flux_utils.py, TUNABLE_PARAMS; migrate all imports to new locations

Author: dgketchum

examples/2_Fort_Peck/custom_forward_run.py

@@ -1,25 +1,44 @@
+"""Placeholder forward run script for PEST++ workers.
+
+PestBuilder auto-generates the actual custom_forward_run.py in the pest/
+directory during calibration. This file exists only as a fallback template.
+"""
+
 import os
 import warnings
 
 warnings.filterwarnings("ignore", category=FutureWarning)
 
 
 def run():
-    """Custom forward runner for PEST++ workers."""
-    from swimrs.calibrate.run_mp import optimize_fields
-    from swimrs.swim.config import ProjectConfig
+    """Forward runner for PEST++ workers using the process package."""
+    from swimrs.process.input import SwimInput
+    from swimrs.process.loop_fast import run_daily_loop_fast
+    from swimrs.process.state import CalibrationParameters, load_pest_mult_properties
 
-    here = os.path.dirname(os.path.abspath(__file__))
-    conf_file = os.path.join(here, "2_Fort_Peck.toml")
-    if not os.path.exists(conf_file):
-        raise FileNotFoundError(f"Expected config at {conf_file}")
+    cwd = os.getcwd()
+    h5_path = os.path.join(cwd, "swim_input.h5")
+    mult_dir = os.path.join(cwd, "mult")
+    pred_dir = os.path.join(cwd, "pred")
+    os.makedirs(pred_dir, exist_ok=True)
 
-    cfg = ProjectConfig()
-    cfg.read_config(conf_file)
+    swim_input = SwimInput(h5_path=h5_path)
 
-    cwd = os.getcwd()
-    calibration_dir = os.path.join(cwd, "mult")
-    optimize_fields(conf_file, cfg.input_data, cwd, calibration_dir)
+    params = CalibrationParameters.from_pest_mult(
+        mult_dir=mult_dir, fids=swim_input.fids, base=swim_input.parameters
+    )
+    props = load_pest_mult_properties(
+        mult_dir=mult_dir, fids=swim_input.fids, base_props=swim_input.properties
+    )
+
+    output, _ = run_daily_loop_fast(swim_input=swim_input, parameters=params, properties=props)
+
+    # Write prediction files for PEST++
+    import numpy as np
+
+    for i, fid in enumerate(swim_input.fids):
+        pred_file = os.path.join(pred_dir, f"{fid}.csv")
+        np.savetxt(pred_file, output.etf[:, i], fmt="%.6f")
 
 
 if __name__ == "__main__":

examples/3_Crane/custom_forward_run.py

@@ -1,36 +1,44 @@
+"""Placeholder forward run script for PEST++ workers.
+
+PestBuilder auto-generates the actual custom_forward_run.py in the pest/
+directory during calibration. This file exists only as a fallback template.
+"""
+
 import os
 import warnings
 
 warnings.filterwarnings("ignore", category=FutureWarning)
 
 
 def run():
-    """Custom forward runner for PEST++ workers.
-
-    This imports the packaged optimize_fields function and executes it with the
-    configuration from the 3_Crane project. It expects to be run in the worker
-    directory; PEST++ will create a 'mult' subfolder containing parameter files.
-    """
-    from swimrs.calibrate.run_mp import optimize_fields
-    from swimrs.swim.config import ProjectConfig
-
-    here = os.path.dirname(os.path.abspath(__file__))
-    conf_file = os.path.join(here, "3_Crane.toml")
-    if not os.path.exists(conf_file):
-        conf_file = os.path.join(here, "config.toml")
-    if not os.path.exists(conf_file):
-        raise FileNotFoundError(f"Expected config at {conf_file}")
-
-    # Resolve input_data path from config
-    cfg = ProjectConfig()
-    cfg.read_config(conf_file)
-    input_data_path = cfg.input_data
-
-    # PEST++ worker CWD
+    """Forward runner for PEST++ workers using the process package."""
+    from swimrs.process.input import SwimInput
+    from swimrs.process.loop_fast import run_daily_loop_fast
+    from swimrs.process.state import CalibrationParameters, load_pest_mult_properties
+
     cwd = os.getcwd()
-    calibration_dir = os.path.join(cwd, "mult")
+    h5_path = os.path.join(cwd, "swim_input.h5")
+    mult_dir = os.path.join(cwd, "mult")
+    pred_dir = os.path.join(cwd, "pred")
+    os.makedirs(pred_dir, exist_ok=True)
+
+    swim_input = SwimInput(h5_path=h5_path)
+
+    params = CalibrationParameters.from_pest_mult(
+        mult_dir=mult_dir, fids=swim_input.fids, base=swim_input.parameters
+    )
+    props = load_pest_mult_properties(
+        mult_dir=mult_dir, fids=swim_input.fids, base_props=swim_input.properties
+    )
+
+    output, _ = run_daily_loop_fast(swim_input=swim_input, parameters=params, properties=props)
+
+    # Write prediction files for PEST++
+    import numpy as np
 
-    optimize_fields(conf_file, input_data_path, cwd, calibration_dir)
+    for i, fid in enumerate(swim_input.fids):
+        pred_file = os.path.join(pred_dir, f"{fid}.csv")
+        np.savetxt(pred_file, output.etf[:, i], fmt="%.6f")
 
 
 if __name__ == "__main__":