Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cfe init config #133

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions python/ngen_conf/src/ngen/config/init_config/cfe.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
3 changes: 2 additions & 1 deletion python/ngen_conf/tests/data/CFE/config.txt
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
Loading