velagala / MultiPhaseQBMM (public) (License: Unspecified) (since 2020-07-08) (hash sha1)
QBMM solver for Coalescence
Clone URLs: https://rocketgit.com/user/velagala/MultiPhaseQBMM ssh://rocketgit@ssh.rocketgit.com/user/velagala/MultiPhaseQBMM git://git.rocketgit.com/user/velagala/MultiPhaseQBMM
master
List of commits:
Subject Hash Author Date (UTC)
included latest QBMM updates, renamed diameterModel and alphaContactAngle entries to avoid conflict with OpenFOAM defaults d3d8fbc70cd9754d8552ae9adf930a5723e94d1c Anurag Misra 2018-02-12 17:24:17
updated test case 845e8a7326d6e5132cc6903390233b60f44a6616 Anurag Misra 2018-01-31 16:17:55
suppressed debug message, modified case for test run beecf9d98ab64fc5d5eb00e8f061a02370c9e814 Anurag Misra 2018-01-31 16:06:31
Added coalescence kernel to solver, switched on coalescence in case dictionary, cleaned up case batchSettlerFine 33502e69ba649befc30d1206f00f53ab3ae53b6d Anurag Misra 2018-01-31 14:44:39
Suppressed coalescence due to conflict, switched on dummy aggregation model in test case to test code stability e38a0560ffb1c6e68d7dc410f03a152689477078 Anurag Misra 2018-01-30 09:13:31
first commit to update code to OpenFOAM50, no coalescence kernels included 9d70a283abb4e26983a8d9711d76d22c251fbd4c Anurag Misra 2018-01-23 10:50:12
fixed alpha BC at outlet, included new case for horizontalSettler with only 2 outlets c3ac36e6699dc3d9c5b12ec02160e855d500cfa1 Anurag Misra 2017-12-13 11:57:01
added residualAlpha to phaseModel, updated case dictionaries 6f0d0800829af8e706bb67ef7bb9ef344fab1cd0 Anurag Misra 2017-12-12 00:53:41
undo previous addition, add smallnumber to rAUs for stability e5eb3353a23efd00d36c379bac1f882e74a10643 Anurag Misra 2017-12-11 23:57:15
modified pEqn.H to limit alpha to 1e-6 07f66051823747fc6acbf519d757b864f3306433 Anurag Misra 2017-12-11 23:25:12
fixed missing dictionary entries in case horizontalSettler2D 47531fc01ecde45587480e12c454d968d65aa5c6 Anurag Misra 2017-12-06 15:48:40
changed boundary conditions and mesh in case horizontalSettler2D 091228be5c25fb6c2d0f08cc5e2cdaafef28ad89 Anurag Misra 2017-12-06 15:31:09
added fvOptions compatibility in solver ddcc6c4dfc93450a9320d59855dd1955eabb30d0 Anurag Misra 2017-12-06 11:43:33
minor changes to case files, added ifPorous field 55f5d687cb91a4a62c5a90a0cf33cd24a1ba5d42 Anurag Misra 2017-12-05 22:51:09
bounded diameter calculation in coalescence kernel, minor modifications to units 1c525f2807a8f960edd33c2cbd140870278952da Anurag Misra 2017-12-05 22:44:30
fixed error in buoyancykernel 521f349b030e88ca204637cdda9995dae4802618 Anurag Misra 2017-12-05 22:24:28
Deleted extraneous case files cecb4eca8cb2d933acaad226831230f3517c5132 Anurag.Misra 2017-12-05 13:10:40
fixed batchSettler case with real values 5e3967ef13cd8b570522b7d1cbc59ca01f76ec16 Anurag.Misra 2017-12-05 13:05:30
fixed horizontalSettler2D mesh d79c28081dd5b2cc6f77c9c003c26941d3a27ea6 Anurag Misra 2017-12-05 12:59:28
fixed buoyancy kernel definition 63b8743b0bb1d1316ec16e85382cd49ca0431356 Anurag Misra 2017-12-05 12:53:37
Commit d3d8fbc70cd9754d8552ae9adf930a5723e94d1c - included latest QBMM updates, renamed diameterModel and alphaContactAngle entries to avoid conflict with OpenFOAM defaults
Author: Anurag Misra
Author date (UTC): 2018-02-12 17:24
Committer name: Anurag Misra
Committer date (UTC): 2018-02-12 17:24
Parent(s): 845e8a7326d6e5132cc6903390233b60f44a6616
Signer:
Signing key:
Signing status: N
Tree: 2551a368589ee97d8f3ebc25ffed76272485e91c
File Lines added Lines deleted
multiphaseEulerPbeFoam/multiphaseDisperseSystem/Make/files 2 2
multiphaseEulerPbeFoam/multiphaseDisperseSystem/Make/options 1 1
multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/constantDiameter/constantDiameter.C 5 5
multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/constantDiameter/constantDiameter.H 9 9
multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C 5 5
multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H 9 9
multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/sauterMean/sauterMeanDiameter.C 12 12
multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/sauterMean/sauterMeanDiameter.H 11 11
multiphaseEulerPbeFoam/multiphaseDisperseSystem/disperseAlphaContactAngle/disperseAlphaContactAngleFvPatchScalarField.C 12 12
multiphaseEulerPbeFoam/multiphaseDisperseSystem/disperseAlphaContactAngle/disperseAlphaContactAngleFvPatchScalarField.H 16 16
multiphaseEulerPbeFoam/multiphaseDisperseSystem/multiphaseDisperseSystem.C 5 5
multiphaseEulerPbeFoam/quadratureMethods/PDFTransportModels/univariatePDFTransportModel/univariatePDFTransportModel.H 1 1
multiphaseEulerPbeFoam/quadratureMethods/momentAdvection/zeta/zeta.C 2 2
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/Make/files changed (mode: 100644) (index 2049f95..467fd70)
... ... diameterModels/diameterModel/diameterModel.C
3 3 diameterModels/diameterModel/newDiameterModel.C diameterModels/diameterModel/newDiameterModel.C
4 4 diameterModels/constantDiameter/constantDiameter.C diameterModels/constantDiameter/constantDiameter.C
5 5 diameterModels/isothermalDiameter/isothermalDiameter.C diameterModels/isothermalDiameter/isothermalDiameter.C
6 diameterModels/QBMM/QBMMDiameter.C
6 diameterModels/sauterMean/sauterMeanDiameter.C
7 7
8 alphaContactAngle/alphaContactAngleFvPatchScalarField.C
8 disperseAlphaContactAngle/disperseAlphaContactAngleFvPatchScalarField.C
9 9 multiphaseDisperseSystem.C multiphaseDisperseSystem.C
10 10
11 11 LIB = $(FOAM_USER_LIBBIN)/libmultiphaseDisperseSystem LIB = $(FOAM_USER_LIBBIN)/libmultiphaseDisperseSystem
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/Make/options changed (mode: 100644) (index 781622b..6bde33e)
... ... EXE_INC = \
2 2 -I../quadratureMethods/populationBalanceModels/lnInclude \ -I../quadratureMethods/populationBalanceModels/lnInclude \
3 3 -I../phaseModel/lnInclude \ -I../phaseModel/lnInclude \
4 4 -I../interfacialModels/lnInclude \ -I../interfacialModels/lnInclude \
5 -IalphaContactAngle \
5 -IdisperseAlphaContactAngle \
6 6 -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels \
7 7 -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
8 8 -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/constantDiameter/constantDiameter.C changed (mode: 100644) (index 88b867f..3b26c43)
... ... namespace Foam
32 32 { {
33 33 namespace diameterModels namespace diameterModels
34 34 { {
35 defineTypeNameAndDebug(constant, 0);
35 defineTypeNameAndDebug(constantQBMM, 0);
36 36
37 37 addToRunTimeSelectionTable addToRunTimeSelectionTable
38 38 ( (
39 39 diameterModel, diameterModel,
40 constant,
40 constantQBMM,
41 41 dictionary dictionary
42 42 ); );
43 43 } }
 
... ... namespace diameterModels
46 46
47 47 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
48 48
49 Foam::diameterModels::constant::constant
49 Foam::diameterModels::constantQBMM::constantQBMM
50 50 ( (
51 51 const dictionary& dict, const dictionary& dict,
52 52 const phaseModel& phase const phaseModel& phase
 
... ... Foam::diameterModels::constant::constant
59 59
60 60 // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
61 61
62 Foam::diameterModels::constant::~constant()
62 Foam::diameterModels::constantQBMM::~constantQBMM()
63 63 {} {}
64 64
65 65
66 66 // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
67 67
68 Foam::tmp<Foam::volScalarField> Foam::diameterModels::constant::d() const
68 Foam::tmp<Foam::volScalarField> Foam::diameterModels::constantQBMM::d() const
69 69 { {
70 70 return tmp<Foam::volScalarField> return tmp<Foam::volScalarField>
71 71 ( (
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/constantDiameter/constantDiameter.H changed (mode: 100644) (index 4a63c2b..44b2a5b)
... ... 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::constant
25 Foam::constantQBMM
26 26
27 27 Description Description
28 28 Constant dispersed-phase particle diameter model. Constant dispersed-phase particle diameter model.
29 29
30 30 SourceFiles SourceFiles
31 constant.C
31 constantDiameter.C
32 32
33 33 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
34 34
35 #ifndef constant_H
36 #define constant_H
35 #ifndef constantQBMM_H
36 #define constantQBMM_H
37 37
38 38 #include "diameterModel.H" #include "diameterModel.H"
39 39
 
... ... namespace diameterModels
45 45 { {
46 46
47 47 /*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
48 Class constant Declaration
48 Class constantQBMM Declaration
49 49 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
50 50
51 class constant
51 class constantQBMM
52 52 : :
53 53 public diameterModel public diameterModel
54 54 { {
 
... ... class constant
61 61 public: public:
62 62
63 63 //- Runtime type information //- Runtime type information
64 TypeName("constant");
64 TypeName("constantQBMM");
65 65
66 66
67 67 // Constructors // Constructors
68 68
69 69 //- Construct from components //- Construct from components
70 constant
70 constantQBMM
71 71 ( (
72 72 const dictionary& dict, const dictionary& dict,
73 73 const phaseModel& phase const phaseModel& phase
 
... ... public:
75 75
76 76
77 77 //- Destructor //- Destructor
78 virtual ~constant();
78 virtual ~constantQBMM();
79 79
80 80
81 81 // Member Functions // Member Functions
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C changed (mode: 100644) (index 3375f22..366c44c)
... ... namespace Foam
32 32 { {
33 33 namespace diameterModels namespace diameterModels
34 34 { {
35 defineTypeNameAndDebug(isothermal, 0);
35 defineTypeNameAndDebug(isothermalQBMM, 0);
36 36
37 37 addToRunTimeSelectionTable addToRunTimeSelectionTable
38 38 ( (
39 39 diameterModel, diameterModel,
40 isothermal,
40 isothermalQBMM,
41 41 dictionary dictionary
42 42 ); );
43 43 } }
 
... ... namespace diameterModels
46 46
47 47 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
48 48
49 Foam::diameterModels::isothermal::isothermal
49 Foam::diameterModels::isothermalQBMM::isothermalQBMM
50 50 ( (
51 51 const dictionary& dict, const dictionary& dict,
52 52 const phaseModel& phase const phaseModel& phase
 
... ... Foam::diameterModels::isothermal::isothermal
60 60
61 61 // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
62 62
63 Foam::diameterModels::isothermal::~isothermal()
63 Foam::diameterModels::isothermalQBMM::~isothermalQBMM()
64 64 {} {}
65 65
66 66
67 67 // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
68 68
69 Foam::tmp<Foam::volScalarField> Foam::diameterModels::isothermal::d() const
69 Foam::tmp<Foam::volScalarField> Foam::diameterModels::isothermalQBMM::d() const
70 70 { {
71 71 const volScalarField& p = phase_.U().db().lookupObject<volScalarField> const volScalarField& p = phase_.U().db().lookupObject<volScalarField>
72 72 ( (
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/isothermalDiameter/isothermalDiameter.H changed (mode: 100644) (index eb0f1a5..54112e3)
... ... 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::isothermal
25 Foam::isothermalQBMM
26 26
27 27 Description Description
28 28 Isothermal dispersed-phase particle diameter model. Isothermal dispersed-phase particle diameter model.
29 29
30 30 SourceFiles SourceFiles
31 isothermal.C
31 isothermalDiameter.C
32 32
33 33 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
34 34
35 #ifndef isothermal_H
36 #define isothermal_H
35 #ifndef isothermalQBMM_H
36 #define isothermalQBMM_H
37 37
38 38 #include "diameterModel.H" #include "diameterModel.H"
39 39
 
... ... namespace diameterModels
45 45 { {
46 46
47 47 /*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
48 Class isothermal Declaration
48 Class isothermalQBMM Declaration
49 49 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
50 50
51 class isothermal
51 class isothermalQBMM
52 52 : :
53 53 public diameterModel public diameterModel
54 54 { {
 
... ... class isothermal
64 64 public: public:
65 65
66 66 //- Runtime type information //- Runtime type information
67 TypeName("isothermal");
67 TypeName("isothermalQBMM");
68 68
69 69
70 70 // Constructors // Constructors
71 71
72 72 //- Construct from components //- Construct from components
73 isothermal
73 isothermalQBMM
74 74 ( (
75 75 const dictionary& dict, const dictionary& dict,
76 76 const phaseModel& phase const phaseModel& phase
 
... ... public:
78 78
79 79
80 80 //- Destructor //- Destructor
81 virtual ~isothermal();
81 virtual ~isothermalQBMM();
82 82
83 83
84 84 // Member Functions // Member Functions
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/sauterMean/sauterMeanDiameter.C copied from file multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/QBMM/QBMMDiameter.C (similarity 85%) (mode: 100644) (index 2e0bb86..16c1519)
2 2 ========= | ========= |
3 3 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
4 4 \\ / O peration | \\ / O peration |
5 \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
5 \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
6 6 \\/ M anipulation | \\/ M anipulation |
7 7 ------------------------------------------------------------------------------- -------------------------------------------------------------------------------
8 8 License License
 
... ... License
23 23
24 24 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
25 25
26 #include "QBMMDiameter.H"
26 #include "sauterMeanDiameter.H"
27 27 #include "multiphaseDisperseSystem.H" #include "multiphaseDisperseSystem.H"
28 28 #include "mathematicalConstants.H" #include "mathematicalConstants.H"
29 29 #include "fundamentalConstants.H" #include "fundamentalConstants.H"
 
... ... namespace Foam
35 35 { {
36 36 namespace diameterModels namespace diameterModels
37 37 { {
38 defineTypeNameAndDebug(QBMM, 0);
38 defineTypeNameAndDebug(sauterMean, 0);
39 39
40 40 addToRunTimeSelectionTable addToRunTimeSelectionTable
41 41 ( (
42 42 diameterModel, diameterModel,
43 QBMM,
43 sauterMean,
44 44 dictionary dictionary
45 45 ); );
46 46 } }
 
... ... namespace diameterModels
49 49
50 50 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
51 51
52 Foam::diameterModels::QBMM::QBMM
52 Foam::diameterModels::sauterMean::sauterMean
53 53 ( (
54 54 const dictionary& dict, const dictionary& dict,
55 55 const phaseModel& phase const phaseModel& phase
 
... ... Foam::diameterModels::QBMM::QBMM
79 79
80 80 // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
81 81
82 Foam::diameterModels::QBMM::~QBMM()
82 Foam::diameterModels::sauterMean::~sauterMean()
83 83 {} {}
84 84
85 85
86 86 // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
87 87
88 Foam::tmp<Foam::volScalarField> Foam::diameterModels::QBMM::dsm() const
88 Foam::tmp<Foam::volScalarField> Foam::diameterModels::sauterMean::dsm() const
89 89 { {
90 90
91 91 volScalarField moment3_(phase_.U().mesh().lookupObject<volScalarField>(IOobject::groupName("moment.3.populationBalance", phase_.name()))); volScalarField moment3_(phase_.U().mesh().lookupObject<volScalarField>(IOobject::groupName("moment.3.populationBalance", phase_.name())));
92 // Info<< "moment.3 in QBMM diameter= " << moment3_[0] << endl;
92 // Info<< "moment.3 in sauterMean diameter= " << moment3_[0] << endl;
93 93
94 94 volScalarField moment2_(phase_.U().mesh().lookupObject<volScalarField>(IOobject::groupName("moment.2.populationBalance", phase_.name()))); volScalarField moment2_(phase_.U().mesh().lookupObject<volScalarField>(IOobject::groupName("moment.2.populationBalance", phase_.name())));
95 95 // Info<< "min moment.2 in diameter= " << max(moment2_,min_moment2_) << endl; // Info<< "min moment.2 in diameter= " << max(moment2_,min_moment2_) << endl;
96 96 // Calculate the sauter mean diameter of the phase // Calculate the sauter mean diameter of the phase
97 // Info<< "QBMM diameter= " << moment2_[0] << endl;
97 // Info<< "sauterMean diameter= " << moment2_[0] << endl;
98 98 return min(max(moment3_/max(moment2_, min_moment2_), dMin_), dMax_); return min(max(moment3_/max(moment2_, min_moment2_), dMin_), dMax_);
99 99 } }
100 100
101 void Foam::diameterModels::QBMM::correct()
101 void Foam::diameterModels::sauterMean::correct()
102 102 { {
103 103 // Alternative method to calculate diameter // Alternative method to calculate diameter
104 104 // Calculates diameter of the phase using the associated volume fraction // Calculates diameter of the phase using the associated volume fraction
 
... ... void Foam::diameterModels::QBMM::correct()
115 115
116 116 // Update the diameter // Update the diameter
117 117 // d_ = alpha_ / (Kv_ * moment2); // d_ = alpha_ / (Kv_ * moment2);
118 Info << "correct diameter with QBMM diameter model" << endl;
118 Info << "Update phase Sauter mean diameter" << endl;
119 119 d_ = dsm(); d_ = dsm();
120 120 } }
121 121 /* /*
122 bool Foam::diameterModels::QBMM::read(const dictionary& phaseDict)
122 bool Foam::diameterModels::sauterMean::read(const dictionary& phaseDict)
123 123 { {
124 124 diameterModel::read(phaseDict); diameterModel::read(phaseDict);
125 125
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/sauterMean/sauterMeanDiameter.H copied from file multiphaseEulerPbeFoam/multiphaseDisperseSystem/diameterModels/QBMM/QBMMDiameter.H (similarity 89%) (mode: 100644) (index 29fe420..3d57eea)
2 2 ========= | ========= |
3 3 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
4 4 \\ / O peration | \\ / O peration |
5 \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
5 \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
6 6 \\/ M anipulation | \\/ M anipulation |
7 7 ------------------------------------------------------------------------------- -------------------------------------------------------------------------------
8 8 License License
 
... ... 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::QBMM
25 Foam::sauterMean
26 26
27 27 Description Description
28 QBMM-based dispersed-phase particle diameter model.
28 QBMM-based sauter mean dispersed-phase particle diameter model.
29 29
30 30 Calculates the sauter-mean diameter of a phase based on time-evolution of Calculates the sauter-mean diameter of a phase based on time-evolution of
31 31 the moments of the distribution as evaluated using the OpenQBMM library. the moments of the distribution as evaluated using the OpenQBMM library.
32 32
33 33 SourceFiles SourceFiles
34 QBMM.C
34 sauterMeanDiameter.C
35 35
36 36 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
37 37
38 #ifndef QBMM_H
39 #define QBMM_H
38 #ifndef sauterMean_H
39 #define sauterMean_H
40 40
41 41 #include "diameterModel.H" #include "diameterModel.H"
42 42
 
... ... namespace diameterModels
48 48 { {
49 49
50 50 /*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
51 Class QBMM Declaration
51 Class sauterMean Declaration
52 52 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
53 53
54 class QBMM
54 class sauterMean
55 55 : :
56 56 public diameterModel public diameterModel
57 57 { {
 
... ... class QBMM
80 80 public: public:
81 81
82 82 //- Runtime type information //- Runtime type information
83 TypeName("QBMM");
83 TypeName("sauterMean");
84 84
85 85
86 86 // Constructors // Constructors
87 87
88 88 //- Construct from components //- Construct from components
89 QBMM
89 sauterMean
90 90 ( (
91 91 const dictionary& dict, const dictionary& dict,
92 92 const phaseModel& phase const phaseModel& phase
 
... ... public:
94 94
95 95
96 96 //- Destructor //- Destructor
97 virtual ~QBMM();
97 virtual ~sauterMean();
98 98
99 99
100 100 // Member Functions // Member Functions
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/disperseAlphaContactAngle/disperseAlphaContactAngleFvPatchScalarField.C renamed from multiphaseEulerPbeFoam/multiphaseDisperseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.C (similarity 77%) (mode: 100644) (index a0d433f..0d281ac)
... ... License
23 23
24 24 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
25 25
26 #include "alphaContactAngleFvPatchScalarField.H"
26 #include "disperseAlphaContactAngleFvPatchScalarField.H"
27 27 #include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
28 28 #include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
29 29
 
... ... License
32 32 namespace Foam namespace Foam
33 33 { {
34 34
35 alphaContactAngleFvPatchScalarField::interfaceThetaProps::interfaceThetaProps
35 disperseAlphaContactAngleFvPatchScalarField::interfaceThetaProps::interfaceThetaProps
36 36 ( (
37 37 Istream& is Istream& is
38 38 ) )
 
... ... alphaContactAngleFvPatchScalarField::interfaceThetaProps::interfaceThetaProps
47 47 Istream& operator>> Istream& operator>>
48 48 ( (
49 49 Istream& is, Istream& is,
50 alphaContactAngleFvPatchScalarField::interfaceThetaProps& tp
50 disperseAlphaContactAngleFvPatchScalarField::interfaceThetaProps& tp
51 51 ) )
52 52 { {
53 53 is >> tp.theta0_ >> tp.uTheta_ >> tp.thetaA_ >> tp.thetaR_; is >> tp.theta0_ >> tp.uTheta_ >> tp.thetaA_ >> tp.thetaR_;
 
... ... Istream& operator>>
58 58 Ostream& operator<< Ostream& operator<<
59 59 ( (
60 60 Ostream& os, Ostream& os,
61 const alphaContactAngleFvPatchScalarField::interfaceThetaProps& tp
61 const disperseAlphaContactAngleFvPatchScalarField::interfaceThetaProps& tp
62 62 ) )
63 63 { {
64 64 os << tp.theta0_ << token::SPACE os << tp.theta0_ << token::SPACE
 
... ... Ostream& operator<<
72 72
73 73 // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
74 74
75 alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
75 disperseAlphaContactAngleFvPatchScalarField::disperseAlphaContactAngleFvPatchScalarField
76 76 ( (
77 77 const fvPatch& p, const fvPatch& p,
78 78 const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
 
... ... alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
82 82 {} {}
83 83
84 84
85 alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
85 disperseAlphaContactAngleFvPatchScalarField::disperseAlphaContactAngleFvPatchScalarField
86 86 ( (
87 const alphaContactAngleFvPatchScalarField& gcpsf,
87 const disperseAlphaContactAngleFvPatchScalarField& gcpsf,
88 88 const fvPatch& p, const fvPatch& p,
89 89 const DimensionedField<scalar, volMesh>& iF, const DimensionedField<scalar, volMesh>& iF,
90 90 const fvPatchFieldMapper& mapper const fvPatchFieldMapper& mapper
 
... ... alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
95 95 {} {}
96 96
97 97
98 alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
98 disperseAlphaContactAngleFvPatchScalarField::disperseAlphaContactAngleFvPatchScalarField
99 99 ( (
100 100 const fvPatch& p, const fvPatch& p,
101 101 const DimensionedField<scalar, volMesh>& iF, const DimensionedField<scalar, volMesh>& iF,
 
... ... alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
109 109 } }
110 110
111 111
112 alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
112 disperseAlphaContactAngleFvPatchScalarField::disperseAlphaContactAngleFvPatchScalarField
113 113 ( (
114 const alphaContactAngleFvPatchScalarField& gcpsf,
114 const disperseAlphaContactAngleFvPatchScalarField& gcpsf,
115 115 const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
116 116 ) )
117 117 : :
 
... ... alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
122 122
123 123 // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
124 124
125 void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
125 void disperseAlphaContactAngleFvPatchScalarField::write(Ostream& os) const
126 126 { {
127 127 fvPatchScalarField::write(os); fvPatchScalarField::write(os);
128 128 os.writeKeyword("thetaProperties") os.writeKeyword("thetaProperties")
 
... ... void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
136 136 makePatchTypeField makePatchTypeField
137 137 ( (
138 138 fvPatchScalarField, fvPatchScalarField,
139 alphaContactAngleFvPatchScalarField
139 disperseAlphaContactAngleFvPatchScalarField
140 140 ); );
141 141
142 142 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/disperseAlphaContactAngle/disperseAlphaContactAngleFvPatchScalarField.H renamed from multiphaseEulerPbeFoam/multiphaseDisperseSystem/alphaContactAngle/alphaContactAngleFvPatchScalarField.H (similarity 84%) (mode: 100644) (index cf0b09c..14ef093)
... ... 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::alphaContactAngleFvPatchScalarField
25 Foam::disperseAlphaContactAngleFvPatchScalarField
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 29 simulations. Used in conjuction with multiphaseDisperseSystem. simulations. Used in conjuction with multiphaseDisperseSystem.
30 30
31 31 SourceFiles SourceFiles
32 alphaContactAngleFvPatchScalarField.C
32 disperseAlphaContactAngleFvPatchScalarField.C
33 33
34 34 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
35 35
36 #ifndef alphaContactAngleFvPatchScalarField_H
37 #define alphaContactAngleFvPatchScalarField_H
36 #ifndef disperseAlphaContactAngleFvPatchScalarField_H
37 #define disperseAlphaContactAngleFvPatchScalarField_H
38 38
39 39 #include "zeroGradientFvPatchFields.H" #include "zeroGradientFvPatchFields.H"
40 40 #include "multiphaseDisperseSystem.H" #include "multiphaseDisperseSystem.H"
 
... ... namespace Foam
45 45 { {
46 46
47 47 /*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
48 Class alphaContactAngleFvPatch Declaration
48 Class disperseAlphaContactAngleFvPatch Declaration
49 49 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
50 50
51 class alphaContactAngleFvPatchScalarField
51 class disperseAlphaContactAngleFvPatchScalarField
52 52 : :
53 53 public zeroGradientFvPatchScalarField public zeroGradientFvPatchScalarField
54 54 { {
 
... ... private:
132 132 public: public:
133 133
134 134 //- Runtime type information //- Runtime type information
135 TypeName("alphaContactAngle");
135 TypeName("disperseAlphaContactAngle");
136 136
137 137
138 138 // Constructors // Constructors
139 139
140 140 //- Construct from patch and internal field //- Construct from patch and internal field
141 alphaContactAngleFvPatchScalarField
141 disperseAlphaContactAngleFvPatchScalarField
142 142 ( (
143 143 const fvPatch&, const fvPatch&,
144 144 const DimensionedField<scalar, volMesh>& const DimensionedField<scalar, volMesh>&
145 145 ); );
146 146
147 147 //- Construct from patch, internal field and dictionary //- Construct from patch, internal field and dictionary
148 alphaContactAngleFvPatchScalarField
148 disperseAlphaContactAngleFvPatchScalarField
149 149 ( (
150 150 const fvPatch&, const fvPatch&,
151 151 const DimensionedField<scalar, volMesh>&, const DimensionedField<scalar, volMesh>&,
152 152 const dictionary& const dictionary&
153 153 ); );
154 154
155 //- Construct by mapping given alphaContactAngleFvPatchScalarField
155 //- Construct by mapping given disperseAlphaContactAngleFvPatchScalarField
156 156 // onto a new patch // onto a new patch
157 alphaContactAngleFvPatchScalarField
157 disperseAlphaContactAngleFvPatchScalarField
158 158 ( (
159 const alphaContactAngleFvPatchScalarField&,
159 const disperseAlphaContactAngleFvPatchScalarField&,
160 160 const fvPatch&, const fvPatch&,
161 161 const DimensionedField<scalar, volMesh>&, const DimensionedField<scalar, volMesh>&,
162 162 const fvPatchFieldMapper& const fvPatchFieldMapper&
 
... ... public:
167 167 { {
168 168 return tmp<fvPatchScalarField> return tmp<fvPatchScalarField>
169 169 ( (
170 new alphaContactAngleFvPatchScalarField(*this)
170 new disperseAlphaContactAngleFvPatchScalarField(*this)
171 171 ); );
172 172 } }
173 173
174 174 //- Construct as copy setting internal field reference //- Construct as copy setting internal field reference
175 alphaContactAngleFvPatchScalarField
175 disperseAlphaContactAngleFvPatchScalarField
176 176 ( (
177 const alphaContactAngleFvPatchScalarField&,
177 const disperseAlphaContactAngleFvPatchScalarField&,
178 178 const DimensionedField<scalar, volMesh>& const DimensionedField<scalar, volMesh>&
179 179 ); );
180 180
 
... ... public:
186 186 { {
187 187 return tmp<fvPatchScalarField> return tmp<fvPatchScalarField>
188 188 ( (
189 new alphaContactAngleFvPatchScalarField(*this, iF)
189 new disperseAlphaContactAngleFvPatchScalarField(*this, iF)
190 190 ); );
191 191 } }
192 192
File multiphaseEulerPbeFoam/multiphaseDisperseSystem/multiphaseDisperseSystem.C changed (mode: 100644) (index 56ed51f..a2a0a57)
... ... License
24 24 \*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
25 25
26 26 #include "multiphaseDisperseSystem.H" #include "multiphaseDisperseSystem.H"
27 #include "alphaContactAngleFvPatchScalarField.H"
27 #include "disperseAlphaContactAngleFvPatchScalarField.H"
28 28 #include "fixedValueFvsPatchFields.H" #include "fixedValueFvsPatchFields.H"
29 29 #include "Time.H" #include "Time.H"
30 30 #include "subCycle.H" #include "subCycle.H"
 
... ... void Foam::multiphaseDisperseSystem::correctContactAngle
262 262
263 263 forAll(boundary, patchi) forAll(boundary, patchi)
264 264 { {
265 if (isA<alphaContactAngleFvPatchScalarField>(gbf[patchi]))
265 if (isA<disperseAlphaContactAngleFvPatchScalarField>(gbf[patchi]))
266 266 { {
267 const alphaContactAngleFvPatchScalarField& acap =
268 refCast<const alphaContactAngleFvPatchScalarField>(gbf[patchi]);
267 const disperseAlphaContactAngleFvPatchScalarField& acap =
268 refCast<const disperseAlphaContactAngleFvPatchScalarField>(gbf[patchi]);
269 269
270 270 vectorField& nHatPatch = nHatb[patchi]; vectorField& nHatPatch = nHatb[patchi];
271 271
 
... ... void Foam::multiphaseDisperseSystem::correctContactAngle
275 275 /mesh_.magSf().boundaryField()[patchi] /mesh_.magSf().boundaryField()[patchi]
276 276 ); );
277 277
278 alphaContactAngleFvPatchScalarField::thetaPropsTable::
278 disperseAlphaContactAngleFvPatchScalarField::thetaPropsTable::
279 279 const_iterator tp = const_iterator tp =
280 280 acap.thetaProps().find(interfacePair(phase1, phase2)); acap.thetaProps().find(interfacePair(phase1, phase2));
281 281
File multiphaseEulerPbeFoam/quadratureMethods/PDFTransportModels/univariatePDFTransportModel/univariatePDFTransportModel.H changed (mode: 100644) (index d524dd0..a5f8dc8)
... ... class univariatePDFTransportModel
78 78 scalar facMax_; scalar facMax_;
79 79
80 80 //- Minimum local step in realizable ODE solver //- Minimum local step in realizable ODE solver
81 label minLocalDt_;
81 scalar minLocalDt_;
82 82
83 83
84 84 protected: protected:
File multiphaseEulerPbeFoam/quadratureMethods/momentAdvection/zeta/zeta.C changed (mode: 100644) (index 3215635..13e5e21)
... ... Foam::zeta::zeta
224 224 phi.mesh().time().timeName(), phi.mesh().time().timeName(),
225 225 phi.mesh(), phi.mesh(),
226 226 IOobject::NO_READ, IOobject::NO_READ,
227 IOobject::AUTO_WRITE
227 IOobject::NO_WRITE
228 228 ), ),
229 229 phi.mesh(), phi.mesh(),
230 230 dimensionedScalar("zero", dimless, 1.0) dimensionedScalar("zero", dimless, 1.0)
 
... ... Foam::zeta::zeta
242 242 phi.mesh().time().timeName(), phi.mesh().time().timeName(),
243 243 phi.mesh(), phi.mesh(),
244 244 IOobject::NO_READ, IOobject::NO_READ,
245 IOobject::AUTO_WRITE
245 IOobject::NO_WRITE
246 246 ), ),
247 247 phi.mesh(), phi.mesh(),
248 248 dimensionedScalar("zero", dimless, 1.0) dimensionedScalar("zero", dimless, 1.0)
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