From 70883c460ddfbf08db1f900bb3953aed40541046 Mon Sep 17 00:00:00 2001 From: Xia Feng Date: Fri, 21 Jun 2024 10:20:11 -0500 Subject: [PATCH] Updated setup.cfg, input.config and ginputfunc.py --- python/createInput/configs/input.config | 2 +- python/createInput/src/ginputfunc.py | 4 ++-- python/runCalibValid/ngen_cal/setup.cfg | 4 +++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/python/createInput/configs/input.config b/python/createInput/configs/input.config index 60b272c7..0fac3d22 100644 --- 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 index bd9ecdb3..84b03818 100644 --- 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 index 05e0bcf8..a391f393 100644 --- 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