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

Hydrolib core update #139

Merged
merged 30 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
e5b9df4
prevented calls to deprecated hydrolib-core functions
veenstrajelmer Sep 23, 2024
807de65
updated minimal hydrolib-core version
veenstrajelmer Sep 23, 2024
9bb6e34
fixed linting
veenstrajelmer Sep 23, 2024
1282030
fixed linting
veenstrajelmer Sep 23, 2024
8ea09e3
removed locationtype from crsloc.ini files and code, was deprecated i…
veenstrajelmer Sep 23, 2024
864e3bc
resolved typo: UniFrictType to uniffricttype
veenstrajelmer Sep 23, 2024
3b2832b
prevent writing of lateral quantity in extfile
veenstrajelmer Sep 23, 2024
1fc605f
fixed linting
veenstrajelmer Sep 23, 2024
32eb0d4
workaround for failing testcases: updated mdu keyword values, sometim…
veenstrajelmer Sep 23, 2024
cc1f74d
first draft of extra unit test
hboisgon Sep 24, 2024
3cc8315
fixed testcase
veenstrajelmer Sep 24, 2024
18a3160
fixed testcase
veenstrajelmer Sep 24, 2024
f557a06
fixed testcase
veenstrajelmer Sep 24, 2024
68b4765
fixed testcase
veenstrajelmer Sep 24, 2024
d83ca7f
add comment
veenstrajelmer Sep 25, 2024
0cead17
meshkernel update for links also elsewhere in code
veenstrajelmer Sep 25, 2024
4d225c9
updated changelog
veenstrajelmer Sep 25, 2024
43ce842
updated changelog
veenstrajelmer Sep 25, 2024
596bb5f
Enable support for point cross-sections
shartgring Sep 25, 2024
06dba33
fix linting
shartgring Sep 25, 2024
1520711
fixed linting
veenstrajelmer Sep 25, 2024
2ebacfa
added test framework for setup_channels
veenstrajelmer Sep 25, 2024
62c1131
removed minimal env yml since it is not being used and also does not …
veenstrajelmer Sep 25, 2024
1ea5198
revert deletion
veenstrajelmer Sep 25, 2024
4560a80
revert deletion
veenstrajelmer Sep 25, 2024
dd26be5
revert deletion
veenstrajelmer Sep 25, 2024
2c65dcc
revert deletion
veenstrajelmer Sep 25, 2024
a02e8d6
prevent hydromt v1 alpha
veenstrajelmer Sep 25, 2024
433d8e0
fixed codecov action
veenstrajelmer Sep 25, 2024
d27df71
fixed codecov action
veenstrajelmer Sep 25, 2024
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
17 changes: 9 additions & 8 deletions examples/dflowfm_local/dflowfm/DFlowFM.mdu
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ layerType = 1
numTopSig = 0 # Number of sigma-layers on top of z-layers.
numTopSigUniform = 1 # Spatially constant number of sigma layers above z-layers in a z-sigma model (1: yes, 0: no, spatially varying)
sigmaGrowthFactor = 1.0 # layer thickness growth factor from bed up.
dzTop = # Z-layer thickness of layers above level Dztopuniabovez
floorLevTopLay = # Floor level of top layer
dzTopUniAboveZ = # Above this level layers will have uniform dzTop, below we use sigmaGrowthFactor
dzTop = -999 # Z-layer thickness of layers above level Dztopuniabovez
floorLevTopLay = -999 # Floor level of top layer
dzTopUniAboveZ = -999 # Above this level layers will have uniform dzTop, below we use sigmaGrowthFactor
keepZLayeringAtBed = 2 # 0:possibly very thin layer at bed, 1:bedlayerthickness == zlayerthickness, 2=equal thickness first two layers
dxDoubleAt1DEndNodes = 1 # Whether a 1D grid cell at the end of a network has to be extended with 0.5Δx.
changeVelocityAtStructures = 0 # Ignore structure dimensions for the velocity at hydraulic structures, when calculating the surrounding cell centered flow velocities.
Expand All @@ -81,6 +81,7 @@ icgSolver = 4 # Solver type, 4 = sobekGS + Saad-ILUD (defaul
maxDegree = 6 # Maximum degree in Gauss elimination.
fixedWeirScheme = 9 # 6 = semi-subgrid scheme, 8 = Tabellenboek, 9 = Villemonte (default).
fixedWeirContraction = 1.0 # flow width = flow width*fixedWeirContraction.
fixedWeirTopFrictCoef = -999 # Uniform friction coefficient of the groyne part of fixed weirs [the unit depends on frictiontype].
izBndPos = 0 # Position of z boundary, 0=mirroring of closest cell (as in Delft3D-FLOW), 1=on net boundary.
tlfSmo = 0.0 # Fourier smoothing time on water level boundaries [s].
keepSTBndOnOutflow = 0 # Keep salinity and temperature signals on boundary also at outflow, 1=yes, 0=no. Default=0: copy inside value on outflow.
Expand Down Expand Up @@ -158,7 +159,7 @@ SedFile = # Sediment characteristics file (*.sed)
iCdTyp = 2 # Wind drag coefficient type (1: Const, 2: Smith&Banke (2 pts), 3: S&B (3 pts), 4: Charnock 1955, 5: Hwang 2005, 6: Wuest 2005, 7: Hersbach 2010 (2 pts), 8: 4+viscous).
CdBreakpoints = 0.00063 0.00723 # Wind drag breakpoints, e.g. 0.00063 0.00723.
windSpeedBreakpoints = 0.0 100.0 # Wind speed breakpoints [m/s], e.g. 0.0 100.0.
rhoAir = 1.205 # Air density [kg/m3].
rhoAir = 1.2 # Air density [kg/m3].
relativeWind = 0.0 # Wind speed [kg/m3] relative to top-layer water speed*relativewind (0d0=no relative wind, 1d0=using full top layer speed).
windPartialDry = 1 # Reduce windstress on water if link partially dry, only for bedlevtyp=3, 0=no, 1=yes (default).
pavBnd = 0.0 # Average air pressure on open boundaries [N/m2], only applied if value > 0.
Expand Down Expand Up @@ -198,8 +199,8 @@ interceptionModel = 0 # Interception model (0: none, 1: on, via layer thickness)

[Trachytopes]
trtRou = N # Flag for trachytopes (Y=on, N=off).
trtDef = # File (*.ttd) including trachytope definitions.
trtL = # File (*.arl) including distribution of trachytope definitions.
trtDef = . # File (*.ttd) including trachytope definitions.
trtL = . # File (*.arl) including distribution of trachytope definitions.
dtTrt = 60.0 # Interval for updating of bottom roughness due to trachytopes in seconds [s].
trtMxR = # Maximum recursion level for composite trachytope definitions

Expand All @@ -215,8 +216,8 @@ wrishp_dryArea = 0 # Writing dry areas to shape file (0=
wrishp_enc = 0 # Writing enclosures to shape file (0=no, 1=yes).
wrishp_src = 0 # Writing sources and sinks to shape file (0=no, 1=yes).
wrishp_pump = 0 # Writing pumps to shape file (0=no, 1=yes).
outputDir = # Output directory of map-, his-, rst-, dat- and timingsfiles, default: DFM_OUTPUT_<modelname>. Set to . for no dir/current dir.
waqOutputDir = # Output directory of Water Quality files.
outputDir = . # Output directory of map-, his-, rst-, dat- and timingsfiles, default: DFM_OUTPUT_<modelname>. Set to . for no dir/current dir.
waqOutputDir = . # Output directory of Water Quality files.
flowGeomFile = # *_flowgeom.nc Flow geometry file in netCDF format.
obsFile = # Space separated list of files, containing information about observation points.
crsFile = # Space separated list of files, containing information about observation cross sections.
Expand Down
Loading
Loading