Skip to content

Commit c6b2fe0

Browse files
author
Diego Vaca
committed
Correction of the Keller-Miksis model
1 parent e927790 commit c6b2fe0

File tree

17 files changed

+203
-1239
lines changed

17 files changed

+203
-1239
lines changed

src/simulation/m_bubbles.fpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -247,17 +247,15 @@ contains
247247
cdot_star = fpbdot
248248
end if
249249

250-
if (.not. bubbles_lagrange) then
251-
if (.not. f_is_default(Web)) cdot_star = cdot_star + (2._wp/Web)*fV/(fR**2._wp)
252-
if (.not. f_is_default(Re_inv)) cdot_star = cdot_star + 4._wp*Re_inv*((fV/fR)**2._wp)
253-
end if
250+
if (.not. f_is_default(Web)) cdot_star = cdot_star + (2._wp/Web)*fV/(fR**2._wp)
251+
if (.not. f_is_default(Re_inv)) cdot_star = cdot_star + 4._wp*Re_inv*((fV/fR)**2._wp)
254252

255253
tmp1 = fV/fC
256254
tmp2 = 1.5_wp*(fV**2._wp)*(tmp1/3._wp - 1._wp) + &
257255
(1._wp + tmp1)*(fCpbw - fCp)/fRho + &
258256
cdot_star*fR/(fRho*fC)
259257

260-
if (bubbles_lagrange .or. f_is_default(Re_inv)) then
258+
if (f_is_default(Re_inv)) then
261259
f_rddot_KM = tmp2/(fR*(1._wp - tmp1))
262260
else
263261
f_rddot_KM = tmp2/(fR*(1._wp - tmp1) + 4._wp*Re_inv/(fRho*fC))

tests/A1480A64/golden-metadata.txt renamed to tests/016C1B8B/golden-metadata.txt

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

tests/44CDCE28/golden.txt renamed to tests/016C1B8B/golden.txt

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

tests/16868C50/golden-metadata.txt

Lines changed: 0 additions & 182 deletions
This file was deleted.

tests/16868C50/golden.txt

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)