feat(extforce_convert): enhance parameter and prefix quantity handling (#976)

feat(extforce_convert): enhance parameter and prefix quantity handling

- Added `waqfunction` as a parameter quantity and improved prefix matching with lowercase normalization  
- Moved additional parameter-related quantities to the prefix section  
- Removed `waqfunction` from default quantities to avoid duplication  
- Marked lateral quantities as unsupported to enable debug mode execution  

ref: #973

Author: jeroen-deltares

hydrolib/core/dflowfm/extold/data/old-external-forcing-data.yaml

@@ -100,10 +100,12 @@ Parameter:
         IBotLevType: ibotlevtype
         # Missing in the converter
         FloeDiameter: floe_diameter
-        WaqFunction: waqfunction
         WaqParameter: waqparameter
-        WaqSegmentFunction: waqsegmentfunction
-        WaqSegmentNumber: waqsegmentnumber
+    prefixes:
+        # Missing in the converter
+        - waqfunction
+        - waqsegmentfunction
+        - waqsegmentnumber
 
 
 InitialConditions:
@@ -150,6 +152,12 @@ Structure:
     valve1D: valve1d
 
 
+Lateral:
+    LateralDischarge: lateraldischarge
+    LateralDischarge1D: lateraldischarge1d
+    LateralDischarge2D: lateraldischarge2d
+
+
 Misellaneous:
      ShiptXY: shiptxy
      MovingStationXY: movingstationxy

hydrolib/core/dflowfm/extold/models.py

@@ -86,10 +86,12 @@ def _missing_(cls, value):
 ExtOldParametersQuantity = StrEnum(
     "ExtOldParametersQuantity", QUANTITIES_DATA["Parameter"]["quantity_names"]
 )
+PARAMETER_QUANTITIES_VALID_PREFIXES = tuple(QUANTITIES_DATA["Parameter"]["prefixes"])
 ExtOldMeteoQuantity = StrEnum(
     "ExtOldMeteoQuantity",
     QUANTITIES_DATA["Meteo"]["quantity_names"],
 )
+ExtOldLateralQuantity = StrEnum("ExtOldLateralQuantity", QUANTITIES_DATA["Lateral"])
 
 
 INITIAL_CONDITION_QUANTITIES_VALID_PREFIXES = tuple(
@@ -141,11 +143,13 @@ def _missing_(cls, value):
     | QUANTITIES_DATA["SourceSink"]
     | QUANTITIES_DATA["Structure"]
     | QUANTITIES_DATA["Misellaneous"]
+    | QUANTITIES_DATA["Lateral"]
 )
 
 ALL_PREFIXES = (
     BOUNDARY_CONDITION_QUANTITIES_VALID_PREFIXES
     + INITIAL_CONDITION_QUANTITIES_VALID_PREFIXES
+    + PARAMETER_QUANTITIES_VALID_PREFIXES
 )
 
 ExtOldQuantity = StrEnum("ExtOldQuantity", ALL_QUANTITIES)

hydrolib/tools/extforce_convert/data/data.yaml

@@ -47,6 +47,10 @@ external_forcing:
         - totalwaveenergydissipation
         # do not convert for now
         - bedrock_surface_elevation
+        # Lateral quantities are supported in the kernel, but not yet in the converter
+        - lateraldischarge
+        - lateraldischarge1d
+        - lateraldischarge2d
     unsupported_prefixes:
         # initial conditions
         - initialsediment

hydrolib/tools/extforce_convert/main_converter.py

@@ -323,7 +323,7 @@ def update(
             total=num_quantities, desc="Converting forcings", unit="forcing"
         ) as progress_bar:
             for forcing in self.extold_model.forcing:
-                if forcing.quantity in self.un_supported_quantities:
+                if forcing.quantity.lower() in self.un_supported_quantities:
                     print(
                         f"The quantity {forcing.quantity} is not supported, and the debug mode is {self.debug}. "
                         "So the forcing will not be converted (stay in the old external forcing file)."