Skip to content

removing duplicated codes in mixture rules for EE bubbles #1071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Dec 1, 2025
+106 −371
Merged

removing duplicated codes in mixture rules for EE bubbles #1071

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5d977c3
integrating mixture routines
Nov 29, 2025
ff8ff17
Merge branch 'MFlowCode:master' into bubnorm
hyeoksu-lee Nov 29, 2025
ae827a5
update mixture rules
Nov 29, 2025
e1e953c
fix mixture rule
Nov 29, 2025
50f78b8
correction for vf of EE bubble
Nov 29, 2025
4461db2
Merge branch 'MFlowCode:master' into bubnorm
hyeoksu-lee Nov 29, 2025
1568228
add mpp_lim to mixture rule acc
Nov 29, 2025
4b7ab1c
add comments
Nov 30, 2025
262e980
Merge branch 'bubnorm' into merge
hyeoksu-lee Nov 30, 2025
570e53c
Merge pull request #24 from hyeoksu-lee/merge
hyeoksu-lee Nov 30, 2025
f882347
update bubble case validation
Nov 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions src/common/m_checker_common.fpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,30 +312,22 @@ contains
integer :: i

bub_fac = 0
if (bubbles_euler .and. (num_fluids == 1)) bub_fac = 1
if (bubbles_euler) bub_fac = 1

do i = 1, num_fluids
do i = 1, num_fluids + bub_fac
call s_int_to_str(i, iStr)
@:PROHIBIT(.not. f_is_default(fluid_pp(i)%gamma) .and. fluid_pp(i)%gamma <= 0._wp, &
"fluid_pp("//trim(iStr)//")%gamma must be positive")

@:PROHIBIT(model_eqns == 1 .and. (.not. f_is_default(fluid_pp(i)%gamma)), &
"model_eqns = 1 does not support fluid_pp("//trim(iStr)//")%gamma")

@:PROHIBIT((i <= num_fluids + bub_fac .and. fluid_pp(i)%gamma <= 0._wp) .or. &
(i > num_fluids + bub_fac .and. (.not. f_is_default(fluid_pp(i)%gamma))), &
"for fluid_pp("//trim(iStr)//")%gamma")

@:PROHIBIT(.not. f_is_default(fluid_pp(i)%pi_inf) .and. fluid_pp(i)%pi_inf < 0._wp, &
"fluid_pp("//trim(iStr)//")%pi_inf must be non-negative")

@:PROHIBIT(model_eqns == 1 .and. (.not. f_is_default(fluid_pp(i)%pi_inf)), &
"model_eqns = 1 does not support fluid_pp("//trim(iStr)//")%pi_inf")

@:PROHIBIT((i <= num_fluids + bub_fac .and. fluid_pp(i)%pi_inf < 0._wp) .or. &
(i > num_fluids + bub_fac .and. (.not. f_is_default(fluid_pp(i)%pi_inf))), &
"for fluid_pp("//trim(iStr)//")%pi_inf")

@:PROHIBIT(fluid_pp(i)%cv < 0._wp, &
"fluid_pp("//trim(iStr)//")%cv must be positive")
end do
Expand Down
Loading
Loading