From 9908b6bc74f2e71ee71470a17fb3b558065f6761 Mon Sep 17 00:00:00 2001 From: Austin Raney Date: Mon, 24 Jun 2024 13:07:42 -0400 Subject: [PATCH 1/2] feat: update cfe init config so it is compliant w/ CFE#116 --- python/ngen_conf/src/ngen/config/init_config/cfe.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python/ngen_conf/src/ngen/config/init_config/cfe.py b/python/ngen_conf/src/ngen/config/init_config/cfe.py index fcbdc5bc..3ba04aad 100644 --- a/python/ngen_conf/src/ngen/config/init_config/cfe.py +++ b/python/ngen_conf/src/ngen/config/init_config/cfe.py @@ -63,8 +63,11 @@ class CFEBase(serde.IniSerializerDeserializer): # prints various debug and bmi info verbosity: int = Field(0, gte=0, lte=3) - # direct runoff - surface_partitioning_scheme: Literal["Schaake", "Xinanjiang"] + # infiltration excess + surface_water_partitioning_scheme: Literal["Schaake", "Xinanjiang"] + + # surface runoff scheme + surface_runoff_scheme: Literal["GIUH", "NASH_CASCADE"] = "GIUH" @validator("nash_storage", "giuh_ordinates", pre=True) def _coerce_lists(cls, value): From b328e89ad6dcb43bb990db784baab11ba5b09246 Mon Sep 17 00:00:00 2001 From: Austin Raney Date: Mon, 24 Jun 2024 13:07:57 -0400 Subject: [PATCH 2/2] chore: update cfe config test data --- python/ngen_conf/tests/data/CFE/config.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python/ngen_conf/tests/data/CFE/config.txt b/python/ngen_conf/tests/data/CFE/config.txt index 3e03c5b6..f25af582 100644 --- a/python/ngen_conf/tests/data/CFE/config.txt +++ b/python/ngen_conf/tests/data/CFE/config.txt @@ -1,5 +1,6 @@ forcing_file=BMI -surface_partitioning_scheme=Schaake +surface_runoff_scheme=GIUH +surface_water_partitioning_scheme=Schaake soil_params.depth=2.0[m] soil_params.b=2.0[] soil_params.satdk=4.297e-06[m s-1]