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.

Sign up for GitHub

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

Jump to bottom

474: Add support for 3D z-sigma settings in MDU #476

Merged
merged 4 commits into from
Mar 29, 2023
Merged

474: Add support for 3D z-sigma settings in MDU #476

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5320ec2
Add support for 3D z-sigma settings in MDU
arthurvd Mar 22, 2023
6a036f7
Don't use PositiveFloat when 0.0 should be allowed.
arthurvd Mar 22, 2023
fcdc0e5
Use forward slashes in reference file to succeed on all platforms
arthurvd Mar 24, 2023
21fdc6f
Merge branch 'main' into feat/474_z-sigma-mdu
arthurvd Mar 28, 2023
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
28 changes: 28 additions & 0 deletions hydrolib/core/dflowfm/mdu/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1284,6 +1284,10 @@ class Comments(INIBasedModel.Comments):
"<*_part.pol>, polyline(s) x, y.", alias="partitionFile"
)
uniformwidth1d: Optional[str] = Field("", alias="uniformWidth1D")
dxwuimin2d: Optional[str] = Field(
"Smallest fraction dx/wu , set dx > Dxwuimin2D*wu",
alias="dxWuiMin2D",
)
waterlevini: Optional[str] = Field("Initial water level.", alias="waterLevIni")
bedlevuni: Optional[str] = Field(
"Uniform bed level [m], (only if bedlevtype>=3), used at missing z values in netfile.",
Expand Down Expand Up @@ -1351,6 +1355,24 @@ class Comments(INIBasedModel.Comments):
numtopsig: Optional[str] = Field(
"Number of sigma-layers on top of z-layers.", alias="numTopSig"
)
numtopsiguniform: Optional[str] = Field(
"Spatially constant number of sigma layers above z-layers in a z-sigma model (1: yes, 0: no, spatially varying)",
alias="numTopSigUniform",
)
dztop: Optional[str] = Field(
"Z-layer thickness of layers above level Dztopuniabovez", alias="dzTop"
)
floorlevtoplay: Optional[str] = Field(
"Floor level of top layer", alias="floorLevTopLay"
)
dztopuniabovez: Optional[str] = Field(
"Above this level layers will have uniform dzTop, below we use sigmaGrowthFactor",
alias="dzTopUniAboveZ",
)
keepzlayeringatbed: Optional[str] = Field(
"0:possibly very thin layer at bed, 1:bedlayerthickness == zlayerthickness, 2=equal thickness first two layers",
alias="keepZLayeringAtBed",
)
sigmagrowthfactor: Optional[str] = Field(
"layer thickness growth factor from bed up.", alias="sigmaGrowthFactor"
)
Expand Down Expand Up @@ -1419,6 +1441,7 @@ class Comments(INIBasedModel.Comments):
)
partitionfile: Optional[PolyFile] = Field(None, alias="partitionFile")
uniformwidth1d: float = Field(2.0, alias="uniformWidth1D")
dxwuimin2d: float = Field(0.0, alias="dxWuiMin2D")
waterlevini: float = Field(0.0, alias="waterLevIni")
bedlevuni: float = Field(-5.0, alias="bedLevUni")
bedslope: float = Field(0.0, alias="bedSlope")
Expand All @@ -1439,7 +1462,12 @@ class Comments(INIBasedModel.Comments):
kmx: int = Field(0, alias="kmx")
layertype: int = Field(1, alias="layerType")
numtopsig: int = Field(0, alias="numTopSig")
numtopsiguniform: bool = Field(True, alias="numTopSigUniform")
sigmagrowthfactor: float = Field(1.0, alias="sigmaGrowthFactor")
dztop: Optional[float] = Field(None, alias="dzTop")
floorlevtoplay: Optional[float] = Field(None, alias="floorLevTopLay")
dztopuniabovez: Optional[float] = Field(None, alias="dzTopUniAboveZ")
keepzlayeringatbed: int = Field(2, alias="keepZLayeringAtBed")
dxdoubleat1dendnodes: bool = Field(True, alias="dxDoubleAt1DEndNodes")
changevelocityatstructures: bool = Field(False, alias="changeVelocityAtStructures")
changestructuredimensions: bool = Field(True, alias="changeStructureDimensions")
Expand Down
Loading