little steps (#150)

little format fixes

Author: wpbonelli

.vscode/settings.json

@@ -2,7 +2,8 @@
     "editor.formatOnSave": true,
     "files.insertFinalNewline": true,
     "python.testing.pytestArgs": [
-        "test"
+        "test",
+        "-s"
     ],
     "python.testing.unittestEnabled": false,
     "python.testing.pytestEnabled": true,
@@ -22,5 +23,5 @@
         ".pixi": true,
         ".ruff_cache": true,
         ".pytest_cache": true
-    }
+    },
 }

flopy4/mf6/templates/blocks.jinja

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

flopy4/mf6/templates/macros.jinja

@@ -12,8 +12,9 @@
 {% endmacro %}
 
 {% macro scalar(field) %}
+{% set type = field|field_type %}
 {% set value = field|field_value %}
-{% if value is not none %}{{ field.name }} {{ value }}{% endif %}
+{% if value is not none %}{{ field.name.upper() }}{% if type != 'keyword' %} {{ value }}{% endif %}{% endif %}
 {% endmacro %}
 
 {% macro keystring(field) %}
@@ -24,7 +25,7 @@
 
 {% macro record(field) %}
 {% for item in field.children.values() -%}
-{% if item.tagged %}{{ item.name }} {% endif %}{{ field(item) }}
+{% if item.tagged %}{{ item.name.upper() }} {% endif %}{{ field(item) }}
 {%- endfor %}
 {% endmacro %}
 
@@ -38,7 +39,7 @@
 {% endmacro %}
 
 {% macro array(name, value, how="internal") %}
-{{ name }}{% if "layered" in how %} LAYERED{% endif %}
+{{ name.upper() }}{% if "layered" in how %} LAYERED{% endif %}
 
 {% if how == "constant" %}
 CONSTANT {{ value.item() }}

pixi.lock

@@ -14,19 +14,10 @@ def test_dumps_ic():
         export_array_netcdf=True,
     )
 
-    # TODO figure out how to adapt simulation_data
-    # and get this working, then compare results?
-    # old_gwf = Flopy3Model(model=gwf)
-    # old_ic = ModflowGwfic(
-    #     old_gwf,
-    #     save_flows=True,
-    #     save_initial_conditions=True,
-    #     export_array_ascii=True,
-    #     export_array_netcdf=True,
-    # )
-
     result = dumps(ic)
+    print()
     print(result)
+    print()
     assert result
 
 

test/test_codec.py

@@ -274,15 +274,7 @@ def test_ims_dfn():
 
 def test_write_ascii(tmp_path):
     time = ModelTime(perlen=[1.0], nstp=[1], tsmult=[1.0])
-    grid = StructuredGrid(nlay=1, nrow=10, ncol=10)
     sim = Simulation(tdis=time, workspace=tmp_path)
-    # TODO fix errors
-    # gwf = Gwf(parent=sim, dis=grid)
-    # ic = Ic(parent=gwf)
-    # oc = Oc(parent=gwf)
-    # npf = Npf(parent=gwf)
-    # chd = Chd(parent=gwf, head={"*": {(0, 0, 0): 1.0, (0, 9, 9): 0.0}})
-
     sim.write()
 
     files = list(Path(tmp_path).glob("*"))