add params macro

modflowpy · Oct 31, 2024 · 44f5db4 · 44f5db4
1 parent 13e7d5f
commit 44f5db4
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 24 deletions.
diff --git a/flopy/mf6/utils/codegen/templates/exchange.py.jinja b/flopy/mf6/utils/codegen/templates/exchange.py.jinja
@@ -1,4 +1,5 @@
 {% import 'macros.jinja' as macros %}
+# autogenerated file, do not modify
 
 from os import PathLike, curdir
 from typing import Union
@@ -26,9 +27,7 @@ class Modflow{{ name.title.title() }}(MFPackage):
         exgtype="{{ name.r[:3].upper() }}6-{{ name.r[3:].upper() }}6",
         exgmnamea=None,
         exgmnameb=None,
-        {%- for n, var in vars.items() if n not in init_skip %}
-        {{ var.name }}{%- if var.default is defined %}={{ var.default }}{%- endif -%},
-        {%- endfor %}
+        {{ macros.vars_params(vars, init_skip, start_indent=8) }}
         filename=None,
         pname=None,
         **kwargs,

diff --git a/flopy/mf6/utils/codegen/templates/macros.jinja b/flopy/mf6/utils/codegen/templates/macros.jinja
@@ -1,3 +1,9 @@
+{% macro vars_params(vars, init_skip=none, start_indent=0) %}
+{%- for n, var in vars.items() if n not in init_skip %}
+{{ ""|indent(start_indent, first=true) }}{{ var.name }}{%- if var.default is defined %}={{ var.default }}{% endif -%},
+{%- endfor %}
+{% endmacro %}
+
 {% macro vars_docs(vars, start_indent=0) %}
 {%- for v in vars.values() recursive %}
 {{ ""|indent(start_indent, first=true) }}{% if loop.depth > 1 %}* {% endif %}{% if v.name|last == "_" %}{{ v.name.replace("_", "\\\_") }}{% else %}{{ v.name }}{% endif %}{% if v.meta is defined and v.meta.type is defined %} : {{ v.meta.type }}{% endif %}

diff --git a/flopy/mf6/utils/codegen/templates/model.py.jinja b/flopy/mf6/utils/codegen/templates/model.py.jinja
@@ -1,4 +1,5 @@
 {% import 'macros.jinja' as macros %}
+# autogenerated file, do not modify
 
 from os import PathLike, curdir
 from typing import Union
@@ -33,9 +34,7 @@ class Modflow{{ name.title.title() }}(MFModel):
         version="mf6",
         exe_name="mf6",
         model_rel_path=".",
-        {%- for n, var in vars.items() if n not in init_skip %}
-        {{ var.name }}{%- if var.default is defined %}={{ var.default }}{%- endif -%},
-        {%- endfor %}
+        {{ macros.vars_params(vars, init_skip, start_indent=8) }}
         **kwargs,
     ):
         """

diff --git a/flopy/mf6/utils/codegen/templates/package.py.jinja b/flopy/mf6/utils/codegen/templates/package.py.jinja
@@ -1,4 +1,5 @@
 {% import 'macros.jinja' as macros %}
+# autogenerated file, do not modify
 
 from os import PathLike, curdir
 from typing import Union
@@ -24,9 +25,7 @@ class Modflow{{ name.title.title() }}(MFPackage):
         self,
         {{ parent }},
         loading_package=False,
-        {%- for n, var in vars.items() if n not in init_skip %}
-        {{ var.name }}{%- if var.default is defined %}={{ var.default }}{%- endif -%},
-        {%- endfor %}
+        {{ macros.vars_params(vars, init_skip, start_indent=8) }}
         filename=None,
         pname=None,
         **kwargs,
@@ -95,17 +94,13 @@ class {{ name.title.title() }}Packages(MFChildPackages):
 
     def initialize(
         self,
-        {%- for n, var in vars.items() if n not in init_skip %}
-        {{ n }}{%- if var.default is defined %}={{ var.default }}{% endif -%},
-        {%- endfor %}
+        {{ macros.vars_params(vars, init_skip, start_indent=8) }}
         filename=None,
         pname=None,
     ):
         new_package = Modflow{{ name.title.title() }}(
             self._cpparent,
-            {%- for n, var in vars.items() if n not in init_skip %}
-            {{ n }}={{ n }},
-            {%- endfor %}
+            {{ macros.vars_params(vars, init_skip, start_indent=12) }}
             filename=filename,
             pname=pname,
             child_builder_call=True,
@@ -115,17 +110,13 @@ class {{ name.title.title() }}Packages(MFChildPackages):
     {% if name.r != "obs" %}
     def append_package(
         self,
-        {%- for n, var in vars.items() if n not in init_skip %}
-        {{ n }}{%- if var.default is defined %}={{ var.default }}{% endif -%},
-        {%- endfor %}
+        {{ macros.vars_params(vars, init_skip, start_indent=8) }}
         filename=None,
         pname=None,
     ):
         new_package = Modflow{{ name.title.title() }}(
             self._cpparent,
-            {%- for n, var in vars.items() if n not in init_skip %}
-            {{ n }}={{ n }},
-            {%- endfor %}
+            {{ macros.vars_params(vars, init_skip, start_indent=12) }}
             filename=filename,
             pname=pname,
             child_builder_call=True,

diff --git a/flopy/mf6/utils/codegen/templates/simulation.py.jinja b/flopy/mf6/utils/codegen/templates/simulation.py.jinja
@@ -1,4 +1,5 @@
 {% import 'macros.jinja' as macros %}
+# autogenerated file, do not modify
 
 from os import PathLike, curdir
 from typing import Union
@@ -34,9 +35,7 @@ class MF{{ name.title.title() }}(MFSimulationBase):
         write_headers: bool = True,
         use_pandas: bool = True,
         lazy_io: bool = False,
-        {%- for n, var in vars.items() if n not in init_skip %}
-        {{ var.name }}{%- if var.default is defined %}={{ var.default }}{%- endif -%},
-        {%- endfor %}
+        {{ macros.vars_params(vars, init_skip, start_indent=8) }}
     ):
         """
         {{ name.description }}