Skip to content

Commit 4330e06

Browse files
author
Diego Vaca
committed
Fixed frontier attempt 1
1 parent 00fc3e9 commit 4330e06

File tree

2 files changed

+8
-40
lines changed

2 files changed

+8
-40
lines changed

src/simulation/m_bubbles_EL.fpp

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -910,15 +910,11 @@ contains
910910
!R_Omega
911911
dc = (3._wp*vol/(4._wp*pi))**(1._wp/3._wp)
912912

913-
else if (lag_params%cluster_type >= 2) then
913+
else
914914
! Bubble dynamic closure from Maeda and Colonius (2018)
915915

916916
! Range of cells included in Omega
917-
if (lag_params%smooth_type == 1) then
918-
mapCells_pinf = mapCells
919-
else
920-
stop "lag_params%cluster_type: 2 requires lag_params%smooth_type: 1."
921-
end if
917+
mapCells_pinf = mapCells
922918

923919
! Include the cell that contains the bubble (mapCells+1+mapCells)
924920
smearGrid = mapCells_pinf - (-mapCells_pinf) + 1
@@ -996,10 +992,6 @@ contains
996992
vol = charvol
997993
dc = (3._wp*abs(vol)/(4._wp*pi))**(1._wp/3._wp)
998994

999-
else
1000-
1001-
stop "Check cluterflag. Exiting."
1002-
1003995
end if
1004996

1005997
if (lag_params%pressure_corrector) then

src/simulation/m_bubbles_EL_kernels.fpp

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -317,51 +317,27 @@ contains
317317

318318
! x-dir
319319
if (bc_x%beg == -2 .and. (cell(1) <= mapCells - 1)) then
320-
if (cell(1) >= 0) then
321-
cellaux(1) = abs(cellaux(1)) - 1
322-
else
323-
stop "Lagrangian bubbles must not be located in the ghost cells of a symmetric boundary (bc_x%beg)."
324-
end if
320+
cellaux(1) = abs(cellaux(1)) - 1
325321
end if
326322
if (bc_x%end == -2 .and. (cell(1) >= m + 1 - mapCells)) then
327-
if (cell(1) <= m) then
328-
cellaux(1) = cellaux(1) - (2*(cellaux(1) - m) - 1)
329-
else
330-
stop "Lagrangian bubbles must not be located in the ghost cells of a symmetric boundary (bc_x%end)."
331-
end if
323+
cellaux(1) = cellaux(1) - (2*(cellaux(1) - m) - 1)
332324
end if
333325

334326
!y-dir
335327
if (bc_y%beg == -2 .and. (cell(2) <= mapCells - 1)) then
336-
if (cell(2) >= 0) then
337-
cellaux(2) = abs(cellaux(2)) - 1
338-
else
339-
stop "Lagrangian bubbles must not be located in the ghost cells of a symmetric boundary (bc_y%beg)."
340-
end if
328+
cellaux(2) = abs(cellaux(2)) - 1
341329
end if
342330
if (bc_y%end == -2 .and. (cell(2) >= n + 1 - mapCells)) then
343-
if (cell(2) <= n) then
344-
cellaux(2) = cellaux(2) - (2*(cellaux(2) - n) - 1)
345-
else
346-
stop "Lagrangian bubbles must not be located in the ghost cells of a symmetric boundary (bc_y%end)."
347-
end if
331+
cellaux(2) = cellaux(2) - (2*(cellaux(2) - n) - 1)
348332
end if
349333

350334
if (p > 0) then
351335
!z-dir
352336
if (bc_z%beg == -2 .and. (cell(3) <= mapCells - 1)) then
353-
if (cell(3) >= 0) then
354-
cellaux(3) = abs(cellaux(3)) - 1
355-
else
356-
stop "Lagrangian bubbles must not be located in the ghost cells of a symmetric boundary (bc_z%beg)."
357-
end if
337+
cellaux(3) = abs(cellaux(3)) - 1
358338
end if
359339
if (bc_z%end == -2 .and. (cell(3) >= p + 1 - mapCells)) then
360-
if (cell(3) <= p) then
361-
cellaux(3) = cellaux(3) - (2*(cellaux(3) - p) - 1)
362-
else
363-
stop "Lagrangian bubbles must not be located in the ghost cells of a symmetric boundary (bc_z%end)."
364-
end if
340+
cellaux(3) = cellaux(3) - (2*(cellaux(3) - p) - 1)
365341
end if
366342
end if
367343

0 commit comments

Comments
 (0)