List of commits:
Subject Hash Author Date (UTC)
renamed multiphaseSystem library, updated testCase directory with appropriate dictionaries and simulation parameters 7a49f08c5af48556cc18c98915f468442e0fa3e2 Anurag Misra 2017-09-27 13:33:10
update/debugof multiphaseSystem + add switch populationbalance 286070162f350e965a9c0fb8a0d8cd17be017f55 Cyrille Bonamy 2017-09-27 10:12:40
debug + clean code : dev of multiphaseSystem class 0ffbb65f8e7778190a8f38389da15ffc291e38c3 Cyrille Bonamy 2017-09-26 22:29:03
added test case 5cea8fbe2ca96c5e2f1b0783cbab252feae135b9 Anurag Misra 2017-09-26 16:26:29
initial commit 7588fca1df5e437393a92558137d8fafae0a4135 Anurag Misra 2017-09-26 13:11:04
Add new directory 34e3d681a663185f8098a20e129197ed6fdcf359 EXT Anurag Misra 2017-09-26 12:30:56
Update .gitignore a8cf2a2e66d80e5f4facd744abb9250799c41b8e EXT Anurag Misra 2017-09-26 09:11:16
Add .gitignore bb915188ad046d466526ec637b5f1faac8eb8e6d EXT Anurag Misra 2017-09-25 15:25:57
Commit 7a49f08c5af48556cc18c98915f468442e0fa3e2 - renamed multiphaseSystem library, updated testCase directory with appropriate dictionaries and simulation parameters
Author: Anurag Misra
Author date (UTC): 2017-09-27 13:33
Committer name: Anurag Misra
Committer date (UTC): 2017-09-27 13:33
Parent(s): 286070162f350e965a9c0fb8a0d8cd17be017f55
Signer:
Signing key:
Signing status: N
Tree: 4bd233a20c0d9734e02875310f5388df19c42147
File Lines added Lines deleted
multiphaseEulerPbeFoam/Allwclean 2 2
multiphaseEulerPbeFoam/Allwmake 3 3
multiphaseEulerPbeFoam/Make/options 2 2
multiphaseEulerPbeFoam/UEqns.H 1 1
multiphaseEulerPbeFoam/createFields.H 2 2
multiphaseEulerPbeFoam/interfacialModels/Make/options 2 2
multiphaseEulerPbeFoam/multiphaseDisperseSystem/Make/files 2 2
multiphaseEulerPbeFoam/multiphaseDisperseSystem/Make/options 0 0
multiphaseEulerPbeFoam/multiphaseDisperseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C 0 0
multiphaseEulerPbeFoam/multiphaseDisperseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H 4 4
multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/QBMMDiameter/QBMMDiameter.C 0 0
multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/QBMMDiameter/QBMMDiameter.H 0 0
multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/constantDiameter/constantDiameter.C 0 0
multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/constantDiameter/constantDiameter.H 0 0
multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/diameterModel/diameterModel.C 0 0
multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/diameterModel/diameterModel.H 0 0
multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/diameterModel/newDiameterModel.C 0 0
multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C 0 0
multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H 0 0
multiphaseEulerPbeFoam/multiphaseDisperseSystem/multiphaseDisperseSystem.C 22 22
multiphaseEulerPbeFoam/multiphaseDisperseSystem/multiphaseDisperseSystem.H 8 8
multiphaseEulerPbeFoam/multiphaseDisperseSystem/phaseModel/phaseModel.C 0 0
multiphaseEulerPbeFoam/multiphaseDisperseSystem/phaseModel/phaseModel.H 0 0
multiphaseEulerPbeFoam/multiphaseEulerPbeFoam.C 1 1
multiphaseEulerPbeFoam/pEqn.H 2 2
testCase/0/alphas 0 36
testCase/0/moment.0.populationBalance.aqueous 1 1
testCase/0/moment.0.populationBalance.bicontinuous 1 1
testCase/0/moment.1.populationBalance.aqueous 0 0
testCase/0/moment.1.populationBalance.bicontinuous 0 0
testCase/0/moment.2.populationBalance.aqueous 0 0
testCase/0/moment.2.populationBalance.bicontinuous 0 0
testCase/0/moment.3.populationBalance.aqueous 0 0
testCase/0/moment.3.populationBalance.bicontinuous 0 0
testCase/0/moment.4.populationBalance.aqueous 0 0
testCase/0/moment.4.populationBalance.bicontinuous 0 0
testCase/constant/populationBalanceProperties.aqueous 10 13
testCase/constant/populationBalanceProperties.bicontinuous 11 14
testCase/constant/populationBalanceProperties.organic 2 3
testCase/constant/quadratureProperties.populationBalance.aqueous 2 2
testCase/constant/quadratureProperties.populationBalance.bicontinuous 36 13
testCase/system/controlDict 3 3
testCase/system/fvSolution 7 7
File multiphaseEulerPbeFoam/Allwclean changed (mode: 100755 -> 100644) (index a75382c..0e766bc)
2 2 cd ${0%/*} || exit 1 # Run from this directory cd ${0%/*} || exit 1 # Run from this directory
3 3 set -x set -x
4 4
5 wclean libso multiphaseSystem
6 wclean libso interfacialModels
5 wclean libso multiphaseDisperseSystem
6 #wclean libso interfacialModels
7 7 wclean wclean
8 8
9 9 # ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file
File multiphaseEulerPbeFoam/Allwmake changed (mode: 100755 -> 100644) (index 84a99b7..6438a19)
2 2 cd ${0%/*} || exit 1 # Run from this directory cd ${0%/*} || exit 1 # Run from this directory
3 3 set -x set -x
4 4
5 wmakeLnInclude interfacialModels
6 wmake libso multiphaseSystem
7 wmake libso interfacialModels
5 #wmakeLnInclude interfacialModels
6 wmake libso multiphaseDisperseSystem
7 #wmake libso interfacialModels
8 8 wmake wmake
9 9
10 10 # ----------------------------------------------------------------- end-of-file # ----------------------------------------------------------------- end-of-file
File multiphaseEulerPbeFoam/Make/options changed (mode: 100644) (index b93c2a2..7115524)
1 1 EXE_INC = \ EXE_INC = \
2 -ImultiphaseSystem/lnInclude \
2 -ImultiphaseDisperseSystem/lnInclude \
3 3 -ImultiphaseFixedFluxPressure \ -ImultiphaseFixedFluxPressure \
4 4 -IinterfacialModels/lnInclude \ -IinterfacialModels/lnInclude \
5 5 -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels \
 
... ... EXE_INC = \
21 21
22 22 EXE_LIBS = \ EXE_LIBS = \
23 23 -L$(FOAM_USER_LIBBIN) \ -L$(FOAM_USER_LIBBIN) \
24 -lmultiphaseSystem \
24 -lmultiphaseDisperseSystem \
25 25 -linterfaceProperties \ -linterfaceProperties \
26 26 -lincompressibleTransportModels \ -lincompressibleTransportModels \
27 27 -lcompressibleMultiphaseEulerianInterfacialModels \ -lcompressibleMultiphaseEulerianInterfacialModels \
File multiphaseEulerPbeFoam/UEqns.H changed (mode: 100644) (index 76f47f8..53c070b)
1 1 #include "MRFCorrectBCs.H" #include "MRFCorrectBCs.H"
2 2
3 3 PtrList<fvVectorMatrix> UEqns(fluid.phases().size()); PtrList<fvVectorMatrix> UEqns(fluid.phases().size());
4 autoPtr<multiphaseSystem::dragCoeffFields> dragCoeffs(fluid.dragCoeffs());
4 autoPtr<multiphaseDisperseSystem::dragCoeffFields> dragCoeffs(fluid.dragCoeffs());
5 5
6 6 int phasei = 0; int phasei = 0;
7 7 forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter) forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
File multiphaseEulerPbeFoam/createFields.H changed (mode: 100644) (index af08934..c306718)
... ... surfaceScalarField phi
40 40 dimensionedScalar("phi", dimArea*dimVelocity, 0) dimensionedScalar("phi", dimArea*dimVelocity, 0)
41 41 ); );
42 42
43 Info<< "Initialising multiphaseSystem\n" << endl;
43 Info<< "Initialising multiphaseDisperseSystem\n" << endl;
44 44
45 multiphaseSystem fluid(U, phi);
45 multiphaseDisperseSystem fluid(U, phi);
46 46
47 47 forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter) forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
48 48 { {
File multiphaseEulerPbeFoam/interfacialModels/Make/options changed (mode: 100644) (index d604780..1ece97b)
1 1 EXE_INC = \ EXE_INC = \
2 2 -I../quadratureMethods/populationBalanceModels/lnInclude \ -I../quadratureMethods/populationBalanceModels/lnInclude \
3 -I../multiphaseSystem/lnInclude \
3 -I../multiphaseDisperseSystem/lnInclude \
4 4 -I$(LIB_SRC)/finiteVolume/lnInclude -I$(LIB_SRC)/finiteVolume/lnInclude
5 5
6 6 LIB_LIBS = \ LIB_LIBS = \
7 -lmultiphaseSystem
7 -lmultiphaseDisperseSystem
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/Make/files renamed from multiphaseEulerPbeFoam/multiphaseSystem/Make/files (similarity 77%) (mode: 100644) (index 01602f9..fac45bb)
... ... diameterModels/constantDiameter/constantDiameter.C
5 5 diameterModels/isothermalDiameter/isothermalDiameter.C diameterModels/isothermalDiameter/isothermalDiameter.C
6 6
7 7 alphaContactAngle/alphaContactAngleFvPatchScalarField.C alphaContactAngle/alphaContactAngleFvPatchScalarField.C
8 multiphaseSystem.C
8 multiphaseDisperseSystem.C
9 9
10 LIB = $(FOAM_USER_LIBBIN)/libmultiphaseSystem
10 LIB = $(FOAM_USER_LIBBIN)/libmultiphaseDisperseSystem
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/Make/options renamed from multiphaseEulerPbeFoam/multiphaseSystem/Make/options (similarity 100%)
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C renamed from multiphaseEulerPbeFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C (similarity 100%)
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H renamed from multiphaseEulerPbeFoam/multiphaseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H (similarity 96%) (mode: 100644) (index 3245fa4..cf0b09c)
... ... Class
26 26
27 27 Description Description
28 28 Contact-angle boundary condition for multi-phase interface-capturing Contact-angle boundary condition for multi-phase interface-capturing
29 simulations. Used in conjuction with multiphaseSystem.
29 simulations. Used in conjuction with multiphaseDisperseSystem.
30 30
31 31 SourceFiles SourceFiles
32 32 alphaContactAngleFvPatchScalarField.C alphaContactAngleFvPatchScalarField.C
 
... ... SourceFiles
37 37 #define alphaContactAngleFvPatchScalarField_H #define alphaContactAngleFvPatchScalarField_H
38 38
39 39 #include "zeroGradientFvPatchFields.H" #include "zeroGradientFvPatchFields.H"
40 #include "multiphaseSystem.H"
40 #include "multiphaseDisperseSystem.H"
41 41
42 42 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
43 43
 
... ... public:
117 117 typedef HashTable typedef HashTable
118 118 < <
119 119 interfaceThetaProps, interfaceThetaProps,
120 multiphaseSystem::interfacePair,
121 multiphaseSystem::interfacePair::symmHash
120 multiphaseDisperseSystem::interfacePair,
121 multiphaseDisperseSystem::interfacePair::symmHash
122 122 > thetaPropsTable; > thetaPropsTable;
123 123
124 124
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/QBMMDiameter/QBMMDiameter.C renamed from multiphaseEulerPbeFoam/multiphaseSystem/diameterModels/QBMMDiameter/QBMMDiameter.C (similarity 100%)
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/QBMMDiameter/QBMMDiameter.H renamed from multiphaseEulerPbeFoam/multiphaseSystem/diameterModels/QBMMDiameter/QBMMDiameter.H (similarity 100%)
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/constantDiameter/constantDiameter.C renamed from multiphaseEulerPbeFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C (similarity 100%)
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/constantDiameter/constantDiameter.H renamed from multiphaseEulerPbeFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.H (similarity 100%)
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/diameterModel/diameterModel.C renamed from multiphaseEulerPbeFoam/multiphaseSystem/diameterModels/diameterModel/diameterModel.C (similarity 100%)
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/diameterModel/diameterModel.H renamed from multiphaseEulerPbeFoam/multiphaseSystem/diameterModels/diameterModel/diameterModel.H (similarity 100%)
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/diameterModel/newDiameterModel.C renamed from multiphaseEulerPbeFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C (similarity 100%)
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C renamed from multiphaseEulerPbeFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C (similarity 100%)
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H renamed from multiphaseEulerPbeFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H (similarity 100%)
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/multiphaseDisperseSystem.C renamed from multiphaseEulerPbeFoam/multiphaseSystem/multiphaseSystem.C (similarity 94%) (mode: 100644) (index 25132a2..45e3dbf)
... ... License
23 23
24 24 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
25 25
26 #include "multiphaseSystem.H"
26 #include "multiphaseDisperseSystem.H"
27 27 #include "alphaContactAngleFvPatchScalarField.H" #include "alphaContactAngleFvPatchScalarField.H"
28 28 #include "fixedValueFvsPatchFields.H" #include "fixedValueFvsPatchFields.H"
29 29 #include "Time.H" #include "Time.H"
 
... ... License
38 38
39 39 // * * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * //
40 40
41 const Foam::scalar Foam::multiphaseSystem::convertToRad =
41 const Foam::scalar Foam::multiphaseDisperseSystem::convertToRad =
42 42 Foam::constant::mathematical::pi/180.0; Foam::constant::mathematical::pi/180.0;
43 43
44 44
45 45 // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
46 46
47 void Foam::multiphaseSystem::calcAlphas()
47 void Foam::multiphaseDisperseSystem::calcAlphas()
48 48 { {
49 49 scalar level = 0.0; scalar level = 0.0;
50 50 alphas_ == 0.0; alphas_ == 0.0;
 
... ... void Foam::multiphaseSystem::calcAlphas()
57 57 } }
58 58
59 59
60 void Foam::multiphaseSystem::solveAlphas()
60 void Foam::multiphaseDisperseSystem::solveAlphas()
61 61 { {
62 62 PtrList<surfaceScalarField> alphaPhiCorrs(phases_.size()); PtrList<surfaceScalarField> alphaPhiCorrs(phases_.size());
63 63 int phasei = 0; int phasei = 0;
 
... ... void Foam::multiphaseSystem::solveAlphas()
219 219 } }
220 220
221 221
222 Foam::tmp<Foam::surfaceVectorField> Foam::multiphaseSystem::nHatfv
222 Foam::tmp<Foam::surfaceVectorField> Foam::multiphaseDisperseSystem::nHatfv
223 223 ( (
224 224 const volScalarField& alpha1, const volScalarField& alpha1,
225 225 const volScalarField& alpha2 const volScalarField& alpha2
 
... ... Foam::tmp<Foam::surfaceVectorField> Foam::multiphaseSystem::nHatfv
245 245 } }
246 246
247 247
248 Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::nHatf
248 Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseDisperseSystem::nHatf
249 249 ( (
250 250 const volScalarField& alpha1, const volScalarField& alpha1,
251 251 const volScalarField& alpha2 const volScalarField& alpha2
 
... ... Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::nHatf
262 262 // The dynamic contact angle is calculated from the component of the // The dynamic contact angle is calculated from the component of the
263 263 // velocity on the direction of the interface, parallel to the wall. // velocity on the direction of the interface, parallel to the wall.
264 264
265 void Foam::multiphaseSystem::correctContactAngle
265 void Foam::multiphaseDisperseSystem::correctContactAngle
266 266 ( (
267 267 const phaseModel& phase1, const phaseModel& phase1,
268 268 const phaseModel& phase2, const phaseModel& phase2,
 
... ... void Foam::multiphaseSystem::correctContactAngle
366 366 } }
367 367
368 368
369 Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::K
369 Foam::tmp<Foam::volScalarField> Foam::multiphaseDisperseSystem::K
370 370 ( (
371 371 const phaseModel& phase1, const phaseModel& phase1,
372 372 const phaseModel& phase2 const phaseModel& phase2
 
... ... Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::K
383 383
384 384 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
385 385
386 Foam::multiphaseSystem::multiphaseSystem
386 Foam::multiphaseDisperseSystem::multiphaseDisperseSystem
387 387 ( (
388 388 const volVectorField& U, const volVectorField& U,
389 389 const surfaceScalarField& phi const surfaceScalarField& phi
 
... ... Foam::multiphaseSystem::multiphaseSystem
490 490
491 491 // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
492 492
493 Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::rho() const
493 Foam::tmp<Foam::volScalarField> Foam::multiphaseDisperseSystem::rho() const
494 494 { {
495 495 PtrDictionary<phaseModel>::const_iterator iter = phases_.begin(); PtrDictionary<phaseModel>::const_iterator iter = phases_.begin();
496 496
 
... ... Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::rho() const
507 507
508 508
509 509 Foam::tmp<Foam::scalarField> Foam::tmp<Foam::scalarField>
510 Foam::multiphaseSystem::rho(const label patchi) const
510 Foam::multiphaseDisperseSystem::rho(const label patchi) const
511 511 { {
512 512 PtrDictionary<phaseModel>::const_iterator iter = phases_.begin(); PtrDictionary<phaseModel>::const_iterator iter = phases_.begin();
513 513
 
... ... Foam::multiphaseSystem::rho(const label patchi) const
523 523 } }
524 524
525 525
526 Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::nu() const
526 Foam::tmp<Foam::volScalarField> Foam::multiphaseDisperseSystem::nu() const
527 527 { {
528 528 PtrDictionary<phaseModel>::const_iterator iter = phases_.begin(); PtrDictionary<phaseModel>::const_iterator iter = phases_.begin();
529 529
 
... ... Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::nu() const
540 540
541 541
542 542 Foam::tmp<Foam::scalarField> Foam::tmp<Foam::scalarField>
543 Foam::multiphaseSystem::nu(const label patchi) const
543 Foam::multiphaseDisperseSystem::nu(const label patchi) const
544 544 { {
545 545 PtrDictionary<phaseModel>::const_iterator iter = phases_.begin(); PtrDictionary<phaseModel>::const_iterator iter = phases_.begin();
546 546
 
... ... Foam::multiphaseSystem::nu(const label patchi) const
560 560 } }
561 561
562 562
563 Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::Cvm
563 Foam::tmp<Foam::volScalarField> Foam::multiphaseDisperseSystem::Cvm
564 564 ( (
565 565 const phaseModel& phase const phaseModel& phase
566 566 ) const ) const
 
... ... Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::Cvm
616 616 } }
617 617
618 618
619 Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
619 Foam::tmp<Foam::volVectorField> Foam::multiphaseDisperseSystem::Svm
620 620 ( (
621 621 const phaseModel& phase const phaseModel& phase
622 622 ) const ) const
 
... ... Foam::tmp<Foam::volVectorField> Foam::multiphaseSystem::Svm
690 690 } }
691 691
692 692
693 Foam::autoPtr<Foam::multiphaseSystem::dragCoeffFields>
694 Foam::multiphaseSystem::dragCoeffs() const
693 Foam::autoPtr<Foam::multiphaseDisperseSystem::dragCoeffFields>
694 Foam::multiphaseDisperseSystem::dragCoeffs() const
695 695 { {
696 696 autoPtr<dragCoeffFields> dragCoeffsPtr(new dragCoeffFields); autoPtr<dragCoeffFields> dragCoeffsPtr(new dragCoeffFields);
697 697
 
... ... Foam::multiphaseSystem::dragCoeffs() const
742 742 } }
743 743
744 744
745 Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::dragCoeff
745 Foam::tmp<Foam::volScalarField> Foam::multiphaseDisperseSystem::dragCoeff
746 746 ( (
747 747 const phaseModel& phase, const phaseModel& phase,
748 748 const dragCoeffFields& dragCoeffs const dragCoeffFields& dragCoeffs
 
... ... Foam::tmp<Foam::volScalarField> Foam::multiphaseSystem::dragCoeff
791 791 } }
792 792
793 793
794 Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::surfaceTension
794 Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseDisperseSystem::surfaceTension
795 795 ( (
796 796 const phaseModel& phase1 const phaseModel& phase1
797 797 ) const ) const
 
... ... Foam::tmp<Foam::surfaceScalarField> Foam::multiphaseSystem::surfaceTension
845 845
846 846
847 847 Foam::tmp<Foam::volScalarField> Foam::tmp<Foam::volScalarField>
848 Foam::multiphaseSystem::nearInterface() const
848 Foam::multiphaseDisperseSystem::nearInterface() const
849 849 { {
850 850 tmp<volScalarField> tnearInt tmp<volScalarField> tnearInt
851 851 ( (
 
... ... Foam::multiphaseSystem::nearInterface() const
871 871 } }
872 872
873 873
874 void Foam::multiphaseSystem::solve()
874 void Foam::multiphaseDisperseSystem::solve()
875 875 { {
876 876
877 877 forAllIter(PtrDictionary<phaseModel>, phases_, iter) forAllIter(PtrDictionary<phaseModel>, phases_, iter)
 
... ... void Foam::multiphaseSystem::solve()
974 974 } }
975 975
976 976
977 bool Foam::multiphaseSystem::read()
977 bool Foam::multiphaseDisperseSystem::read()
978 978 { {
979 979 if (regIOobject::read()) if (regIOobject::read())
980 980 { {
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/multiphaseDisperseSystem.H renamed from multiphaseEulerPbeFoam/multiphaseSystem/multiphaseSystem.H (similarity 96%) (mode: 100644) (index 02b5668..b0454ed)
... ... License
22 22 along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
23 23
24 24 Class Class
25 Foam::multiphaseSystem
25 Foam::multiphaseDisperseSystem
26 26
27 27 Description Description
28 28 Incompressible multi-phase mixture with built in solution for the Incompressible multi-phase mixture with built in solution for the
 
... ... Description
35 35 between each phase-pair. between each phase-pair.
36 36
37 37 SourceFiles SourceFiles
38 multiphaseSystem.C
38 multiphaseDisperseSystem.C
39 39
40 40 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
41 41
42 #ifndef multiphaseSystem_H
43 #define multiphaseSystem_H
42 #ifndef multiphaseDisperseSystem_H
43 #define multiphaseDisperseSystem_H
44 44
45 45 #include "incompressible/transportModel/transportModel.H" #include "incompressible/transportModel/transportModel.H"
46 46 #include "IOdictionary.H" #include "IOdictionary.H"
 
... ... namespace Foam
57 57 { {
58 58
59 59 /*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
60 Class multiphaseSystem Declaration
60 Class multiphaseDisperseSystem Declaration
61 61 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
62 62
63 class multiphaseSystem
63 class multiphaseDisperseSystem
64 64 : :
65 65 public IOdictionary, public IOdictionary,
66 66 public transportModel public transportModel
 
... ... public:
228 228 // Constructors // Constructors
229 229
230 230 //- Construct from components //- Construct from components
231 multiphaseSystem
231 multiphaseDisperseSystem
232 232 ( (
233 233 const volVectorField& U, const volVectorField& U,
234 234 const surfaceScalarField& phi const surfaceScalarField& phi
 
... ... public:
236 236
237 237
238 238 //- Destructor //- Destructor
239 virtual ~multiphaseSystem()
239 virtual ~multiphaseDisperseSystem()
240 240 {} {}
241 241
242 242
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/phaseModel/phaseModel.C renamed from multiphaseEulerPbeFoam/multiphaseSystem/phaseModel/phaseModel.C (similarity 100%)
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/phaseModel/phaseModel.H renamed from multiphaseEulerPbeFoam/multiphaseSystem/phaseModel/phaseModel.H (similarity 100%)
File multiphaseEulerPbeFoam/multiphaseEulerPbeFoam.C changed (mode: 100644) (index d0c0af0..8b546e7)
... ... Description
31 31 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
32 32
33 33 #include "fvCFD.H" #include "fvCFD.H"
34 #include "multiphaseSystem.H"
34 #include "multiphaseDisperseSystem.H"
35 35 #include "phaseModel.H" #include "phaseModel.H"
36 36 #include "dragModel.H" #include "dragModel.H"
37 37 #include "heatTransferModel.H" #include "heatTransferModel.H"
File multiphaseEulerPbeFoam/pEqn.H changed (mode: 100644) (index af4905a..bebce4b)
112 112 - ghSnGradRho - ghSnGradRho
113 113 )/phase.rho(); )/phase.rho();
114 114
115 multiphaseSystem::dragModelTable::const_iterator dmIter =
115 multiphaseDisperseSystem::dragModelTable::const_iterator dmIter =
116 116 fluid.dragModels().begin(); fluid.dragModels().begin();
117 multiphaseSystem::dragCoeffFields::const_iterator dcIter =
117 multiphaseDisperseSystem::dragCoeffFields::const_iterator dcIter =
118 118 dragCoeffs().begin(); dragCoeffs().begin();
119 119 for for
120 120 ( (
File testCase/0/alphas deleted (index 9781b45..0000000)
1 /*--------------------------------*- C++ -*----------------------------------*\
2 | ========= | |
3 | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
4 | \\ / O peration | Version: 4.1 |
5 | \\ / A nd | Web: www.OpenFOAM.org |
6 | \\/ M anipulation | |
7 \*---------------------------------------------------------------------------*/
8 FoamFile
9 {
10 version 2.0;
11 format ascii;
12 class volScalarField;
13 location "0";
14 object alphas;
15 }
16 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
17
18 dimensions [0 0 0 0 0 0 0];
19
20 internalField uniform 0.5725;
21
22 boundaryField
23 {
24 walls
25 {
26 type calculated;
27 value uniform 0.5725;
28 }
29 frontAndBackPlanes
30 {
31 type empty;
32 }
33 }
34
35
36 // ************************************************************************* //
File testCase/0/moment.0.populationBalance.aqueous copied from file testCase/0/moment.0.populationBalance (similarity 94%) (mode: 100644) (index 9b543bb..167218b)
1 1 /*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
2 2 | ========= | | | ========= | |
3 3 | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
4 | \\ / O peration | Version: dev |
4 | \\ / O peration | Version: 4.1 |
5 5 | \\ / A nd | Web: www.OpenFOAM.org | | \\ / A nd | Web: www.OpenFOAM.org |
6 6 | \\/ M anipulation | | | \\/ M anipulation | |
7 7 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
File testCase/0/moment.0.populationBalance.bicontinuous renamed from testCase/0/moment.0.populationBalance (similarity 94%) (mode: 100644) (index 9b543bb..167218b)
1 1 /*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
2 2 | ========= | | | ========= | |
3 3 | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
4 | \\ / O peration | Version: dev |
4 | \\ / O peration | Version: 4.1 |
5 5 | \\ / A nd | Web: www.OpenFOAM.org | | \\ / A nd | Web: www.OpenFOAM.org |
6 6 | \\/ M anipulation | | | \\/ M anipulation | |
7 7 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
File testCase/0/moment.1.populationBalance.aqueous copied from file testCase/0/moment.1.populationBalance (similarity 100%)
File testCase/0/moment.1.populationBalance.bicontinuous renamed from testCase/0/moment.1.populationBalance (similarity 100%)
File testCase/0/moment.2.populationBalance.aqueous copied from file testCase/0/moment.2.populationBalance (similarity 100%)
File testCase/0/moment.2.populationBalance.bicontinuous renamed from testCase/0/moment.2.populationBalance (similarity 100%)
File testCase/0/moment.3.populationBalance.aqueous copied from file testCase/0/moment.3.populationBalance (similarity 100%)
File testCase/0/moment.3.populationBalance.bicontinuous renamed from testCase/0/moment.3.populationBalance (similarity 100%)
File testCase/0/moment.4.populationBalance.aqueous copied from file testCase/0/moment.4.populationBalance (similarity 100%)
File testCase/0/moment.4.populationBalance.bicontinuous renamed from testCase/0/moment.4.populationBalance (similarity 100%)
File testCase/constant/populationBalanceProperties.aqueous copied from file testCase/constant/populationBalanceProperties (similarity 74%) (mode: 100644) (index 773c79b..79d9048)
1 1 /*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
2 2 | ========= | | | ========= | |
3 3 | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
4 | \\ / O peration | Version: dev |
4 | \\ / O peration | Version: 4.1 |
5 5 | \\ / A nd | Web: www.OpenFOAM.org | | \\ / A nd | Web: www.OpenFOAM.org |
6 6 | \\/ M anipulation | | | \\/ M anipulation | |
7 7 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
 
... ... FoamFile
11 11 format ascii; format ascii;
12 12 class dictionary; class dictionary;
13 13 location "constant"; location "constant";
14 object populationaBalanceProperties;
14 object populationaBalanceProperties.aqueous;
15 15 } }
16 16 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
17 17
 
... ... univariateCoeffs
37 37 breakupKernel constant; breakupKernel constant;
38 38
39 39 Cb Cb [ 0 0 0 0 0 0 0 ] 0.0; Cb Cb [ 0 0 0 0 0 0 0 ] 0.0;
40 epsilonExp 0; //0.75
41 nuExp 0; //-1.25
42 sizeExp 0; //1.0
40 //epsilonExp 0.75;
41 //nuExp -1.25;
42 //sizeExp 1.0;
43 43 } }
44 44
45 45 daughterDistribution daughterDistribution
46 46 { {
47 daughterDistribution symmetricFragmentation;
47 daughterDistribution uniform; //symmetricFragmentation;
48 48 } }
49 49
50 50 diffusionModel diffusionModel
51 51 { {
52 52 diffusionModel none; //turbulentDiffusion; diffusionModel none; //turbulentDiffusion;
53 gammaLam gammaLam [ 0 2 -1 0 0 0 0 ] 0; //0.0001
54 Sc 0.7;
53 //gammaLam gammaLam [ 0 2 -1 0 0 0 0 ] 0.0001;
54 //Sc 0.7;
55 55 } }
56 56
57 57 growth off; growth off;
 
... ... univariateCoeffs
60 60 { {
61 61 growthModel constant; growthModel constant;
62 62 minAbscissa minAbscissa [0 -2 0 0 0 0 0] 0.0; minAbscissa minAbscissa [0 -2 0 0 0 0 0] 0.0;
63 maxAbscissa maxAbscissa [0 -2 0 0 0 0 0] 1.0;
63 maxAbscissa maxAbscissa [0 -2 0 0 0 0 0] 0.0;
64 64
65 Cg Cg [0 3 -1 0 0 0 0 ] 1.0;
65 //Cg Cg [0 3 -1 0 0 0 0 ] 1.0;
66 66 } }
67 67
68 68 nucleationModel nucleationModel
 
... ... univariateCoeffs
72 72 } }
73 73
74 74
75
76
77
78 75 // ************************************************************************* // // ************************************************************************* //
File testCase/constant/populationBalanceProperties.bicontinuous renamed from testCase/constant/populationBalanceProperties (similarity 71%) (mode: 100644) (index 773c79b..1d4ac13)
1 1 /*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
2 2 | ========= | | | ========= | |
3 3 | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
4 | \\ / O peration | Version: dev |
4 | \\ / O peration | Version: 4.1 |
5 5 | \\ / A nd | Web: www.OpenFOAM.org | | \\ / A nd | Web: www.OpenFOAM.org |
6 6 | \\/ M anipulation | | | \\/ M anipulation | |
7 7 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
 
... ... FoamFile
11 11 format ascii; format ascii;
12 12 class dictionary; class dictionary;
13 13 location "constant"; location "constant";
14 object populationaBalanceProperties;
14 object populationaBalanceProperties.bicontinuous;
15 15 } }
16 16 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
17 17
 
... ... univariateCoeffs
27 27 { {
28 28 aggregationKernel constant; aggregationKernel constant;
29 29
30 Ca Ca [ 0 0 -1 0 0 0 0 ] 5.0e-18;
30 Ca Ca [ 0 0 -1 0 0 0 0 ] 1.0e-17;
31 31 } }
32 32
33 33 breakup off; breakup off;
 
... ... univariateCoeffs
37 37 breakupKernel constant; breakupKernel constant;
38 38
39 39 Cb Cb [ 0 0 0 0 0 0 0 ] 0.0; Cb Cb [ 0 0 0 0 0 0 0 ] 0.0;
40 epsilonExp 0; //0.75
41 nuExp 0; //-1.25
42 sizeExp 0; //1.0
40 //epsilonExp 0.75;
41 //nuExp -1.25;
42 //sizeExp 1.0;
43 43 } }
44 44
45 45 daughterDistribution daughterDistribution
46 46 { {
47 daughterDistribution symmetricFragmentation;
47 daughterDistribution uniform; //symmetricFragmentation;
48 48 } }
49 49
50 50 diffusionModel diffusionModel
51 51 { {
52 52 diffusionModel none; //turbulentDiffusion; diffusionModel none; //turbulentDiffusion;
53 gammaLam gammaLam [ 0 2 -1 0 0 0 0 ] 0; //0.0001
54 Sc 0.7;
53 //gammaLam gammaLam [ 0 2 -1 0 0 0 0 ] 0.0001;
54 //Sc 0.7;
55 55 } }
56 56
57 57 growth off; growth off;
 
... ... univariateCoeffs
60 60 { {
61 61 growthModel constant; growthModel constant;
62 62 minAbscissa minAbscissa [0 -2 0 0 0 0 0] 0.0; minAbscissa minAbscissa [0 -2 0 0 0 0 0] 0.0;
63 maxAbscissa maxAbscissa [0 -2 0 0 0 0 0] 1.0;
63 maxAbscissa maxAbscissa [0 -2 0 0 0 0 0] 0.0;
64 64
65 Cg Cg [0 3 -1 0 0 0 0 ] 1.0;
65 //Cg Cg [0 3 -1 0 0 0 0 ] 1.0;
66 66 } }
67 67
68 68 nucleationModel nucleationModel
 
... ... univariateCoeffs
72 72 } }
73 73
74 74
75
76
77
78 75 // ************************************************************************* // // ************************************************************************* //
File testCase/constant/populationBalanceProperties.organic copied from file testCase/constant/turbulenceProperties (similarity 91%) (mode: 100644) (index b309e9b..534ac31)
... ... FoamFile
11 11 format ascii; format ascii;
12 12 class dictionary; class dictionary;
13 13 location "constant"; location "constant";
14 object turbulenceProperties;
14 object populationaBalanceProperties.organic;
15 15 } }
16 16 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
17 17
18 simulationType laminar;
19
18 Switch_SolveQuadrature off;
20 19
21 20 // ************************************************************************* // // ************************************************************************* //
File testCase/constant/quadratureProperties.populationBalance.aqueous renamed from testCase/constant/quadratureProperties.populationBalance (similarity 92%) (mode: 100644) (index 4654618..a9ef14d)
1 1 /*--------------------------------*- C++ -*----------------------------------*\ /*--------------------------------*- C++ -*----------------------------------*\
2 2 | ========= | | | ========= | |
3 3 | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
4 | \\ / O peration | Version: dev |
4 | \\ / O peration | Version: 4.1 |
5 5 | \\ / A nd | Web: www.OpenFOAM.org | | \\ / A nd | Web: www.OpenFOAM.org |
6 6 | \\/ M anipulation | | | \\/ M anipulation | |
7 7 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
 
... ... FoamFile
11 11 format ascii; format ascii;
12 12 class dictionary; class dictionary;
13 13 location "constant"; location "constant";
14 object quadratureProperties;
14 object quadratureProperties.aqueous;
15 15 } }
16 16 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
17 17
File testCase/constant/quadratureProperties.populationBalance.bicontinuous renamed from testCase/system/setFieldsDict (similarity 58%) (mode: 100644) (index 5925e48..0accce6)
... ... FoamFile
10 10 version 2.0; version 2.0;
11 11 format ascii; format ascii;
12 12 class dictionary; class dictionary;
13 location "system";
14 object setFieldsDict;
13 location "constant";
14 object quadratureProperties.bicontinuous;
15 15 } }
16 16 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
17 17
18 defaultFieldValues
18 fieldMomentInversion basicFieldMomentInversion;
19
20 basicMomentInversion
21 {
22 univariateMomentInversion Gauss;
23 }
24
25 moments
19 26 ( (
20 volScalarFieldValue alpha.organic 1
21 volScalarFieldValue alpha.aqueous 0
27 (0)
28 (1)
29 (2)
30 // (3)
31 // (4)
22 32 ); );
23 33
24 regions
34 nodes
25 35 ( (
26 boxToCell
36 node0
27 37 { {
28 box (0 0 -0.1) (0.15 0.701 0.1);
29 fieldValues
30 (
31 volScalarFieldValue alpha.organic 0
32 volScalarFieldValue alpha.aqueous 1
33 );
38 nSecondaryNodes 10;
34 39 } }
40 // node1
41 // {
42 // nSecondaryNodes 10;
43 // }
35 44 ); );
36 45
46 extendedMomentInversionCoeff
47 {
48 extendedMomentInversion lognormal;
37 49
50 maxSigmaIter 1000;
51 momentsTol 1.0e-6;
52 sigmaTol 1.0e-8;
53 targetFunctionTol 1.0e-8;
54 }
55
56 residuals
57 {
58 minM0 1;
59 minM1 1e-6;
60 }
38 61 // ************************************************************************* // // ************************************************************************* //
File testCase/system/controlDict changed (mode: 100644) (index 1a19636..a6b82aa)
... ... FoamFile
15 15 } }
16 16 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
17 17
18 application multiphaseEulerFoam;
18 application multiphaseEulerPbeFoam;
19 19
20 20 startFrom startTime; startFrom startTime;
21 21
 
... ... deltaT 1e-4;
29 29
30 30 writeControl runTime; writeControl runTime;
31 31
32 writeInterval 0.1;
32 writeInterval 5e-2;
33 33
34 34 purgeWrite 0; purgeWrite 0;
35 35
 
... ... adjustTimeStep no;
49 49
50 50 maxCo 0.1; maxCo 0.1;
51 51
52 maxDeltaT 0.001;
52 maxDeltaT 1e-3;
53 53
54 54 functions functions
55 55 { {
File testCase/system/fvSolution changed (mode: 100644) (index 89e1f11..6d90692)
... ... solvers
43 43 nCellsInCoarsestLevel 10; nCellsInCoarsestLevel 10;
44 44 agglomerator faceAreaPair; agglomerator faceAreaPair;
45 45 mergeLevels 2; mergeLevels 2;
46 tolerance 1e-10;
46 tolerance 1e-06;
47 47 maxIter 1000; maxIter 1000;
48 48 } }
49 49
50 50 p_rghFinal p_rghFinal
51 51 { {
52 52 $p_rgh; $p_rgh;
53 tolerance 1e-9;
53 tolerance 1e-06;
54 54 relTol 0; relTol 0;
55 55 } }
56 56
57 57 pcorr pcorr
58 58 { {
59 59 $p_rgh; $p_rgh;
60 tolerance 1e-5;
60 tolerance 1e-05;
61 61 relTol 0; relTol 0;
62 62 } }
63 63
 
... ... solvers
74 74 { {
75 75 solver smoothSolver; solver smoothSolver;
76 76 smoother symGaussSeidel; smoother symGaussSeidel;
77 tolerance 1e-8;
77 tolerance 1e-08;
78 78 relTol 0; relTol 0;
79 79 } }
80 80
 
... ... solvers
106 106 { {
107 107 solver PCG; solver PCG;
108 108 preconditioner DIC; preconditioner DIC;
109 tolerance 1.0e-8;
109 tolerance 1.0e-08;
110 110 relTol 0; relTol 0;
111 111 } }
112 112 } }
113 113
114 114 PIMPLE PIMPLE
115 115 { {
116 nOuterCorrectors 15;
116 nOuterCorrectors 3;
117 117 nCorrectors 2; nCorrectors 2;
118 nNonOrthogonalCorrectors 0;
118 nNonOrthogonalCorrectors 1;
119 119 pRefCell 0; pRefCell 0;
120 120 pRefValue 1e5; pRefValue 1e5;
121 121
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/velagala/MultiPhaseQBMM

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/velagala/MultiPhaseQBMM

Clone this repository using git:
git clone git://git.rocketgit.com/user/velagala/MultiPhaseQBMM

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main