Skip to content

Commit d52d5ea

Browse files
Spencer Bryngelsonclaude
andcommitted
Remove IBM Feature PR (#1157) changes accidentally included in CCE fix branch
These files were inadvertently pulled in from a separate IBM Feature Improvements PR (7c806be) that has not been merged to master. They caused Phoenix (nvfortran) compilation failures in m_ibm.fpp which triggered fail-fast cancellation of all Frontier CI jobs. Restore all affected files to match master (021322c): src/common/m_constants.fpp src/common/m_derived_types.fpp src/common/m_helper.fpp src/common/m_model.fpp src/pre_process/m_icpp_patches.fpp src/simulation/m_compute_levelset.fpp src/simulation/m_data_output.fpp src/simulation/m_global_parameters.fpp src/simulation/m_ib_patches.fpp src/simulation/m_ibm.fpp src/simulation/m_mpi_proxy.fpp src/simulation/m_time_steppers.fpp tests/[2EE0C3AA,3008BA80,8876692F,AFBACA70] (new tests from IBM PR) tests/[0A362971,4E0FBE72,EA8FA07E] (restored to master content) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 58ac1ff commit d52d5ea

26 files changed

Lines changed: 1603 additions & 2344 deletions

src/common/m_constants.fpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ module m_constants
2323
integer, parameter :: fourier_rings = 5 !< Fourier filter ring limit
2424
integer, parameter :: num_fluids_max = 10 !< Maximum number of fluids in the simulation
2525
integer, parameter :: num_probes_max = 10 !< Maximum number of flow probes in the simulation
26-
integer, parameter :: num_patches_max = 1000
26+
integer, parameter :: num_patches_max = 10
2727
integer, parameter :: num_bc_patches_max = 10
2828
integer, parameter :: pathlen_max = 400
2929
integer, parameter :: nnode = 4 !< Number of QBMM nodes
@@ -50,10 +50,14 @@ module m_constants
5050
real(wp), parameter :: dflt_T_guess = 1200._wp ! Default guess for temperature (when a previous value is not available)
5151

5252
! IBM+STL interpolation constants
53+
integer, parameter :: Ifactor_2D = 50 !< Multiple factor of the ratio (edge to cell width) for interpolation along edges for 2D models
54+
integer, parameter :: Ifactor_3D = 5 !< Multiple factor of the ratio (edge to cell width) for interpolation along edges for 3D models
55+
integer, parameter :: Ifactor_bary_3D = 20 !< Multiple factor of the ratio (triangle area to cell face area) for interpolation on triangle facets for 3D models
5356
integer, parameter :: num_ray = 20 !< Default number of rays traced per cell
5457
real(wp), parameter :: ray_tracing_threshold = 0.9_wp !< Threshold above which the cell is marked as the model patch
5558
real(wp), parameter :: threshold_vector_zero = 1.e-10_wp !< Threshold to treat the component of a vector to be zero
5659
real(wp), parameter :: threshold_edge_zero = 1.e-10_wp !< Threshold to treat two edges to be overlapped
60+
real(wp), parameter :: threshold_bary = 1.e-1_wp !< Threshold to interpolate a barycentric facet
5761
real(wp), parameter :: initial_distance_buffer = 1.e12_wp !< Initialized levelset distance for the shortest path pair algorithm
5862

5963
! Lagrange bubbles constants

src/common/m_derived_types.fpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -183,18 +183,12 @@ module m_derived_types
183183
end type t_model
184184

185185
type :: t_model_array
186-
! Original CPU-side fields (unchanged)
187186
type(t_model), allocatable :: model
188187
real(wp), allocatable, dimension(:, :, :) :: boundary_v
189188
real(wp), allocatable, dimension(:, :) :: interpolated_boundary_v
190189
integer :: boundary_edge_count
191190
integer :: total_vertices
192-
integer :: interpolate
193-
194-
! GPU-friendly flattened arrays
195-
integer :: ntrs ! copy of model%ntrs
196-
real(wp), allocatable, dimension(:, :, :) :: trs_v ! (3, 3, ntrs) - triangle vertices
197-
real(wp), allocatable, dimension(:, :) :: trs_n ! (3, ntrs) - triangle normals
191+
logical :: interpolate
198192
end type t_model_array
199193

200194
!> Derived type adding initial condition (ic) patch parameters as attributes
@@ -456,7 +450,6 @@ module m_derived_types
456450
real(wp), dimension(1:3) :: levelset_norm
457451
logical :: slip
458452
integer, dimension(3) :: DB
459-
integer :: x_periodicity, y_periodicity, z_periodicity
460453
end type ghost_point
461454
462455
!> Species parameters

src/common/m_helper.fpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,8 +333,6 @@ contains
333333
!! @return The cross product of the two vectors.
334334
pure function f_cross(a, b) result(c)
335335
336-
$:GPU_ROUTINE(parallelism='[seq]')
337-
338336
real(wp), dimension(3), intent(in) :: a, b
339337
real(wp), dimension(3) :: c
340338

0 commit comments

Comments
 (0)