Skip to content

Commit b2eda43

Browse files
committed
Revert "use ForcingData class as a type for the discharge, temperature, and salinity in the SourceSink class"
This reverts commit 89b55a0 Signed-off-by: Mostafa Farrag <moah.farag@gmail.com>
1 parent 856fa6c commit b2eda43

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
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, List[float], RealTime, ForcingModel]
848+
ForcingData = Union[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: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,11 +210,13 @@ 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: ForcingData = Field(alias="discharge")
213+
discharge: Union[float, List[float]] = Field(alias="discharge")
214214
area: Optional[float] = Field(alias="Area")
215215

216-
salinitydelta: Optional[ForcingData] = Field(alias="SalinityDelta")
217-
temperaturedelta: Optional[ForcingData] = Field(alias="TemperatureDelta")
216+
salinitydelta: Optional[Union[List[float], float]] = Field(alias="SalinityDelta")
217+
temperaturedelta: Optional[Union[List[float], float]] = Field(
218+
alias="TemperatureDelta"
219+
)
218220

219221
@classmethod
220222
def _exclude_from_validation(cls, input_data: Optional[dict] = None) -> Set:

0 commit comments

Comments
 (0)