Make STL model setup stage-independent

Author: sbryngelson

src/common/m_model.fpp

@@ -24,9 +24,7 @@ module m_model
     public :: s_check_boundary, s_register_edge, f_model_is_inside, s_distance_normals_3D, s_distance_normals_2D, &
         & s_pack_model_for_gpu
 
-#ifndef MFC_POST_PROCESS
     public :: s_instantiate_STL_models
-#endif
 
     type(t_model_array), allocatable, target  :: models(:)    !< STL/OBJ models for IB markers and levelset
     integer, allocatable                      :: gpu_ntrs(:)  !< GPU-friendly flat arrays for STL model data
@@ -851,7 +849,6 @@ contains
 
     end subroutine s_distance_normals_2D
 
-#ifndef MFC_POST_PROCESS
     !> Load, transform, and register STL/OBJ immersed-boundary models onto the simulation grid.
     subroutine s_instantiate_STL_models()
 
@@ -1002,7 +999,6 @@ contains
         end block
 
     end subroutine s_instantiate_STL_models
-#endif
 
     !> Pack triangle vertices and normals from a model into flat arrays for GPU transfer.
     subroutine s_pack_model_for_gpu(ma)

toolchain/mfc/params/definitions.py

@@ -1223,7 +1223,7 @@ def _decl(targets: set, *names: str) -> None:
 _PRE = {"pre"}
 _POST = {"post"}
 
-_decl(_ALL, "avg_state", "alt_soundspeed", "mixture_err", "sigR", "viscous", "riemann_solver")
+_decl(_ALL, "avg_state", "alt_soundspeed", "mixture_err", "sigR", "viscous", "riemann_solver", "stl_models", "num_stl_models")
 
 _nv(
     _ALL,

toolchain/mfc/params/generators/fortran_gen.py

@@ -234,7 +234,8 @@ def generate_decls_fpp(target: str) -> str:
         lines.append(f"{fortran_type_decl(param).ljust(_DECL_COL)}:: {name}")
         declared_names.add(name)
     for name, (ftype, dim, gpu, desc) in TYPED_DECLS.items():
-        if name not in NAMELIST_VARS or target not in NAMELIST_VARS[name]:
+        declaration_targets = NAMELIST_VARS.get(name, set()) | DECLARATION_TARGETS.get(name, set())
+        if target not in declaration_targets:
             continue
         decl = f"{ftype}, dimension({dim})" if dim else ftype
         padded = decl.ljust(_ARRAY_DECL_COL)

toolchain/mfc/params_tests/test_fortran_gen.py

@@ -142,6 +142,18 @@ def test_common_module_decls_do_not_expand_namelists():
     assert NAMELIST_VARS["riemann_solver"] == {"sim"}
 
 
+def test_stl_model_declarations_do_not_expand_post_namelist():
+    from mfc.params.generators.fortran_gen import generate_decls_fpp, generate_namelist_fpp
+
+    post_declarations = generate_decls_fpp("post")
+    post_namelist = generate_namelist_fpp("post")
+
+    assert ":: num_stl_models" in post_declarations
+    assert ":: stl_models" in post_declarations
+    assert "num_stl_models" not in post_namelist
+    assert "stl_models" not in post_namelist
+
+
 def test_decls_no_percent_vars():
     from mfc.params.generators.fortran_gen import generate_decls_fpp