Skip to content

Commit b1bc65b

Browse files
authored
Merge pull request #288 from loganoz/newmobility
update mobility definition
2 parents ab3b023 + 362e673 commit b1bc65b

14 files changed

Lines changed: 15 additions & 107 deletions

File tree

Solver/src/libs/physics/cahnhilliard/PhysicsStorage_CH.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Module Physics_CHKeywordsModule
77
! Required arguments
88
! ******************
99
!
10-
character(len=KEYWORD_LENGTH), parameter :: TCH_KEY = "chemical characteristic time (s)"
10+
character(len=KEYWORD_LENGTH), parameter :: TCH_KEY = "chem characteristic time (s)"
1111
character(len=KEYWORD_LENGTH), parameter :: INTERFACE_WIDTH_KEY = "interface width (m)"
1212
character(len=KEYWORD_LENGTH), parameter :: INTERFACE_TENSION_KEY = "interface tension (n/m)"
1313
CHARACTER(LEN=KEYWORD_LENGTH), DIMENSION(3) :: physics_CHKeywords = [INTERFACE_WIDTH_KEY, &
@@ -84,7 +84,7 @@ SUBROUTINE ConstructPhysicsStorage_CH( controlVariables, Lref, timeRef, pRef, su
8484
multiphase_ % sigma_wDim = controlVariables % DoublePrecisionValueForKey(INTERFACE_TENSION_KEY)
8585

8686
if ( .not. almostEqual(multiphase_ % tCH_wDim, 0.0_RP) ) then
87-
multiphase_ % M0_wDim = POW2(Lref)*multiphase_ % eps_wDim / (multiphase_ % tCH_wDim * multiphase_ % sigma_wDim)
87+
multiphase_ % M0_wDim = POW2(Lref)*(multiphase_ % eps_wDim**2) / (multiphase_ % tCH_wDim * multiphase_ % sigma_wDim)
8888
else
8989
multiphase_ % M0_wDim = 0.0_RP
9090
end if
@@ -95,7 +95,7 @@ SUBROUTINE ConstructPhysicsStorage_CH( controlVariables, Lref, timeRef, pRef, su
9595
multiphase_ % sigma = multiphase_ % sigma_wDim / pRef
9696

9797
if ( .not. almostEqual(multiphase_ % tCH, 0.0_RP) ) then
98-
multiphase_ % M0 = multiphase_ % eps / (multiphase_ % tCH * multiphase_ % sigma)
98+
multiphase_ % M0 = (multiphase_ % eps**2) / (multiphase_ % tCH * multiphase_ % sigma)
9999
else
100100
multiphase_ % M0 = 0.0_RP
101101
end if

Solver/test/CahnHilliard/TJokisaari/TJokisaari.control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ time integration = imex
2222
reference length (m) = 1.0d0
2323
interface width (m) = 3.1623d0
2424
interface tension (N/m) = 1.0d0
25-
chemical characteristic time (s) = 0.31623
25+
chem characteristic time (s) = 1.000014129
2626
dt = 1.0d-3
2727
simulation type = time-accurate
2828
final time = 20.0d3

Solver/test/Multiphase/ActuatorLineInterpolation/Actuator.control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ fluid 2 sound speed square (m/s) = 116136.222222222
2121
fluid 2 density (kg/m^3) = 1.22145354210477
2222
fluid 2 viscosity (Pa.s) = 1.831943887d-5
2323

24-
chemical characteristic time (s) = 1000000
24+
chem characteristic time (s) = 40000
2525
interface width (m) = 0.04
2626
interface tension (N/m) = 72.8e-3
2727

Solver/test/Multiphase/Convergence/Convergence.control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
interface width (m) = 0.70711
2424
interface tension (N/m) = 6.236E-3
25-
chemical characteristic time (s) = 1000.0
25+
chem characteristic time (s) = 707.11
2626
artificial sound speed square (m/s) = 1000.0
2727
!------------------------- Discretization:-
2828
Polynomial order = 5

Solver/test/Multiphase/Convergence_cs/Convergence_cs.control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
interface width (m) = 0.70711
2323
interface tension (N/m) = 6.236E-3
24-
chemical characteristic time (s) = 1000.0
24+
chem characteristic time (s) = 707.11 !1000
2525
!artificial sound speed square (m/s) = 1000.0
2626
fluid 1 sound speed square (m/s) = 1000.0
2727
fluid 2 sound speed square (m/s) = 2000.0

Solver/test/Multiphase/Convergence_cs/SETUP/ProblemFile.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ SUBROUTINE UserDefinedFinalize(mesh, time, iter, maxResidual &
559559
7.4217194511428453E-17_RP, &
560560
6.1637135702849238E-04_RP]
561561
integer :: i, j,k, eID
562-
CHARACTER(LEN=29) :: testName = "Multiphase convergence non constant sound speed"
562+
CHARACTER(LEN=49) :: testName = "Multiphase convergence non constant sound speed"
563563
real(kind=RP) :: error(5)
564564
TYPE(FTAssertionsManager), POINTER :: sharedManager
565565
LOGICAL :: success

Solver/test/Multiphase/Convergence_cs/convergence_cs.control

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

Solver/test/Multiphase/EntropyConservingTest/EntropyConservingTest.control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
fluid 1 viscosity (Pa.s) = 0.005
2020
fluid 2 viscosity (Pa.s) = 0.01
2121
! MAINTAINED TO COMPARE!! mobility = 0.18856
22-
chemical characteristic time (s) = 900.0
22+
chem characteristic time (s) = 38.16
2323
interface width (m) = 0.0424
2424
Interface tension (N/m) = 0.00025
2525
artificial compressibility factor = 1000.0

Solver/test/Multiphase/MixedRK/mixedRK.control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Averaging = Skew-symmetric 2
5050
Viscous discretization = BR1 ! IP/BR2
5151
Cahn-Hilliard discretization = BR1
5252

53-
chemical characteristic time (s) = 1e+16 !10000
53+
chem characteristic time (s) = 1e+14 !10000
5454
interface width (m) = 0.01
5555
interface tension (N/m) = 1e-16 !72.8e-3
5656

Solver/test/Multiphase/Monopole_pAdaptationRL/monopole_pAdaptationRL.control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Lambda stabilization = 1.0
4444
Viscous discretization = BR1
4545
Cahn-Hilliard discretization = BR1
4646

47-
chemical characteristic time (s) = 400 !400 !1.0d12 !1000.0 !50000
47+
chem characteristic time (s) = 100 !1.0d12 !1000.0 !50000
4848
interface width (m) = 0.25
4949
interface tension (N/m) = 0.0728 !1.0d-12 !0.01
5050

0 commit comments

Comments
 (0)