zhyang-dev/CFDEMcoupling-PFM
1
0
Fork 0
mirror of https://github.com/ParticulateFlow/CFDEMcoupling-PFM.git synced 2025-12-08 06:37:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

retain backward compatibility with OF4

Browse Source
This commit is contained in:
danielque
2020-08-06 20:02:56 +02:00
parent 3b29d96c05
commit a83d0290c9
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lagrangian/cfdemParticle/subModels/forceModel/Fines/FinesFields.C
View File

@ -54,7 +54,11 @@ FinesFields::FinesFields
velFieldName_(propsDict_.lookupOrDefault<word>("velFieldName","U")), velFieldName_(propsDict_.lookupOrDefault<word>("velFieldName","U")),
U_(sm.mesh().lookupObject<volVectorField> (velFieldName_)), U_(sm.mesh().lookupObject<volVectorField> (velFieldName_)),
voidfractionFieldName_(propsDict_.lookupOrDefault<word>("voidfractionFieldName","voidfraction")), voidfractionFieldName_(propsDict_.lookupOrDefault<word>("voidfractionFieldName","voidfraction")),
#if OPENFOAM_VERSION_MAJOR < 5
voidfraction_(const_cast<volScalarField&>(sm.mesh().lookupObject<volScalarField>(voidfractionFieldName_))),
#else
voidfraction_(sm.mesh().lookupObjectRef<volScalarField> (voidfractionFieldName_)), voidfraction_(sm.mesh().lookupObjectRef<volScalarField> (voidfractionFieldName_)),
#endif
UsFieldName_(propsDict_.lookupOrDefault<word>("granVelFieldName","Us")), UsFieldName_(propsDict_.lookupOrDefault<word>("granVelFieldName","Us")),
UsField_(sm.mesh().lookupObject<volVectorField> (UsFieldName_)), UsField_(sm.mesh().lookupObject<volVectorField> (UsFieldName_)),
pFieldName_(propsDict_.lookupOrDefault<word>("pFieldName","p")), pFieldName_(propsDict_.lookupOrDefault<word>("pFieldName","p")),

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

@ -102,7 +102,7 @@ particleCellVolume::particleCellVolume
if(writeToFile_) if(writeToFile_)
{ {
fileName path(particleCloud_.IOM().createTimeDir("postProcessing/particleCellVolume")); fileName path(particleCloud_.IOM().createTimeDir("postProcessing/particleCellVolume"));
filePtr_ = new OFstream(path/"particleCellVolume.txt"); filePtr_.set(new OFstream(path/"particleCellVolume.txt"));
filePtr_() << "# time | total particle volume in cells | total volume of cells with particles | average volume fraction | min(voidfraction) | max(voidfraction)" << endl; filePtr_() << "# time | total particle volume in cells | total volume of cells with particles | average volume fraction | min(voidfraction) | max(voidfraction)" << endl;
} }
} }

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

@ -131,7 +131,7 @@ volWeightedAverage::volWeightedAverage
if(writeToFile_) if(writeToFile_)
{ {
fileName path(particleCloud_.IOM().createTimeDir("postProcessing/volWeightedAverage")); fileName path(particleCloud_.IOM().createTimeDir("postProcessing/volWeightedAverage"));
filePtr_ = new OFstream(path/"volWeightedAverage.txt"); filePtr_.set(new OFstream(path/"volWeightedAverage.txt"));
} }
} }