zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapted source code to OF 4.x.

Browse Source
This commit is contained in:
Thomas Lichtenegger
2016-07-20 14:57:05 +02:00
parent 1265463275
commit 8bb99ae9ce
26 changed files with 53 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValueTube/uniformFixedValueTubeFvPatchField.C
View File

@ -88,7 +88,7 @@ uniformFixedValueTubeFvPatchField<Type>::uniformFixedValueTubeFvPatchField
)
:
fixedValueFvPatchField<Type>(p, iF),
uniformValue_(DataEntry<Type>::New("uniformValue", dict)),
uniformValue_(Function1<Type>::New("uniformValue", dict)),
pName_("p"), //JOKER
phiName_("phi"), //JOKER
velocityFieldName_("U"),

4
src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValueTube/uniformFixedValueTubeFvPatchField.H
View File

@ -40,7 +40,7 @@ SourceFiles
#include "Random.H"
#include "fixedValueFvPatchFields.H"
#include "DataEntry.H"
#include "Function1.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -58,7 +58,7 @@ class uniformFixedValueTubeFvPatchField
{
// Private data
autoPtr<DataEntry<Type> > uniformValue_;
autoPtr<Function1<Type> > uniformValue_;
word pName_; //JOKER pressure

2
src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValueVoidfraction/uniformFixedValueVoidfractionFvPatchField.C
View File

@ -73,7 +73,7 @@ uniformFixedValueVoidfractionFvPatchField<Type>::uniformFixedValueVoidfractionFv
)
:
fixedValueFvPatchField<Type>(p, iF),
uniformValue_(DataEntry<Type>::New("uniformValue", dict)),
uniformValue_(Function1<Type>::New("uniformValue", dict)),
voidfractionFieldName_("voidfraction")
{
const scalar t = this->db().time().timeOutputValue();

4
src/finiteVolume/fields/fvPatchFields/derived/uniformFixedValueVoidfraction/uniformFixedValueVoidfractionFvPatchField.H
View File

@ -40,7 +40,7 @@ SourceFiles
#include "Random.H"
#include "fixedValueFvPatchFields.H"
#include "DataEntry.H"
#include "Function1.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -58,7 +58,7 @@ class uniformFixedValueVoidfractionFvPatchField
{
// Private data
autoPtr<DataEntry<Type> > uniformValue_;
autoPtr<Function1<Type> > uniformValue_;
word voidfractionFieldName_;

10
src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.C
View File

@ -125,15 +125,7 @@ cfdemCloud::cfdemCloud
),
turbulence_
(
#if defined(version21) || defined(version16ext)
#ifdef compre
mesh.lookupObject<compressible::turbulenceModel>
#else
mesh.lookupObject<incompressible::turbulenceModel>
#endif
#elif defined(version15)
mesh.lookupObject<incompressible::RASModel>
#endif
mesh.lookupObject<turbulenceModel>
(
turbulenceModelType_
)

28
src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloud.H
View File

@ -49,11 +49,7 @@ SourceFiles
#include "fvCFD.H"
#include "IFstream.H"
#if defined(version21) || defined(version16ext)
#include <turbulenceModel.H>
#elif defined(version15)
#include <RASModel.H>
#endif
#include <turbulenceModel.H>
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -157,15 +153,7 @@ protected:
mutable volScalarField ddtVoidfraction_;
#if defined(version21) || defined(version16ext)
#ifdef compre
const compressible::turbulenceModel& turbulence_;
#else
const incompressible::turbulenceModel& turbulence_;
#endif
#elif defined(version15)
const incompressible::RASModel& turbulence_;
#endif
const turbulenceModel& turbulence_;
autoPtr<forceModel>* forceModel_;
@ -364,16 +352,8 @@ public:
inline autoPtr<liggghtsCommandModel>* liggghtsCommand() const;
#if defined(version21) || defined(version16ext)
#ifdef compre
inline const compressible::turbulenceModel& turbulence() const;
#else
inline const incompressible::turbulenceModel& turbulence() const;
#endif
#elif defined(version15)
inline const incompressible::RASModel& turbulence() const;
#endif
inline const turbulenceModel& turbulence() const;
// Write
// write cfdemCloud internal data

10
src/lagrangian/cfdemParticle/cfdemCloud/cfdemCloudI.H
View File

@ -302,15 +302,7 @@ inline autoPtr<liggghtsCommandModel>* cfdemCloud::liggghtsCommand() const
return liggghtsCommand_;
}
#if defined(version21) || defined(version16ext)
#ifdef compre
inline const compressible::turbulenceModel& cfdemCloud::turbulence() const
#else
inline const incompressible::turbulenceModel& cfdemCloud::turbulence() const
#endif
#elif defined(version15)
inline const incompressible::RASModel& cfdemCloud::turbulence() const
#endif
inline const turbulenceModel& cfdemCloud::turbulence() const
{
return turbulence_;
}

12
src/lagrangian/cfdemParticle/subModels/averagingModel/averagingModel/averagingModel.C
View File

@ -59,7 +59,7 @@ void averagingModel::undoVectorAverage
{
// WARNING - not sure if this is valid for dilute model!!!
if(!single) fieldPrev.internalField() = fieldNext.internalField();
if(!single) fieldPrev.ref() = fieldNext.ref();
label cellI;
vector valueVec;
@ -303,13 +303,13 @@ void averagingModel::setDSauter
void averagingModel::resetVectorAverage(volVectorField& prev,volVectorField& next,bool single) const
{
if(!single) prev.internalField() = next.internalField();
next.internalField() = vector::zero;
if(!single) prev.ref() = next.ref();
next.primitiveFieldRef() = vector::zero;
}
void averagingModel::resetWeightFields() const
{
UsWeightField_.internalField() = 0;
UsWeightField_.ref() = 0;
}
@ -352,12 +352,12 @@ tmp<volVectorField> Foam::averagingModel::UsInterp() const
if (particleCloud_.dataExchangeM().couplingStep() > 1)
{
tsource() = (1 - particleCloud_.dataExchangeM().timeStepFraction()) * UsPrev_
tsource.ref() = (1 - particleCloud_.dataExchangeM().timeStepFraction()) * UsPrev_
+ particleCloud_.dataExchangeM().timeStepFraction() * UsNext_;
}
else
{
tsource() = UsNext_;
tsource.ref() = UsNext_;
}
return tsource;

6
src/lagrangian/cfdemParticle/subModels/forceModel/Archimedes/Archimedes.C
View File

@ -64,11 +64,7 @@ Archimedes::Archimedes
propsDict_(dict.subDict(typeName + "Props")),
twoDimensional_(false),
gravityFieldName_(propsDict_.lookup("gravityFieldName")),
#if defined(version21) || defined(version16ext)
g_(sm.mesh().lookupObject<uniformDimensionedVectorField> (gravityFieldName_))
#elif defined(version15)
g_(dimensionedVector(sm.mesh().lookupObject<IOdictionary>("environmentalProperties").lookup(gravityFieldName_)).value())
#endif
g_(sm.mesh().lookupObject<uniformDimensionedVectorField> (gravityFieldName_))
{
//Append the field names to be probed

6
src/lagrangian/cfdemParticle/subModels/forceModel/Archimedes/Archimedes.H
View File

@ -65,11 +65,7 @@ private:
word gravityFieldName_;
#ifdef version21
const uniformDimensionedVectorField& g_; // ref to gravity
#elif defined(version16ext) || defined(version15)
const dimensionedVector& g_; // ref to gravity
#endif
const uniformDimensionedVectorField& g_; // ref to gravity
public:

6
src/lagrangian/cfdemParticle/subModels/forceModel/ArchimedesIB/ArchimedesIB.C
View File

@ -66,11 +66,7 @@ ArchimedesIB::ArchimedesIB
voidfractionFieldName_(propsDict_.lookup("voidfractionFieldName")), //mod by alice
voidfractions_(sm.mesh().lookupObject<volScalarField> (voidfractionFieldName_)),//mod by alice
gravityFieldName_(propsDict_.lookup("gravityFieldName")),
#if defined(version21) || defined(version16ext)
g_(sm.mesh().lookupObject<uniformDimensionedVectorField> (gravityFieldName_))
#elif defined(version15)
g_(dimensionedVector(sm.mesh().lookupObject<IOdictionary>("environmentalProperties").lookup(gravityFieldName_)).value())
#endif
g_(sm.mesh().lookupObject<uniformDimensionedVectorField> (gravityFieldName_))
{
//Append the field names to be probed
particleCloud_.probeM().initialize(typeName, "archimedesIBF.logDat");

8
src/lagrangian/cfdemParticle/subModels/forceModel/ArchimedesIB/ArchimedesIB.H
View File

@ -71,12 +71,8 @@ private:
word gravityFieldName_;
#ifdef version21
const uniformDimensionedVectorField& g_; // ref to gravity
#elif defined(version16ext) || defined(version15)
const dimensionedVector& g_; // ref to gravity
#endif
const uniformDimensionedVectorField& g_; // ref to gravity
public:

4
src/lagrangian/cfdemParticle/subModels/forceModel/LaEuScalarTemp/LaEuScalarTemp.C
View File

@ -130,7 +130,7 @@ void LaEuScalarTemp::manipulateScalarField(volScalarField& EuField) const
allocateMyArrays();
// reset Scalar field
EuField.internalField() = 0.0;
EuField.primitiveFieldRef() = 0.0;
// get DEM data
particleCloud_.dataExchangeM().getData(partTempName_,"scalar-atom",partTemp_);
@ -232,7 +232,7 @@ void LaEuScalarTemp::manipulateScalarField(volScalarField& EuField) const
);
// scale with -1/(Vcell*rho*Cp)
EuField.internalField() /= -rhoField.internalField()*Cp_*EuField.mesh().V();
EuField.primitiveFieldRef() /= -rhoField.internalField()*Cp_*EuField.mesh().V();
// limit source term
forAll(EuField,cellI)

6
src/lagrangian/cfdemParticle/subModels/forceModel/particleCellVolume/particleCellVolume.C
View File

@ -120,7 +120,7 @@ void particleCellVolume::setForce() const
{
if(verbose_) Info << "particleCellVolume.C - setForce()" << endl;
scalarField_.internalField()=0.;
scalarField_.ref()=0.;
// get reference to actual field
const volScalarField& field = mesh_.lookupObject<volScalarField>(scalarFieldName_);
@ -143,8 +143,8 @@ void particleCellVolume::setForce() const
scalarField2_[cellI] = 0.;
}
}
scalarField_.internalField() = gSum(scalarField_);
scalarField2_.internalField() = gSum(scalarField2_);
scalarField_.ref() = gSum(scalarField_);
scalarField2_.ref() = gSum(scalarField2_);
if(verbose_)
{

4
src/lagrangian/cfdemParticle/subModels/forceModel/volWeightedAverage/volWeightedAverage.C
View File

@ -179,7 +179,7 @@ void volWeightedAverage::setForce() const
MPI_Allreduce(&totVol, &totVol_all, 3, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
integralValue = gSum(scalarFields_[i]);
volWeightedAverage = integralValue / (totVol_all+SMALL);
scalarFields_[i].internalField() = volWeightedAverage;
scalarFields_[i].ref() = volWeightedAverage;
if(verbose_)
{
@ -224,7 +224,7 @@ void volWeightedAverage::setForce() const
MPI_Allreduce(&totVol, &totVol_all, 3, MPI_DOUBLE, MPI_SUM, MPI_COMM_WORLD);
volWeightedAverage = gSum(vectorFields_[i]) / (totVol_all+SMALL);
vectorFields_[i].internalField() = volWeightedAverage;
vectorFields_[i].ref() = volWeightedAverage;
if(verbose_)
{

8
src/lagrangian/cfdemParticle/subModels/locateModel/engineSearch/engineSearch.C
View File

@ -61,14 +61,8 @@ engineSearch::engineSearch
:
locateModel(dict,sm),
propsDict_(dict.subDict(typeName + "Props")),
//faceDecomp_(propsDict_.lookup("faceDecomp")),
treeSearch_(propsDict_.lookup("treeSearch")),
#ifdef version16ext
searchEngine_(particleCloud_.mesh(),false) //(particleCloud_.mesh(),faceDecomp_)
#elif defined(version21)
searchEngine_(particleCloud_.mesh(),polyMesh::FACEPLANES) // FACEPLANES or FACECENTRETETS; FACEDIAGTETS not stable
#endif
//searchEngine_(particleCloud_.mesh(),faceDecomp_) // only 2.0.x
searchEngine_(particleCloud_.mesh(), polyMesh::FACE_PLANES)
{}

2
src/lagrangian/cfdemParticle/subModels/locateModel/engineSearch/engineSearch.H
View File

@ -61,8 +61,6 @@ private:
dictionary propsDict_;
//Switch faceDecomp_;
Switch treeSearch_;
protected:

12
src/lagrangian/cfdemParticle/subModels/locateModel/standardSearch/standardSearch.C
View File

@ -89,11 +89,7 @@ label standardSearch::findCell
for(int i=0;i<3;i++) position[i] = positions[index][i];
// find cell
#ifdef version16ext
cellIDs[index][0] = particleCloud_.mesh().findCell(position);
#elif defined(version21)
cellIDs[index][0] = particleCloud_.mesh().findCell(position, polyMesh::FACEPLANES);
#endif
cellIDs[index][0] = particleCloud_.mesh().findCell(position, polyMesh::FACE_PLANES);
}
else cellIDs[index][0] = -1;
}
@ -108,11 +104,7 @@ label standardSearch::findSingleCell
) const
{
// find cell
#ifdef version16ext
return particleCloud_.mesh().findCell(position);
#elif defined(version21)
return particleCloud_.mesh().findCell(position, polyMesh::FACEPLANES);
#endif
return particleCloud_.mesh().findCell(position, polyMesh::FACE_PLANES);
}

6
src/lagrangian/cfdemParticle/subModels/locateModel/turboEngineSearch/turboEngineSearch.C
View File

@ -64,11 +64,7 @@ turboEngineSearch::turboEngineSearch
propsDict_(dict.subDict(typeName + "Props")),
treeSearch_(propsDict_.lookup("treeSearch")),
bb_(particleCloud_.mesh().points(),false),
#ifdef version16ext
searchEngine_(particleCloud_.mesh(),false) //(particleCloud_.mesh(),faceDecomp_)
#elif defined(version21)
searchEngine_(particleCloud_.mesh(),polyMesh::FACEPLANES) // FACEPLANES or FACECENTRETETS; FACEDIAGTETS not stable
#endif
searchEngine_(particleCloud_.mesh(), polyMesh::FACE_PLANES)
{}

8
src/lagrangian/cfdemParticle/subModels/momCoupleModel/explicitCouple/explicitCouple.C
View File

@ -145,18 +145,18 @@ tmp<volVectorField> explicitCouple::expMomSource() const
if (fNext_[cellI][i] > fLimit_[i]) fNext_[cellI][i] = fLimit_[i];
}
}
tsource() = fPrev_;
tsource.ref() = fPrev_;
}else
{
tsource() = (1 - tsf) * fPrev_ + tsf * fNext_;
tsource.ref() = (1 - tsf) * fPrev_ + tsf * fNext_;
}
return tsource;
}
void Foam::explicitCouple::resetMomSourceField() const
{
fPrev_.internalField() = fNext_.internalField();
fNext_.internalField() = vector::zero;
fPrev_.ref() = fNext_.ref();
fNext_.primitiveFieldRef() = vector::zero;
}
inline vector Foam::explicitCouple::arrayToField(label cellI) const

8
src/lagrangian/cfdemParticle/subModels/momCoupleModel/implicitCouple/implicitCouple.C
View File

@ -166,10 +166,10 @@ tmp<volScalarField> implicitCouple::impMomSource() const
// limiter
if (KslNext_[cellI] > KslLimit_) KslNext_[cellI] = KslLimit_;
}
tsource() = KslPrev_;
tsource.ref() = KslPrev_;
}else
{
tsource() = (1 - tsf) * KslPrev_ + tsf * KslNext_;
tsource.ref() = (1 - tsf) * KslPrev_ + tsf * KslNext_;
}
return tsource;
@ -177,8 +177,8 @@ tmp<volScalarField> implicitCouple::impMomSource() const
void Foam::implicitCouple::resetMomSourceField() const
{
KslPrev_.internalField() = KslNext_.internalField();
KslNext_.internalField() = 0;
KslPrev_.ref() = KslNext_.ref();
KslNext_.primitiveFieldRef() = 0;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

8
src/lagrangian/cfdemParticle/subModels/smoothingModel/constDiffSmoothing/constDiffSmoothing.C
View File

@ -100,7 +100,7 @@ void Foam::constDiffSmoothing::smoothen(volScalarField& fieldSrc) const
volScalarField sSmoothField = sSmoothField_;
sSmoothField.dimensions().reset(fieldSrc.dimensions());
sSmoothField.internalField()=fieldSrc.internalField();
sSmoothField.ref()=fieldSrc.internalField();
sSmoothField.correctBoundaryConditions();
sSmoothField.oldTime().dimensions().reset(fieldSrc.dimensions());
sSmoothField.oldTime()=fieldSrc;
@ -141,7 +141,7 @@ void Foam::constDiffSmoothing::smoothen(volVectorField& fieldSrc) const
volVectorField vSmoothField = vSmoothField_;
vSmoothField.dimensions().reset(fieldSrc.dimensions());
vSmoothField.internalField()=fieldSrc.internalField();
vSmoothField.ref()=fieldSrc.internalField();
vSmoothField.correctBoundaryConditions();
vSmoothField.oldTime().dimensions().reset(fieldSrc.dimensions());
vSmoothField.oldTime()=fieldSrc;
@ -176,7 +176,7 @@ void Foam::constDiffSmoothing::smoothenReferenceField(volVectorField& fieldSrc)
volVectorField vSmoothField = vSmoothField_;
vSmoothField.dimensions().reset(fieldSrc.dimensions());
vSmoothField.internalField()=fieldSrc.internalField();
vSmoothField.ref()=fieldSrc.internalField();
vSmoothField.correctBoundaryConditions();
vSmoothField.oldTime().dimensions().reset(fieldSrc.dimensions());
vSmoothField.oldTime()=fieldSrc;
@ -210,7 +210,7 @@ void Foam::constDiffSmoothing::smoothenReferenceField(volVectorField& fieldSrc)
forAll(vSmoothField,cellI)
{
if ( mag(vSmoothField.oldTime().internalField()[cellI]) > 0.0f) // have a vector in the OLD vSmoothField, so keep it!
NLarge()[cellI] = sourceStrength;
NLarge.ref()[cellI] = sourceStrength;
}
// do the smoothing

2
src/lagrangian/cfdemParticle/subModels/voidFractionModel/GaussVoidFraction/GaussVoidFraction.C
View File

@ -91,7 +91,7 @@ void GaussVoidFraction::setvoidFraction(double** const& mask,double**& voidfract
{
reAllocArrays();
voidfractionNext_.internalField()=1;
voidfractionNext_.ref()=1;
scalar radius(-1);
scalar volume(0);

2
src/lagrangian/cfdemParticle/subModels/voidFractionModel/IBVoidFraction/IBVoidFraction.C
View File

@ -96,7 +96,7 @@ void IBVoidFraction::setvoidFraction(double** const& mask,double**& voidfraction
reAllocArrays();
voidfractionNext_.internalField()=1;
voidfractionNext_.ref()=1;
for(int index=0; index< particleCloud_.numberOfParticles(); index++)
{

2
src/lagrangian/cfdemParticle/subModels/voidFractionModel/bigParticleVoidFraction/bigParticleVoidFraction.C
View File

@ -90,7 +90,7 @@ void bigParticleVoidFraction::setvoidFraction(double** const& mask,double**& voi
{
reAllocArrays();
voidfractionNext_.internalField()=1;
voidfractionNext_.ref()=1;
scalar radius(-1);
scalar volume(0);

8
src/lagrangian/cfdemParticle/subModels/voidFractionModel/voidFractionModel/voidFractionModel.C
View File

@ -127,19 +127,19 @@ tmp<volScalarField> Foam::voidFractionModel::voidFractionInterp() const
scalar tsf = particleCloud_.dataExchangeM().timeStepFraction();
if(1-tsf < 1e-4 && particleCloud_.dataExchangeM().couplingStep() > 1) //tsf==1
{
tsource() = voidfractionPrev_;
tsource.ref() = voidfractionPrev_;
}
else
{
tsource() = (1 - tsf) * voidfractionPrev_ + tsf * voidfractionNext_;
tsource.ref() = (1 - tsf) * voidfractionPrev_ + tsf * voidfractionNext_;
}
return tsource;
}
void Foam::voidFractionModel::resetVoidFractions() const
{
voidfractionPrev_.internalField() = voidfractionNext_.internalField();
voidfractionNext_.internalField() = 1;
voidfractionPrev_.ref() = voidfractionNext_.ref();
voidfractionNext_.ref() = 1;
}
/*void Foam::voidFractionModel::undoVoidFractions(double**const& mask) const