Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
VirtualFluids
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
iRMB
VirtualFluids
Commits
bbb2ec2b
Commit
bbb2ec2b
authored
1 year ago
by
Kutscher
Browse files
Options
Downloads
Patches
Plain Diff
fix unused variables
parent
fd65247e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!225
Refactoring of CPU code
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/cpu/MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.cpp
+6
-6
6 additions, 6 deletions
.../MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.cpp
with
6 additions
and
6 deletions
src/cpu/MultiphaseFlow/LBM/MultiphaseSharpInterfaceLBMKernel.cpp
+
6
−
6
View file @
bbb2ec2b
...
@@ -224,7 +224,7 @@ void MultiphaseSharpInterfaceLBMKernel::calculate(int step)
...
@@ -224,7 +224,7 @@ void MultiphaseSharpInterfaceLBMKernel::calculate(int step)
real
mfbbb
=
(
*
this
->
zeroDistributionsH1
)(
x1
,
x2
,
x3
);
real
mfbbb
=
(
*
this
->
zeroDistributionsH1
)(
x1
,
x2
,
x3
);
omegaDRho
=
2.0
;
// 1.5;
omegaDRho
=
2.0
;
// 1.5;
real
phiOld
=
(
*
phaseField
)(
x1
,
x2
,
x3
);
//
real phiOld = (*phaseField)(x1, x2, x3);
(
*
phaseField
)(
x1
,
x2
,
x3
)
=
(((
mfaaa
+
mfccc
)
+
(
mfaca
+
mfcac
))
+
((
mfaac
+
mfcca
)
+
(
mfcaa
+
mfacc
)))
+
(
*
phaseField
)(
x1
,
x2
,
x3
)
=
(((
mfaaa
+
mfccc
)
+
(
mfaca
+
mfcac
))
+
((
mfaac
+
mfcca
)
+
(
mfcaa
+
mfacc
)))
+
(((
mfaab
+
mfacb
)
+
(
mfcab
+
mfccb
))
+
((
mfaba
+
mfabc
)
+
(
mfcba
+
mfcbc
))
+
(((
mfaab
+
mfacb
)
+
(
mfcab
+
mfccb
))
+
((
mfaba
+
mfabc
)
+
(
mfcba
+
mfcbc
))
+
...
@@ -400,12 +400,12 @@ void MultiphaseSharpInterfaceLBMKernel::calculate(int step)
...
@@ -400,12 +400,12 @@ void MultiphaseSharpInterfaceLBMKernel::calculate(int step)
real
vzBC
=
((
*
vzNode
)(
x1
+
D3Q27System
::
DX1
[
fdir
],
x2
+
D3Q27System
::
DX2
[
fdir
],
x3
+
D3Q27System
::
DX3
[
fdir
]));
real
vzBC
=
((
*
vzNode
)(
x1
+
D3Q27System
::
DX1
[
fdir
],
x2
+
D3Q27System
::
DX2
[
fdir
],
x3
+
D3Q27System
::
DX3
[
fdir
]));
real
vBC
=
(
D3Q27System
::
DX1
[
fdir
]
*
vxBC
+
D3Q27System
::
DX2
[
fdir
]
*
vyBC
+
D3Q27System
::
DX3
[
fdir
]
*
vzBC
);
real
vBC
=
(
D3Q27System
::
DX1
[
fdir
]
*
vxBC
+
D3Q27System
::
DX2
[
fdir
]
*
vyBC
+
D3Q27System
::
DX3
[
fdir
]
*
vzBC
);
real
vDir
=
(
D3Q27System
::
DX1
[
fdir
]
*
vx
+
D3Q27System
::
DX2
[
fdir
]
*
vy
+
D3Q27System
::
DX3
[
fdir
]
*
vz
);
real
vDir
=
(
D3Q27System
::
DX1
[
fdir
]
*
vx
+
D3Q27System
::
DX2
[
fdir
]
*
vy
+
D3Q27System
::
DX3
[
fdir
]
*
vz
);
real
dvDir
=
vBC
-
vDir
;
//
real dvDir = vBC - vDir;
vBC
=
(
vBC
+
vDir
)
/
(
c2o1
+
vBC
-
vDir
);
vBC
=
(
vBC
+
vDir
)
/
(
c2o1
+
vBC
-
vDir
);
real
fL
=
distribution
->
getDistributionInvForDirection
(
x1
+
D3Q27System
::
DX1
[
fdir
],
x2
+
D3Q27System
::
DX2
[
fdir
],
x3
+
D3Q27System
::
DX3
[
fdir
],
D3Q27System
::
INVDIR
[
fdir
]);
real
fL
=
distribution
->
getDistributionInvForDirection
(
x1
+
D3Q27System
::
DX1
[
fdir
],
x2
+
D3Q27System
::
DX2
[
fdir
],
x3
+
D3Q27System
::
DX3
[
fdir
],
D3Q27System
::
INVDIR
[
fdir
]);
real
fG
=
distribution
->
getDistributionInvForDirection
(
x1
,
x2
,
x3
,
fdir
);
real
fG
=
distribution
->
getDistributionInvForDirection
(
x1
,
x2
,
x3
,
fdir
);
real
fBC
=
fG
-
c6o1
*
WEIGTH
[
fdir
]
*
(
vBC
);
real
fBC
=
fG
-
c6o1
*
WEIGTH
[
fdir
]
*
(
vBC
);
real
fGEQ
=
D3Q27System
::
getIncompFeqForDirection
(
fdir
,
rhoG
,
vx
,
vy
,
vz
);
//
real fGEQ = D3Q27System::getIncompFeqForDirection(fdir, rhoG, vx, vy, vz);
// real fBC = (-fGInv + fGInvEQ + fGEQ - c6o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
// real fBC = (-fGInv + fGInvEQ + fGEQ - c6o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
//real fBC = (fGEQ - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
//real fBC = (fGEQ - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
...
@@ -481,13 +481,13 @@ void MultiphaseSharpInterfaceLBMKernel::calculate(int step)
...
@@ -481,13 +481,13 @@ void MultiphaseSharpInterfaceLBMKernel::calculate(int step)
real
vzBC
=
((
*
vzNode
)(
x1
+
D3Q27System
::
DX1
[
fdir
],
x2
+
D3Q27System
::
DX2
[
fdir
],
x3
+
D3Q27System
::
DX3
[
fdir
]));
real
vzBC
=
((
*
vzNode
)(
x1
+
D3Q27System
::
DX1
[
fdir
],
x2
+
D3Q27System
::
DX2
[
fdir
],
x3
+
D3Q27System
::
DX3
[
fdir
]));
real
vBC
=
(
D3Q27System
::
DX1
[
fdir
]
*
vxBC
+
D3Q27System
::
DX2
[
fdir
]
*
vyBC
+
D3Q27System
::
DX3
[
fdir
]
*
vzBC
);
real
vBC
=
(
D3Q27System
::
DX1
[
fdir
]
*
vxBC
+
D3Q27System
::
DX2
[
fdir
]
*
vyBC
+
D3Q27System
::
DX3
[
fdir
]
*
vzBC
);
real
vDir
=
(
D3Q27System
::
DX1
[
fdir
]
*
vx
+
D3Q27System
::
DX2
[
fdir
]
*
vy
+
D3Q27System
::
DX3
[
fdir
]
*
vz
);
real
vDir
=
(
D3Q27System
::
DX1
[
fdir
]
*
vx
+
D3Q27System
::
DX2
[
fdir
]
*
vy
+
D3Q27System
::
DX3
[
fdir
]
*
vz
);
real
dvDir
=
vBC
-
vDir
;
//
real dvDir = vBC - vDir;
vBC
=
(
vBC
+
vDir
)
/
(
c2o1
+
vBC
-
vDir
);
vBC
=
(
vBC
+
vDir
)
/
(
c2o1
+
vBC
-
vDir
);
real
fL
=
distribution
->
getDistributionInvForDirection
(
x1
+
D3Q27System
::
DX1
[
fdir
],
x2
+
D3Q27System
::
DX2
[
fdir
],
x3
+
D3Q27System
::
DX3
[
fdir
],
D3Q27System
::
INVDIR
[
fdir
]);
real
fL
=
distribution
->
getDistributionInvForDirection
(
x1
+
D3Q27System
::
DX1
[
fdir
],
x2
+
D3Q27System
::
DX2
[
fdir
],
x3
+
D3Q27System
::
DX3
[
fdir
],
D3Q27System
::
INVDIR
[
fdir
]);
real
fG
=
distribution
->
getDistributionInvForDirection
(
x1
,
x2
,
x3
,
fdir
);
real
fG
=
distribution
->
getDistributionInvForDirection
(
x1
,
x2
,
x3
,
fdir
);
real
fBC
=
fG
-
c6o1
*
WEIGTH
[
fdir
]
*
(
vBC
);
real
fBC
=
fG
-
c6o1
*
WEIGTH
[
fdir
]
*
(
vBC
);
real
fGEQ
=
D3Q27System
::
getIncompFeqForDirection
(
fdir
,
rhoG
,
vx
,
vy
,
vz
);
//
real fGEQ = D3Q27System::getIncompFeqForDirection(fdir, rhoG, vx, vy, vz);
// real fBC = (-fGInv + fGInvEQ + fGEQ - c6o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
// real fBC = (-fGInv + fGInvEQ + fGEQ - c6o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
//real fBC = (fGEQ - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
//real fBC = (fGEQ - c3o1 * WEIGTH[fdir] * dvDir * (c1o1 / collFactorG - c1o1)) - c6o1 * WEIGTH[fdir] * (vBC);
...
@@ -705,7 +705,7 @@ void MultiphaseSharpInterfaceLBMKernel::calculate(int step)
...
@@ -705,7 +705,7 @@ void MultiphaseSharpInterfaceLBMKernel::calculate(int step)
real
rhoH
=
1.0
;
real
rhoH
=
1.0
;
real
rhoL
=
1.0
/
densityRatio
;
real
rhoL
=
1.0
/
densityRatio
;
real
rhoToPhi
=
(
rhoH
-
rhoL
)
/
(
phiH
-
phiL
);
//
real rhoToPhi = (rhoH - rhoL) / (phiH - phiL);
real
dX1_phi
=
gradX1_phi
();
real
dX1_phi
=
gradX1_phi
();
real
dX2_phi
=
gradX2_phi
();
real
dX2_phi
=
gradX2_phi
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment