List of commits:
Subject Hash Author Date (UTC)
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 286070162f350e965a9c0fb8a0d8cd17be017f55 - update/debugof multiphaseSystem + add switch populationbalance
Author: Cyrille Bonamy
Author date (UTC): 2017-09-27 10:12
Committer name: Cyrille Bonamy
Committer date (UTC): 2017-09-27 10:12
Parent(s): 0ffbb65f8e7778190a8f38389da15ffc291e38c3
Signer:
Signing key:
Signing status: N
Tree: 8fee2d02d67b432ca07380feb013c4fb824a2756
File Lines added Lines deleted
multiphaseEulerPbeFoam/multiphaseSystem/multiphaseSystem.C 5 2
multiphaseEulerPbeFoam/multiphaseSystem/phaseModel/phaseModel.C 13 9
multiphaseEulerPbeFoam/multiphaseSystem/phaseModel/phaseModel.H 13 0
testCase/constant/populationBalanceProperties 2 0
testCase/constant/quadratureProperties.populationBalance 6 6
File multiphaseEulerPbeFoam/multiphaseSystem/multiphaseSystem.C changed (mode: 100644) (index e3171ae..25132a2)
... ... Foam::multiphaseSystem::nearInterface() const
873 873
874 874 void Foam::multiphaseSystem::solve() void Foam::multiphaseSystem::solve()
875 875 { {
876
876 877 forAllIter(PtrDictionary<phaseModel>, phases_, iter) forAllIter(PtrDictionary<phaseModel>, phases_, iter)
877 878 { {
878 879 iter().correct(); iter().correct();
879 880 //AJOUT BONAMY //AJOUT BONAMY
880 881 phaseModel& phase = iter(); phaseModel& phase = iter();
881 phase.populationBalance().solve();
882
882 if (phase.switch_solvequadrature())
883 {
884 phase.populationBalance().solve();
885 }
883 886 } }
884 887
885 888 const Time& runTime = mesh_.time(); const Time& runTime = mesh_.time();
File multiphaseEulerPbeFoam/multiphaseSystem/phaseModel/phaseModel.C changed (mode: 100644) (index c502898..0105187)
... ... Foam::phaseModel::phaseModel
122 122 IOobject::MUST_READ_IF_MODIFIED, IOobject::MUST_READ_IF_MODIFIED,
123 123 IOobject::NO_WRITE IOobject::NO_WRITE
124 124 ) )
125 )
125 ),
126 switch_solvequadrature_(populationBalanceProperties.lookup("Switch_SolveQuadrature"))
126 127
127 128 { {
128 129 const word phiName = IOobject::groupName("phi", name_); const word phiName = IOobject::groupName("phi", name_);
 
... ... Foam::phaseModel::phaseModel
202 203 *this *this
203 204 ); );
204 205
205 Info<< "Initialising populationBalance" << IOobject::groupName("populationBalance", phaseName) << endl;
206 populationBalancePtr_ = populationBalanceModel::New
207 (
208 IOobject::groupName("populationBalance", phaseName),
209 populationBalanceProperties,
210 U_,
211 phi() //phi() or phiPtr_ ??
212 );
206 if (switch_solvequadrature_)
207 {
208 Info<< "Initialising populationBalance" << IOobject::groupName("populationBalance", phaseName) << endl;
209 populationBalancePtr_ = populationBalanceModel::New
210 (
211 IOobject::groupName("populationBalance", phaseName),
212 populationBalanceProperties,
213 U_,
214 phi() //phi() or phiPtr_ ??
215 );
216 }
213 217 } }
214 218
215 219
File multiphaseEulerPbeFoam/multiphaseSystem/phaseModel/phaseModel.H changed (mode: 100644) (index 2a55b96..bb54f42)
... ... class phaseModel
86 86 //- Dictionary of populationBalanceProperties of the phase //- Dictionary of populationBalanceProperties of the phase
87 87 IOdictionary populationBalanceProperties; IOdictionary populationBalanceProperties;
88 88
89 //- Switch solve of the phase
90 Switch switch_solvequadrature_;
91
89 92 //- Volumetric flux for the phase //- Volumetric flux for the phase
90 93 autoPtr<surfaceScalarField> phiPtr_; autoPtr<surfaceScalarField> phiPtr_;
91 94
 
... ... public:
205 208 return phiPtr_(); return phiPtr_();
206 209 } }
207 210
211 const Switch& switch_solvequadrature() const
212 {
213 return switch_solvequadrature_;
214 }
215
216 Switch& switch_solvequadrature()
217 {
218 return switch_solvequadrature_;
219 }
220
208 221 const populationBalanceModel& populationBalance() const const populationBalanceModel& populationBalance() const
209 222 { {
210 223 return populationBalancePtr_(); return populationBalancePtr_();
File testCase/constant/populationBalanceProperties changed (mode: 100644) (index ddbd502..773c79b)
... ... FoamFile
17 17
18 18 populationBalanceModel univariate; populationBalanceModel univariate;
19 19
20 Switch_SolveQuadrature on;
21
20 22 univariateCoeffs univariateCoeffs
21 23 { {
22 24 aggregation on; aggregation on;
File testCase/constant/quadratureProperties.populationBalance changed (mode: 100644) (index 081b4e6..4654618)
... ... moments
27 27 (0) (0)
28 28 (1) (1)
29 29 (2) (2)
30 (3)
31 (4)
30 // (3)
31 // (4)
32 32 ); );
33 33
34 34 nodes nodes
 
... ... nodes
37 37 { {
38 38 nSecondaryNodes 10; nSecondaryNodes 10;
39 39 } }
40 node1
41 {
42 nSecondaryNodes 10;
43 }
40 // node1
41 // {
42 // nSecondaryNodes 10;
43 // }
44 44 ); );
45 45
46 46 extendedMomentInversionCoeff extendedMomentInversionCoeff
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