Also print the values in the scalars

Author: deltamarnix

flopy4/mf6/codec.py

@@ -13,10 +13,11 @@
     trim_blocks=True,
     lstrip_blocks=True,
 )
-JINJA_ENV.filters["fieldkind"] = filters.fieldkind
+JINJA_ENV.filters["field_kind"] = filters.field_kind
 JINJA_ENV.filters["fieldvalue"] = filters.fieldvalue
 JINJA_ENV.filters["arraydelayed"] = filters.arraydelayed
 JINJA_ENV.filters["array2string"] = filters.array2string
+JINJA_ENV.filters["is_dict"] = filters.is_dict
 JINJA_TEMPLATE_NAME = "blocks.jinja"
 
 

flopy4/mf6/filters.py

@@ -1,11 +1,13 @@
+from typing import Any
+
 import numpy as np
 import xarray as xr
 from attrs import Attribute
 from jinja2 import pass_context
 from numpy.typing import NDArray
 
 
-def fieldkind(field: Attribute) -> str:
+def field_kind(field: Attribute) -> str:
     """
     Get a field's `xattree` kind. Kind is either:
 
@@ -21,13 +23,13 @@ def fieldkind(field: Attribute) -> str:
         raise TypeError(f"Field {field.name} has no xattree metadata")
     if "kind" not in xatmeta:
         raise TypeError(f"Field {field.name} has no kind")
-    return xatmeta.get("kind", "attr")
+    return xatmeta.get("kind") or "attr"
 
 
 @pass_context
 def fieldvalue(ctx, field: Attribute):
     """Get a field's value from the data tree via the template context."""
-    return ctx["data"][field.name]
+    return ctx["data"].attrs.get(field.name) or ctx["data"].get(field.name)
 
 
 def arraydelayed(value: xr.DataArray):
@@ -41,3 +43,8 @@ def arraydelayed(value: xr.DataArray):
 def array2string(value: NDArray) -> str:
     """Convert an array to a string."""
     return np.array2string(value, separator=" ")[1:-1]  # remove brackets
+
+
+def is_dict(value: Any) -> bool:
+    """Check if the value is a dictionary."""
+    return isinstance(value, dict)

flopy4/mf6/templates/blocks.jinja

@@ -1,10 +1,8 @@
 {% import 'macros.jinja' as macros with context %}
-
 {% for block_name, block_ in blocks.items() %}
 BEGIN {{ block_name }}
 {% for field in block_.values() %}
 {{ macros.field(field) }}
 {% endfor %}
 END {{ block_name }}
-
 {% endfor %}

flopy4/mf6/templates/macros.jinja

@@ -1,7 +1,7 @@
 {% macro field(field) %}
-{% set kind = field|fieldkind %}
+{% set kind = field|field_kind %}
 {% if kind == 'attr' %}
-{% if field.type|isdict %}
+{% if field.type|is_dict %}
 {{ record(field) }}
 {% else %}
 {{ scalar(field) }}
@@ -13,50 +13,52 @@
 {% elif kind == 'child' %}
 {# TODO #}
 {% endif %}
-{% endmacro %}
+{%- endmacro %}
 
 {% macro scalar(field) %}
-{{ field.name }} {{ field.value }}
-{% endmacro %}
+{% set value = field|fieldvalue %}
+{% if value is not none %}
+{{ field.name }} {{ value }}
+{% endif %}
+{%- endmacro %}
 
 {% macro keystring(field) %} {# union #}
-{% for item in field.value.items() %}
+{% for item in (field|fieldvalue).items() %}
 {{ field(item) }}
 {% endfor %}
-{% endmacro %}
+{%- endmacro %}
 
 {% macro record(field) %}
-{% for item in field.values() %}{% if item.tagged %}{{ item.name }} {% endif %}{{ field(field) }}{%
-endfor
-%}
-{% endmacro %}
+{% for item in field|fieldvalue %}
+{% if item.tagged %}{{ item.name }} {% endif %}{{ field(field) }}
+{% endfor %}
+{%- endmacro %}
 
 {% macro array(field, how="internal") %}
 {% if how == "layered constant" %}
 {{ field.name }} LAYERED
-{% for val in field.value %}
+{% for val in field|fieldvalue %}
 CONSTANT
 {% endfor %}
 {% elif how == "constant" %}
-{{ field.name }} CONSTANT {{ field.value }}
+{{ field.name }} CONSTANT {{ field|fieldvalue }}
 {% elif how == "layered" %}
 {% if layered %}
-{{ field.name }}
-{% for val in field.value %}{{ val }}{% endfor %}
+{{ field.name }}{% for val in field|fieldvalue %} {{ val }}{% endfor %}
 {% endif %}
 {% elif how == "internal" %}
 {{ field.name }} {{ internal_array(field) }}
 {% elif how == "external" %}
-{{ field.name}} OPEN/CLOSE {{ field.value }}
+{{ field.name}} OPEN/CLOSE {{ field|fieldvalue }}
 {% endif %}
-{% endmacro %}
+{%- endmacro %}
 
 {% macro internal_array(field) %}
 {% for chunk in field|fieldvalue|arraydelayed %}
 {{ chunk|array2string }}
 {% endfor %}
-{% endmacro %}
+{%- endmacro %}
 
 {% macro list(field) %}
 {# TODO #}
-{% endmacro %}
+{%- endmacro %}

test/test_jinja.py

@@ -38,12 +38,14 @@ def test_simulation_to_jinja():
         trim_blocks=True,
         lstrip_blocks=True,
     )
-    env.filters["fieldkind"] = filters.fieldkind
+    env.filters["field_kind"] = filters.field_kind
     env.filters["fieldvalue"] = filters.fieldvalue
     env.filters["arraydelayed"] = filters.arraydelayed
     env.filters["array2string"] = filters.array2string
+    env.filters["is_dict"] = filters.is_dict
 
     fields = fields_dict(Oc)
     blocks = blocks_dict(Oc)
     result = env.get_template("blocks.jinja").render(fields=fields, blocks=blocks, data=oc.data)
+    print(result)
     assert result != ""