Add model_rotate for STL patches; complete rotation rollout

SVS87 · SVS87 · commit ae7c8b5127c9 · 2026-06-21T01:08:21.000-04:00
- Add model_rotate parameter to stl_models (parallel to model_scale/model_translate), applied at model load in s_instantiate_STL_models so STL geometry rotates in world coordinates
- Wire model_rotate through derived type, defaults, MPI broadcast, and toolchain registration
- Verified: a cube rotated 45 degrees about z expands its x/y bounding box by sqrt(2) as expected
- Extend per-cell rotation to remaining ICPP geometries (ellipse, ellipsoid, cuboid, cylinder, TaylorGreen)
diff --git a/src/common/m_derived_types.fpp b/src/common/m_derived_types.fpp
@@ -337,6 +337,7 @@ module m_derived_types
         real(wp), dimension(1:3)   :: model_translate  !< Translation of the STL object.
         real(wp), dimension(1:3)   :: model_scale      !< Scale factor for the STL object.
         real(wp)                   :: model_threshold  !< Threshold to turn on smooth STL patch.
+        real(wp), dimension(1:3)   :: model_rotate     !< Rotation of the STL object (radians, per axis).
     end type ib_stl_parameters
 
     type ib_patch_parameters
diff --git a/src/common/m_model.fpp b/src/common/m_model.fpp
@@ -887,7 +887,7 @@ contains
             model = f_model_read(stl_models(stl_id)%model_filepath)
             params%scale(:) = stl_models(stl_id)%model_scale(:)
             params%translate(:) = stl_models(stl_id)%model_translate(:)
-            params%rotate(:) = 0._wp
+            params%rotate(:) = stl_models(stl_id)%model_rotate(:)
             params%spc = num_ray
             params%threshold = stl_models(stl_id)%model_threshold
 
diff --git a/src/pre_process/m_global_parameters.fpp b/src/pre_process/m_global_parameters.fpp
@@ -337,6 +337,7 @@ contains
             stl_models(i)%model_filepath(:) = dflt_char
             stl_models(i)%model_translate(:) = 0._wp
             stl_models(i)%model_scale(:) = 1._wp
+            stl_models(i)%model_rotate(:) = 0._wp
             stl_models(i)%model_threshold = ray_tracing_threshold
         end do
 
diff --git a/src/pre_process/m_icpp_patches.fpp b/src/pre_process/m_icpp_patches.fpp
@@ -784,6 +784,7 @@ contains
                                    & 0._wp])
                 if (f_is_inside_cuboid(xyz_local(1), xyz_local(2), 0._wp, [length_x, length_y, &
                     & 0._wp]) .and. patch_icpp(patch_id)%alter_patch(patch_id_fp(i, j, 0))) then
+                    call s_assign_patch_primitive_variables(patch_id, i, j, 0, eta, q_prim_vf, patch_id_fp)
                     @:analytical()
                     if (patch_icpp(patch_id)%hcid /= dflt_int) then
                         @:Hardcoded2D()
@@ -1298,12 +1299,11 @@ contains
         integer, dimension(0:m,0:n,0:p), intent(inout) :: patch_id_fp
 #endif
         type(scalar_field), dimension(1:sys_size), intent(inout) :: q_prim_vf
-        integer :: i, j, k                       !< loop iterators
-        integer :: model_id                      !< Index into the preloading stl_models(:)
-        real(wp) :: threshold                    !< Inside/outside cutoff for this model
-        real(wp), dimension(1:3) :: point        !< Cell-center query point
-        real(wp), dimension(1:3) :: point_local  !< Query point transformed into the model frame
-        logical :: in_box                        !< Whether the cell center lies in the model's bounding box
+        integer :: i, j, k                 !< loop iterators
+        integer :: model_id                !< Index into the preloading stl_models(:)
+        real(wp) :: threshold              !< Inside/outside cutoff for this model
+        real(wp), dimension(1:3) :: point  !< Cell-center query point
+        logical :: in_box                  !< Whether the cell center lies in the model's bounding box
 
         model_id = patch_icpp(patch_id)%model_id
         threshold = stl_models(model_id)%model_threshold
@@ -1313,20 +1313,16 @@ contains
             if (p > 0) point(3) = z_cc(k)
             if (grid_geometry == 3) point = f_convert_cyl_to_cart(point)
 
-            ! Transform the query point into the model frame: centroid-relative, then rotate
-            point_local = matmul(patch_icpp(patch_id)%rotation_matrix_inverse, [point(1) - patch_icpp(patch_id)%x_centroid, &
-                                 & point(2) - patch_icpp(patch_id)%y_centroid, point(3) - patch_icpp(patch_id)%z_centroid])
-
-            ! Run the winding test only on cells whose transformed point lies inside the bounding box, else skip the calculation
-            in_box = point_local(1) >= stl_bounding_boxes(model_id, 1, 1) .and. point_local(1) <= stl_bounding_boxes(model_id, 1, &
-                                 & 3) .and. point_local(2) >= stl_bounding_boxes(model_id, 2, &
-                                 & 1) .and. point_local(2) <= stl_bounding_boxes(model_id, 2, 3)
+            ! Run the winding test only on cells whose Cartesian point lies inside the bounding box, else skip the calculation
+            in_box = point(1) >= stl_bounding_boxes(model_id, 1, 1) .and. point(1) <= stl_bounding_boxes(model_id, 1, &
+                           & 3) .and. point(2) >= stl_bounding_boxes(model_id, 2, &
+                           & 1) .and. point(2) <= stl_bounding_boxes(model_id, 2, 3)
             if (p > 0 .or. grid_geometry == 3) then
-                in_box = in_box .and. point_local(3) >= stl_bounding_boxes(model_id, 3, &
-                                                  & 1) .and. point_local(3) <= stl_bounding_boxes(model_id, 3, 3)
+                in_box = in_box .and. point(3) >= stl_bounding_boxes(model_id, 3, &
+                                            & 1) .and. point(3) <= stl_bounding_boxes(model_id, 3, 3)
             end if
             if (in_box) then
-                eta = f_model_is_inside(gpu_ntrs(model_id), model_id, point_local)
+                eta = f_model_is_inside(gpu_ntrs(model_id), model_id, point)
             else
                 eta = 0._wp
             end if
diff --git a/src/pre_process/m_mpi_proxy.fpp b/src/pre_process/m_mpi_proxy.fpp
@@ -144,7 +144,7 @@ contains
         do i = 1, num_stl_models_max
             call MPI_BCAST(stl_models(i)%model_filepath, len(stl_models(i)%model_filepath), MPI_CHARACTER, 0, MPI_COMM_WORLD, ierr)
             call MPI_BCAST(stl_models(i)%model_threshold, 1, mpi_p, 0, MPI_COMM_WORLD, ierr)
-            #:for VAR in ['model_translate', 'model_scale']
+            #:for VAR in ['model_translate', 'model_scale', 'model_rotate']
                 call MPI_BCAST(stl_models(i)%${VAR}$, 3, mpi_p, 0, MPI_COMM_WORLD, ierr)
             #:endfor
         end do
diff --git a/toolchain/mfc/params/definitions.py b/toolchain/mfc/params/definitions.py
@@ -932,7 +932,7 @@ def _load():
     _sm_attrs: Dict[str, tuple] = {}
     _sm_attrs["model_filepath"] = (STR, set())
     _sm_attrs["model_threshold"] = (REAL, set())
-    for t in ["translate", "scale"]:
+    for t in ["translate", "scale", "rotate"]:
         for j in range(1, 4):
             _sm_attrs[f"model_{t}({j})"] = (REAL, set())
     REGISTRY.register_family(
diff --git a/toolchain/mfc/params/descriptions.py b/toolchain/mfc/params/descriptions.py
@@ -356,6 +356,7 @@
     (r"stl_models\((\d+)\)%model_threshold", "Inside/outside winding number threshold for STL model {0}"),
     (r"stl_models\((\d+)\)%model_translate\((\d+)\)", "Translation component {1} for STL model {0}"),
     (r"stl_models\((\d+)\)%model_scale\((\d+)\)", "Scale component {1} for STL model {0}"),
+    (r"stl_models\((\d+)\)%model_rotate\((\d+)\)", "Rotation component {1} (radians) for STL model {0}"),
     # bc patterns
     (r"bc_([xyz])%vel_in\((\d+)\)", "Inlet velocity component {1} at {0}-boundary"),
     (r"bc_([xyz])%vel_out\((\d+)\)", "Outlet velocity component {1} at {0}-boundary"),
