Skip to content

Commit 5279f5c

Browse files
haocheyhaochey
committed
Try fix intel compiler CI test
1 parent 27380da commit 5279f5c

File tree

5 files changed

+43
-31
lines changed

5 files changed

+43
-31
lines changed

‎examples/3D_ibm_stl_pyramid/case.py‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,18 @@
1313
# ==========================================================================
1414

1515
# Computational Domain Parameters ==========================================
16-
'x_domain%beg' : -4*D,
17-
'x_domain%end' : 4.0*D,
16+
'x_domain%beg' : -2*D,
17+
'x_domain%end' : 2*D,
1818
# y direction
19-
'y_domain%beg' : -2*D,
20-
'y_domain%end' : 2*D,
19+
'y_domain%beg' : -1.5*D,
20+
'y_domain%end' : 1.5*D,
2121
# z direction
22-
'z_domain%beg' : -2*D,
23-
'z_domain%end' : 2*D,
22+
'z_domain%beg' : -1.5*D,
23+
'z_domain%end' : 1.5*D,
2424
'cyl_coord' : 'F',
25-
'm' : 399,
26-
'n' : 199,
27-
'p' : 199,
25+
'm' : 239,
26+
'n' : 179,
27+
'p' : 179,
2828
'dt' : 1.0E-6,
2929
't_step_start' : 0,
3030
't_step_stop' : 1000,
@@ -91,9 +91,9 @@
9191
# Patch: Model Immersed Boundary ===========================================
9292
'patch_ib(1)%geometry' : 12,
9393
'patch_ib(1)%model%filepath' : 'Pyramid_IBM.stl',
94-
'patch_ib(1)%model%translate(1)' : -0.02056,
95-
'patch_ib(1)%model%translate(2)' : -0.01,
96-
'patch_ib(1)%model%translate(3)' : -0.01,
94+
'patch_ib(1)%model%translate(1)' : -0.0500000984,
95+
'patch_ib(1)%model%translate(2)' : -0.0500001003,
96+
'patch_ib(1)%model%translate(3)' : -0.0500001003,
9797
'patch_ib(1)%model%spc' : 100,
9898
'patch_ib(1)%model%threshold' : 0.01,
9999
'patch_ib(1)%slip' : 'F',

‎src/common/m_constants.fpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ module m_constants
3535
integer, parameter :: num_ray = 20 !< Default number of rays traced per cell
3636
real(kind(0d0)), parameter :: ray_tracing_threshold = 0.9d0 !< Threshold above which the cell is marked as the model patch
3737
real(kind(0d0)), parameter :: threshold_vector_zero = 1d-10 !< Threshold to treat the component of a vector to be zero
38-
real(kind(0d0)), parameter :: threshold_edge_zero = 1d-8 !< Threshold to treat two edges to be overlapped
38+
real(kind(0d0)), parameter :: threshold_edge_zero = 1d-10 !< Threshold to treat two edges to be overlapped
3939
real(kind(0d0)), parameter :: threshold_bary = 1d-1 !< Threshold to interpolate a barycentric facet
4040
real(kind(0d0)), parameter :: initial_distance_buffer = 1d12 !< Initialized levelset distance for the shortest path pair algorithm
4141

‎src/pre_process/m_compute_levelset.fpp‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ contains
271271
real(kind(0d0)) :: side_dists(4)
272272

273273
integer :: i, j, k !< Loop index variables
274+
integer :: idx !< Shortest path direction indicator
274275

275276
length_x = patch_ib(ib_patch_id)%length_x
276277
length_y = patch_ib(ib_patch_id)%length_y
@@ -296,10 +297,17 @@ contains
296297
side_dists(2) = x - top_right(1)
297298
side_dists(3) = bottom_left(2) - y
298299
side_dists(4) = y - top_right(2)
300+
min_dist = initial_distance_buffer
301+
idx = 1
299302

300-
min_dist = minval(abs(side_dists))
303+
do k = 1, 4
304+
if (abs(side_dists(k)) < abs(min_dist)) then
305+
idx = k
306+
min_dist = side_dists(idx)
307+
end if
308+
end do
301309

302-
if (min_dist == abs(side_dists(1))) then
310+
if (idx == 1) then
303311
levelset%sf(i, j, 0, ib_patch_id) = side_dists(1)
304312
if (side_dists(1) == 0) then
305313
levelset_norm%sf(i, j, 0, ib_patch_id, 1) = 0d0
@@ -308,7 +316,7 @@ contains
308316
abs(side_dists(1))
309317
end if
310318

311-
else if (min_dist == abs(side_dists(2))) then
319+
else if (idx == 2) then
312320
levelset%sf(i, j, 0, ib_patch_id) = side_dists(2)
313321
if (side_dists(2) == 0) then
314322
levelset_norm%sf(i, j, 0, ib_patch_id, 1) = 0d0
@@ -317,7 +325,7 @@ contains
317325
abs(side_dists(2))
318326
end if
319327

320-
else if (min_dist == abs(side_dists(3))) then
328+
else if (idx == 3) then
321329
levelset%sf(i, j, 0, ib_patch_id) = side_dists(3)
322330
if (side_dists(3) == 0) then
323331
levelset_norm%sf(i, j, 0, ib_patch_id, 2) = 0d0
@@ -326,7 +334,7 @@ contains
326334
abs(side_dists(3))
327335
end if
328336

329-
else if (min_dist == abs(side_dists(4))) then
337+
else if (idx == 4) then
330338
levelset%sf(i, j, 0, ib_patch_id) = side_dists(4)
331339
if (side_dists(4) == 0) then
332340
levelset_norm%sf(i, j, 0, ib_patch_id, 2) = 0d0

‎src/pre_process/m_model.fpp‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ contains
691691
!! @param spacing Dimensions of the current levelset cell
692692
!! @param interpolate Logical output
693693
subroutine f_check_interpolation_2D(boundary_v, boundary_edge_count, spacing, interpolate)
694-
logical, intent(out) :: interpolate !< Logical indicator of interpolation
694+
logical, intent(inout) :: interpolate !< Logical indicator of interpolation
695695
integer, intent(in) :: boundary_edge_count !< Number of boundary edges
696696
real(kind(0d0)), intent(in), dimension(1:boundary_edge_count, 1:3, 1:2) :: boundary_v
697697
t_vec3, intent(in) :: spacing
@@ -709,6 +709,8 @@ contains
709709

710710
if ((l1 > cell_width)) then
711711
interpolate = .true.
712+
else
713+
interpolate = .false.
712714
end if
713715
end do
714716

@@ -719,7 +721,7 @@ contains
719721
!! @param spacing Dimensions of the current levelset cell
720722
!! @param interpolate Logical output
721723
subroutine f_check_interpolation_3D(model, spacing, interpolate)
722-
logical, intent(out) :: interpolate
724+
logical, intent(inout) :: interpolate
723725
type(t_model), intent(in) :: model
724726
t_vec3, intent(in) :: spacing
725727
t_vec3 :: edge_l
@@ -751,6 +753,8 @@ contains
751753
(edge_l(2) > cell_width) .or. &
752754
(edge_l(3) > cell_width)) then
753755
interpolate = .true.
756+
else
757+
interpolate = .false.
754758
end if
755759
end do
756760

‎tests/1B218CF1/golden-metadata.txt‎

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)