Skip to content

Commit 51f56f0

Browse files
committed
Fix Smooth Function in Cylinder and Sphere
1 parent 105f30a commit 51f56f0

File tree

1 file changed

+21
-20
lines changed

1 file changed

+21
-20
lines changed

src/pre_process/m_patches.fpp

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1613,9 +1613,10 @@ contains
16131613
- radius))*(-0.5_wp) + 0.5_wp
16141614
end if
16151615

1616-
if ((x_cc(i) - x_centroid)**2 &
1617-
+ (cart_y - y_centroid)**2 &
1618-
+ (cart_z - z_centroid)**2 <= radius**2) &
1616+
if (((x_cc(i) - x_centroid)**2 &
1617+
+ (cart_y - y_centroid)**2 &
1618+
+ (cart_z - z_centroid)**2 <= radius**2) .or. &
1619+
patch_id_fp(i, j, k) == smooth_patch_id) &
16191620
then
16201621

16211622
if (present(ib)) then
@@ -1828,23 +1829,23 @@ contains
18281829
end if
18291830
end if
18301831

1831-
if ((.not. f_is_default(length_x) .and. &
1832-
(cart_y - y_centroid)**2 &
1833-
+ (cart_z - z_centroid)**2 <= radius**2 .and. &
1834-
x_boundary%beg <= x_cc(i) .and. &
1835-
x_boundary%end >= x_cc(i)) &
1836-
.or. &
1837-
(.not. f_is_default(length_y) .and. &
1838-
(x_cc(i) - x_centroid)**2 &
1839-
+ (cart_z - z_centroid)**2 <= radius**2 .and. &
1840-
y_boundary%beg <= cart_y .and. &
1841-
y_boundary%end >= cart_y) &
1842-
.or. &
1843-
(.not. f_is_default(length_z) .and. &
1844-
(x_cc(i) - x_centroid)**2 &
1845-
+ (cart_y - y_centroid)**2 <= radius**2 .and. &
1846-
z_boundary%beg <= cart_z .and. &
1847-
z_boundary%end >= cart_z)) then
1832+
if (((.not. f_is_default(length_x) .and. &
1833+
(cart_y - y_centroid)**2 &
1834+
+ (cart_z - z_centroid)**2 <= radius**2 .and. &
1835+
x_boundary%beg <= x_cc(i) .and. &
1836+
x_boundary%end >= x_cc(i)) &
1837+
.or. &
1838+
(.not. f_is_default(length_y) .and. &
1839+
(x_cc(i) - x_centroid)**2 &
1840+
+ (cart_z - z_centroid)**2 <= radius**2 .and. &
1841+
y_boundary%beg <= cart_y .and. &
1842+
y_boundary%end >= cart_y) &
1843+
.or. &
1844+
(.not. f_is_default(length_z) .and. &
1845+
(x_cc(i) - x_centroid)**2 &
1846+
+ (cart_y - y_centroid)**2 <= radius**2 .and. &
1847+
z_boundary%beg <= cart_z .and. &
1848+
z_boundary%end >= cart_z)) .or. patch_id_fp(i, j, k) == smooth_patch_id) then
18481849

18491850
if (present(ib)) then
18501851
! Updating the patch identities bookkeeping variable

0 commit comments

Comments
 (0)