meh

Author: wpbonelli

flopy4/mf6/codec/reader/transformer.py

@@ -76,6 +76,12 @@ def start(self, items: list[Any]) -> dict:
             if not isinstance(item, dict):
                 continue
             for block_name, block_data in item.items():
+                # Pluralize indexed blocks (e.g., period -> periods)
+                if isinstance(block_data, dict) and all(isinstance(k, int) for k in block_data.keys()):
+                    # This is an indexed block, use plural form
+                    if not block_name.endswith('s'):
+                        block_name = block_name + 's'
+
                 if block_name not in merged:
                     merged[block_name] = block_data
                 else:
@@ -163,12 +169,27 @@ def filename(self, items: list[Any]) -> Path:
     def string(self, items: list[Any]) -> str:
         return items[0].strip("\"'")
 
+    def simple_string(self, items: list[Any]) -> str:
+        """Handle simple string (unquoted word or escaped string)."""
+        return str(items[0]).strip("\"'")
+
     def integer(self, items: list[Any]) -> int:
         return int(items[0])
 
     def double(self, items: list[Any]) -> float:
         return float(items[0])
 
+    def number(self, items: list[Any]) -> int | float:
+        """Handle generic number (could be int or float)."""
+        value = str(items[0])
+        try:
+            if "." in value or "e" in value.lower():
+                return float(value)
+            else:
+                return int(value)
+        except ValueError:
+            return float(value)
+
     def data(self, items: list[Any]) -> np.ndarray:
         return np.array(items)
 
@@ -222,6 +243,10 @@ def block_index(self, items: list[Any]) -> int:
         """Extract block index (e.g., period number)."""
         return items[0]
 
+    def stress_period_data(self, items: list[Any]) -> list[Any]:
+        """Handle stress period data (list of values for a single record)."""
+        return items
+
     @staticmethod
     def try_create_dataarray(array_info: dict) -> dict:
         control = array_info["control"]
@@ -251,6 +276,12 @@ def __default__(self, data, children, meta):
                 # Unexpected structure, fall back to default
                 return super().__default__(data, children, meta)
         elif data.endswith("_fields"):
+            # Check if this is a period_fields which contains list data (stress_period_data)
+            # rather than named field tuples
+            if children and not isinstance(children[0], tuple):
+                # This is list data (e.g., stress_period_data records)
+                # Return as stress_period_data key
+                return {"stress_period_data": children}
             return {item[0].lower(): item[1] for item in children}
         elif (field := self.fields.get(data, None)) is not None:
             if field.type == "keyword":

test/test_mf6_reader.py

@@ -162,10 +162,10 @@ def test_transform_full_component():
     grammar = """
 start: block*
 block: options_block | arrays_block
-options_block: "begin"i "options"i options_vars "end"i "options"i
-arrays_block: "begin"i "arrays"i arrays_vars "end"i "arrays"i
-options_vars: (r2d2 | b | c | p)*
-arrays_vars: (x | y | z)*
+options_block: "begin"i "options"i options_fields "end"i "options"i
+arrays_block: "begin"i "arrays"i arrays_fields "end"i "arrays"i
+options_fields: (r2d2 | b | c | p)*
+arrays_fields: (x | y | z)*
 r2d2: "r2d2"i // keyword
 b: "b"i string
 c: "c"i integer
@@ -314,3 +314,35 @@ def test_transform_gwf_ic_file(model_workspace):
     assert isinstance(result, dict)
     assert "griddata" in result  # IC has griddata block
     assert "strt" in result["griddata"]  # Starting heads
+
+
+@pytest.mark.parametrize("model_workspace", ["mf6/example/ex-gwf-bcf2ss-p01a"], indirect=True)
+def test_transform_gwf_wel_file(model_workspace):
+    """Test transforming a parsed GWF WEL file into structured data."""
+
+    # Load the DFN for WEL
+    dfns = load_flat("../modflow-devtools/autotest/temp/dfn/toml")
+    wel_dfn = dfns["gwf-wel"]
+
+    # Find the WEL file
+    wel_files = list(model_workspace.rglob("*.wel"))
+
+    # Skip if no WEL files (not all models have wells)
+    if len(wel_files) == 0:
+        pytest.skip("No WEL files found in this model")
+
+    wel_file = wel_files[0]
+    parser = get_typed_parser("gwf-wel")
+    transformer = TypedTransformer(dfn=wel_dfn)
+
+    # Read, parse, and transform
+    with open(wel_file, "r") as f:
+        content = f.read()
+
+    tree = parser.parse(content)
+    result = transformer.transform(tree)
+
+    # Check structure
+    assert isinstance(result, dict)
+    assert "periods" in result  # WEL has periods
+    assert len(result["periods"]) > 0  # Should have at least one period