more cleanup

Author: wpbonelli

flopy4/mf6/codec/reader/grammar/templates/component.lark.jinja

@@ -6,10 +6,15 @@
 %ignore WS
 %ignore SH_COMMENT
 
+// Top-level structure
 start: block*
-block: {% for block_name in blocks.keys() %}{{ block_name }}_block{% if not loop.last %} | {% endif %}{% endfor %}
+block: {% for block_name in blocks.keys() %}
+    {{- block_name }}_block
+    {%- if not loop.last %} | {% endif %}
+{%- endfor %}
 
-{% for block_name, block_ in blocks.items() %}
+// Block definitions
+{% for block_name, block_fields in blocks.items() %}
 {% if block_name == 'period' %}
 {{ block_name }}_block: "begin"i "{{ block_name }}"i block_index {{ block_name }}_fields "end"i "{{ block_name }}"i block_index
 {% else %}
@@ -19,19 +24,32 @@ block: {% for block_name in blocks.keys() %}{{ block_name }}_block{% if not loop
 {% if 'period' in blocks %}
 block_index: integer
 {% endif %}
-{% for block_name, block_ in blocks.items() %}
-{% set period_groups = block_|group_period_fields %}
+// Block field lists
+{% for block_name, block_fields in blocks.items() %}
+{% set period_groups = block_fields|group_period_fields %}
 {% if period_groups %}
+{# This block has period data (e.g., stress_period_data), split fields accordingly #}
 {% set recarray_name = block_name|get_recarray_name %}
 {% set grouped_field_names = period_groups.values()|first %}
 {% set non_grouped_fields = [] %}
-{% for field_name in block_.keys() %}{% if field_name not in grouped_field_names %}{% set _ = non_grouped_fields.append(field_name) %}{% endif %}{% endfor %}
-{{ block_name }}_fields: ({% for field_name in non_grouped_fields %}{{ field_name }} | {% endfor %}{{ recarray_name }})*
+{% for field_name in block_fields.keys() %}
+    {%- if field_name not in grouped_field_names %}
+        {%- set _ = non_grouped_fields.append(field_name) %}
+    {%- endif %}
+{%- endfor %}
+{{ block_name }}_fields: (
+    {%- for field_name in non_grouped_fields %}{{ field_name }} | {% endfor -%}
+    {{ recarray_name }})*
 {% else %}
-{{ block_name }}_fields: ({% for field_name, field in block_.items() %}{{ field_name }}{% if not loop.last %} | {% endif
-%}{% endfor %})*
+{# Regular block - just list all fields #}
+{{ block_name }}_fields: (
+    {%- for field_name in block_fields.keys() %}
+        {{- field_name }}{% if not loop.last %} | {% endif %}
+    {%- endfor -%}
+)*
 {% endif %}
 {% endfor %}
+// Individual field rules
 {% set grouped_fields = blocks|get_all_grouped_field_names %}
 {% for field_name, field in fields.items() %}
 {% if field_name not in grouped_fields %}
@@ -76,13 +94,13 @@ opt.type }}{% endif %}
 {% endfor %}
 {% endif %}
 {% endfor %}
-{# Generate recarray rules for grouped period fields #}
-{% for block_name, block_ in blocks.items() %}
-{% set period_groups = block_|group_period_fields %}
+// Recarray rules for period data (stress_period_data, etc.)
+{% for block_name, block_fields in blocks.items() %}
+{% set period_groups = block_fields|group_period_fields %}
 {% if period_groups %}
 {% set recarray_name = block_name|get_recarray_name %}
 {% set field_names = period_groups.values()|first %}
-{% set columns = field_names|get_recarray_columns(block_) %}
+{% set columns = field_names|get_recarray_columns(block_fields) %}
 {{ recarray_name}}: (number | simple_string)+ NEWLINE
 {% endif %}
 {% endfor %}

flopy4/mf6/codec/reader/transformer.py

@@ -7,6 +7,17 @@
 from modflow_devtools.dfn import Dfn
 
 
+def _parse_number(value: str) -> int | float:
+    """Parse a string into int or float based on its content."""
+    try:
+        if "." in value or "e" in value.lower():
+            return float(value)
+        else:
+            return int(value)
+    except ValueError:
+        return float(value)
+
+
 class BasicTransformer(Transformer):
     """
     Basic transformer for MF6 input files. Works only with the basic
@@ -41,14 +52,7 @@ def word(self, items: list[Token]) -> str:
         return str(items[0])
 
     def NUMBER(self, token: Token) -> int | float:
-        value = str(token)
-        try:
-            if "." in value or "e" in value.lower():
-                return float(value)
-            else:
-                return int(value)
-        except ValueError:
-            return float(value)
+        return _parse_number(str(token))
 
     def CNAME(self, token: Token) -> str:
         return str(token)
@@ -175,14 +179,7 @@ def double(self, items: list[Any]) -> float:
 
     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)
+        return _parse_number(str(items[0]))
 
     def data(self, items: list[Any]) -> np.ndarray:
         return np.array(items)
@@ -200,7 +197,12 @@ def stress_period_data(self, items: list[Any]) -> list[Any]:
         The parser gives us the values for one row plus a NEWLINE token.
         Filter out the NEWLINE token and return just the data values.
         """
-        return [item for item in items if not isinstance(item, Token) or item.type != "NEWLINE"]
+        return [item for item in items if not self._is_newline_token(item)]
+
+    @staticmethod
+    def _is_newline_token(item: Any) -> bool:
+        """Check if an item is a NEWLINE token."""
+        return isinstance(item, Token) and item.type == "NEWLINE"
 
     @staticmethod
     def try_create_dataarray(array_info: dict) -> dict: