Updated setup.cfg, input.config and ginputfunc.py

NOAA-OWP · Jun 21, 2024 · 70883c4 · 70883c4
1 parent 286f1cc
commit 70883c4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/python/createInput/configs/input.config b/python/createInput/configs/input.config
@@ -42,7 +42,7 @@ optimization_algorithm = dds
 
 # Specify algorithm parameters for PSO and GWO only
 # Control parameters c1, c2 and w are only needed for PSO
-# This entry is optional.
+# These entries are optional.
 swarm_size = 20
 c1 = 2
 c2 = 2

diff --git a/python/createInput/src/ginputfunc.py b/python/createInput/src/ginputfunc.py
@@ -147,9 +147,9 @@ def create_cfe_input(
         f.write("%s" %("max_gw_storage=" + str(dfa.loc[catID]['gw_Zmax']/1000.) + "[m]\n"))
         f.write("%s" %("Cgw=" + str(dfa.loc[catID]['gw_Coeff']*3600*1e-6) + "[m h-1]\n"))
         f.write("%s" %("expon=" + str(dfa.loc[catID]['gw_Expon']) + "[]\n"))
-        f.write("%s" %("gw_storage=0.05[m/m]\n"))
+        f.write("%s" %("gw_storage=0.3[m/m]\n"))
         f.write("%s" %("alpha_fc=0.33\n"))
-        f.write("%s" %("soil_storage=0.05[m/m]\n"))
+        f.write("%s" %("soil_storage=0.5[m/m]\n"))
         f.write("%s" %("K_nash=0.03[]\n"))
         f.write("%s" %("K_lf=0.01[]\n"))
         f.write("%s" %("nash_storage=0.0,0.0\n"))

diff --git a/python/runCalibValid/ngen_cal/setup.cfg b/python/runCalibValid/ngen_cal/setup.cfg
@@ -36,9 +36,11 @@ install_requires =
     hydrotools.metrics
     hydrotools.nwis_client
     pyarrow
+    pyswarms
+    pyyaml
+    scipy
     tables
     hypy @ git+https://github.com/noaa-owp/hypy@master#egg=hypy&subdirectory=python
-    pyyaml
 python_requires = >=3.7
 include_package_data = True