Skip to content

Commit 89b55a0

Browse files
committed
use ForcingData class as a type for the discharge, temperature, and salinity in the SourceSink class
1 parent d246cd1 commit 89b55a0

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

hydrolib/core/dflowfm/bc/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,7 @@ class RealTime(StrEnum):
845845
"""str: Realtime data source, externally provided"""
846846

847847

848-
ForcingData = Union[float, RealTime, ForcingModel]
848+
ForcingData = Union[float, List[float], RealTime, ForcingModel]
849849
"""Data type that selects from three different types of forcing data:
850850
* a scalar float constant
851851
* "realtime" keyword, indicating externally controlled.

hydrolib/core/dflowfm/ext/models.py

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class SourceSink(INIBasedModel):
193193
A `[SourceSink]` block for use inside an external forcings file,
194194
i.e., a [ExtModel][hydrolib.core.dflowfm.ext.models.SourceSink].
195195
196-
All lowercased attributes match with the lateral input as described in
196+
All lowercased attributes match with the source-sink input as described in
197197
[UM Sec.C.5.2.4](https://content.oss.deltares.nl/delft3dfm1d2d/D-Flow_FM_User_Manual_1D2D.pdf#subsection.C.5.2.4).
198198
"""
199199

@@ -210,13 +210,11 @@ class SourceSink(INIBasedModel):
210210

211211
zsource: Optional[Union[float, List[float]]] = Field(alias="zSource")
212212
zsink: Optional[Union[float, List[float]]] = Field(alias="zSink")
213-
discharge: Union[float, List[float]] = Field(alias="discharge")
213+
discharge: ForcingData = Field(alias="discharge")
214214
area: Optional[float] = Field(alias="Area")
215215

216-
salinitydelta: Optional[Union[List[float], float]] = Field(alias="SalinityDelta")
217-
temperaturedelta: Optional[Union[List[float], float]] = Field(
218-
alias="TemperatureDelta"
219-
)
216+
salinitydelta: Optional[ForcingData] = Field(alias="SalinityDelta")
217+
temperaturedelta: Optional[ForcingData] = Field(alias="TemperatureDelta")
220218
interpolationmethod: Optional[str] = Field(alias="interpolationMethod")
221219
operand: Optional[Operand] = Field(Operand.override.value, alias="operand")
222220

0 commit comments

Comments
 (0)