Revert "use ForcingData class as a type for the discharge, temperat…

…ure, and salinity in the `SourceSink` class" This reverts commit 89b55a0 Signed-off-by: Mostafa Farrag <[email protected]>
Deltares · Jan 15, 2025 · b2eda43 · b2eda43
1 parent 856fa6c
commit b2eda43
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/hydrolib/core/dflowfm/bc/models.py b/hydrolib/core/dflowfm/bc/models.py
@@ -845,7 +845,7 @@ class RealTime(StrEnum):
     """str: Realtime data source, externally provided"""
 
 
-ForcingData = Union[float, List[float], RealTime, ForcingModel]
+ForcingData = Union[float, RealTime, ForcingModel]
 """Data type that selects from three different types of forcing data:
 *   a scalar float constant
 *   "realtime" keyword, indicating externally controlled.

diff --git a/hydrolib/core/dflowfm/ext/models.py b/hydrolib/core/dflowfm/ext/models.py
@@ -210,11 +210,13 @@ class SourceSink(INIBasedModel):
 
     zsource: Optional[Union[float, List[float]]] = Field(alias="zSource")
     zsink: Optional[Union[float, List[float]]] = Field(alias="zSink")
-    discharge: ForcingData = Field(alias="discharge")
+    discharge: Union[float, List[float]] = Field(alias="discharge")
     area: Optional[float] = Field(alias="Area")
 
-    salinitydelta: Optional[ForcingData] = Field(alias="SalinityDelta")
-    temperaturedelta: Optional[ForcingData] = Field(alias="TemperatureDelta")
+    salinitydelta: Optional[Union[List[float], float]] = Field(alias="SalinityDelta")
+    temperaturedelta: Optional[Union[List[float], float]] = Field(
+        alias="TemperatureDelta"
+    )
 
     @classmethod
     def _exclude_from_validation(cls, input_data: Optional[dict] = None) -> Set: