zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: twoPhaseEulerFoam: fixed multiple registering of blended drag and virtual mass models

Browse Source
This commit is contained in:
william
2014-01-29 10:16:16 +00:00
parent e0de7c96c7
commit 4e36e9ce1c
34 changed files with 106 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.C
View File

@ -42,7 +42,8 @@ const Foam::dimensionSet Foam::dragModel::dimK(1, -3, -1, 0, 0);
Foam::dragModel::dragModel
(
const phasePair& pair
const phasePair& pair,
const bool registerObject
)
:
regIOobject
@ -51,7 +52,10 @@ Foam::dragModel::dragModel
(
IOobject::groupName(typeName, pair.name()),
pair.phase1().mesh().time().timeName(),
pair.phase1().mesh()
pair.phase1().mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
registerObject
)
),
pair_(pair)
@ -61,7 +65,8 @@ Foam::dragModel::dragModel
Foam::dragModel::dragModel
(
const dictionary& dict,
const phasePair& pair
const phasePair& pair,
const bool registerObject
)
:
regIOobject
@ -70,7 +75,10 @@ Foam::dragModel::dragModel
(
IOobject::groupName(typeName, pair.name()),
pair.phase1().mesh().time().timeName(),
pair.phase1().mesh()
pair.phase1().mesh(),
IOobject::NO_READ,
IOobject::NO_WRITE,
registerObject
)
),
pair_(pair),

11
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H
View File

@ -87,9 +87,10 @@ public:
dictionary,
(
const dictionary& dict,
const phasePair& pair
const phasePair& pair,
const bool registerObject
),
(dict, pair)
(dict, pair, registerObject)
);
@ -104,14 +105,16 @@ public:
// Construct without residual constants
dragModel
(
const phasePair& pair
const phasePair& pair,
const bool registerObject
);
// Construct with residual constants
dragModel
(
const dictionary& dict,
const phasePair& pair
const phasePair& pair,
const bool registerObject
);

2
applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
View File

@ -52,7 +52,7 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
<< exit(FatalError);
}
return cstrIter()(dict, pair);
return cstrIter()(dict, pair, true);
}