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

Merge with develop. Removed old rBaseMirrorVec which is now part of rBaseMirror.

Browse Source
This commit is contained in:
Thomas Lichtenegger
2021-07-08 11:36:54 +02:00
parent f8a6c9522a a5a811e436
commit e06069d49b
39 changed files with 112 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/solvers/cfdemSolverIB/Make/options
View File

@ -14,7 +14,8 @@ EXE_INC = \
-I$(LIB_SRC)/dynamicMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/dynamicMesh/dynamicMesh/lnInclude \
-I$(LIB_SRC)/fvOptions/lnInclude
-I$(LIB_SRC)/fvOptions/lnInclude \
-Wno-deprecated-copy
EXE_LIBS = \
-L$(CFDEM_LIB_DIR)\

1
applications/solvers/cfdemSolverMultiphase/Make/options
View File

@ -17,6 +17,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \
-Wno-deprecated-copy
EXE_LIBS = \
-L$(CFDEM_LIB_DIR)\

3
applications/solvers/cfdemSolverMultiphase/multiphaseMixture/Make/options
View File

@ -8,7 +8,8 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude
-I$(LIB_SRC)/meshTools/lnInclude \
-Wno-deprecated-copy
LIB_LIBS = \
-linterfaceProperties \

1
applications/solvers/cfdemSolverPiso/Make/options
View File

@ -10,6 +10,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \
-Wno-deprecated-copy
EXE_LIBS = \
-L$(CFDEM_LIB_DIR)\

1
applications/solvers/cfdemSolverPisoMS/Make/options
View File

@ -11,6 +11,7 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/singlePhaseTransportModel \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \
-Wno-deprecated-copy
EXE_LIBS = \
-L$(CFDEM_LIB_DIR)\

1
applications/solvers/cfdemSolverPisoScalar/Make/options
View File

@ -11,6 +11,7 @@ EXE_INC = \
-I../cfdemSolverPiso \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \
-Wno-deprecated-copy
EXE_LIBS = \
-L$(CFDEM_LIB_DIR)\

1
applications/solvers/cfdemSolverRhoPimple/Make/options
View File

@ -17,6 +17,7 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \
-Wno-deprecated-copy
EXE_LIBS = \
-L$(CFDEM_LIB_DIR)\

3
applications/solvers/cfdemSolverRhoPimpleChem/Make/options
View File

@ -28,8 +28,7 @@ EXE_INC = \
-I$(LIB_SRC)/ODE/lnInclude \
-I$(LIB_SRC)/combustionModels/lnInclude \
-I$(FOAM_SOLVERS)/combustion/reactingFoam \
-Wno-deprecated-copy
EXE_LIBS = \

1
applications/solvers/rStatAnalysis/Make/options
View File

@ -12,6 +12,7 @@ EXE_INC = \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \
-I$(CFDEM_SRC_DIR)/recurrence/lnInclude \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/derived/cfdemCloudRec \
-Wno-deprecated-copy
EXE_LIBS = \
-L$(CFDEM_LIB_DIR)\

1
applications/solvers/rcfdemSolverBase/Make/options
View File

@ -12,6 +12,7 @@ EXE_INC = \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \
-I$(CFDEM_SRC_DIR)/recurrence/lnInclude \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/derived/cfdemCloudRec \
-Wno-deprecated-copy
EXE_LIBS = \
-L$(CFDEM_LIB_DIR)\

1
applications/solvers/rcfdemSolverCoupledHeattransfer/Make/options
View File

@ -12,6 +12,7 @@ EXE_INC = \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \
-I$(CFDEM_SRC_DIR)/recurrence/lnInclude \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/derived/cfdemCloudRec \
-Wno-deprecated-copy
EXE_LIBS = \
-L$(CFDEM_LIB_DIR)\

1
applications/solvers/rcfdemSolverRhoSteadyPimple/Make/options
View File

@ -18,6 +18,7 @@ EXE_INC = \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \
-I$(CFDEM_SRC_DIR)/recurrence/lnInclude \
-Wno-deprecated-copy
EXE_LIBS = \
-L$(CFDEM_LIB_DIR)\

1
applications/solvers/rtfmSolverSpecies/Make/options
View File

@ -12,6 +12,7 @@ EXE_INC = \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \
-I$(CFDEM_SRC_DIR)/recurrence/lnInclude \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/derived/cfdemCloudRec \
-Wno-deprecated-copy
EXE_LIBS = \
-L$(CFDEM_LIB_DIR)\

1
applications/utilities/cfdemPostproc/Make/options
View File

@ -9,6 +9,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-Wno-deprecated-copy
EXE_LIBS = \

3
applications/utilities/rBaseMirror/rBaseMirror/Make/options
View File

@ -7,7 +7,8 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/fvOptions/lnInclude
-I$(LIB_SRC)/fvOptions/lnInclude \
-Wno-deprecated-copy
EXE_LIBS = \
-lfiniteVolume \

1
applications/utilities/rSmoother/Make/options
View File

@ -5,6 +5,7 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(CFDEM_SRC_DIR)/recurrence/lnInclude \
-Wno-deprecated-copy
EXE_LIBS = \
-L$(CFDEM_LIB_DIR)\

2
etc/bashrc
View File

@ -17,7 +17,7 @@
#------------------------------------------------------------------------------
export CFDEM_PROJECT=CFDEM
export CFDEM_VERSION=20.09
export CFDEM_VERSION=21.03
################################################################################
# USER EDITABLE PART: Changes made here may be lost with the next upgrade

2
etc/cshrc
View File

@ -15,7 +15,7 @@
#------------------------------------------------------------------------------
setenv CFDEM_PROJECT CFDEM
setenv CFDEM_VERSION 20.09
setenv CFDEM_VERSION 21.03
################################################################################
# USER EDITABLE PART: Changes made here may be lost with the next upgrade

3
src/finiteVolume/Make/options
View File

@ -4,7 +4,8 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-Wno-old-style-cast \
-Wno-unused-result \
-Wno-literal-suffix
-Wno-literal-suffix \
-Wno-deprecated-copy
LIB_LIBS = \
-lOpenFOAM \

3
src/lagrangian/cfdemParticle/Make/options
View File

@ -23,7 +23,8 @@ EXE_INC = \
-I$(CFDEM_SRC_DIR)/cfdTools \
-Wno-old-style-cast \
-Wno-unused-result \
-Wno-literal-suffix
-Wno-literal-suffix \
-Wno-deprecated-copy
LIB_LIBS = \

4
src/lagrangian/cfdemParticle/cfdTools/versionInfo.H
View File

@ -34,8 +34,8 @@ Description
#ifndef versionInfo_H
#define versionInfo_H
word CFDEMversion="PFM 20.09";
word compatibleLIGGGHTSversion="PFM 20.09";
word CFDEMversion="PFM 21.03";
word compatibleLIGGGHTSversion="PFM 21.03";
word OFversion="6";
Info << "\nCFDEMcoupling version: " << CFDEMversion << endl;

2
src/lagrangian/cfdemParticle/subModels/dataExchangeModel/twoWayMany2Many/library/Makefile.fedora_fpic
View File

@ -6,7 +6,7 @@ SHELL = /bin/sh
CC = mpic++
CCFLAGS = -O2 -fPIC \
-funroll-loops -fstrict-aliasing -Wall -Wextra -Wno-unused-result -Wno-unused-parameter -Wno-literal-suffix
-funroll-loops -fstrict-aliasing -Wall -Wextra -Wno-unused-result -Wno-unused-parameter -Wno-literal-suffix -Wno-cast-function-type
DEPFLAGS = -M
LINK = mpic++
LINKFLAGS = -O -fPIC

4
src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferGunn/heatTransferGunn.C
View File

@ -284,7 +284,7 @@ void heatTransferGunn::calcEnergyContribution()
vector Us(0,0,0);
scalar ds(0);
scalar ds_scaled(0);
scalar scaleDia3 = typeCG_[0]*typeCG_[0]*typeCG_[0];
scalar scaleDia3 = scaleDia_*scaleDia_*scaleDia_;
scalar muf(0);
scalar magUr(0);
scalar Rep(0);
@ -293,7 +293,7 @@ void heatTransferGunn::calcEnergyContribution()
scalar Tsum(0.0);
scalar Nsum(0.0);
scalar cg = typeCG_[0];
scalar cg = scaleDia_;
label partType = 1;
interpolationCellPoint<scalar> voidfractionInterpolator_(voidfraction_);

4
src/lagrangian/cfdemParticle/subModels/energyModel/heatTransferRanzMarshall/heatTransferRanzMarshall.C
View File

@ -284,7 +284,7 @@ void heatTransferRanzMarshall::calcEnergyContribution()
vector Us(0,0,0);
scalar ds(0);
scalar ds_scaled(0);
scalar scaleDia3 = typeCG_[0]*typeCG_[0]*typeCG_[0];
scalar scaleDia3 = scaleDia_*scaleDia_*scaleDia_;
scalar muf(0);
scalar magUr(0);
scalar Rep(0);
@ -293,7 +293,7 @@ void heatTransferRanzMarshall::calcEnergyContribution()
scalar Tsum(0.0);
scalar Nsum(0.0);
scalar cg = typeCG_[0];
scalar cg = scaleDia_;
label partType = 1;
interpolationCellPoint<scalar> voidfractionInterpolator_(voidfraction_);

5
src/lagrangian/cfdemParticle/subModels/forceModel/BeetstraDrag/BeetstraDrag.C
View File

@ -153,7 +153,6 @@ void BeetstraDrag::setForce() const
else if (particleCloud_.cg() > 1)
{
scaleDia_=particleCloud_.cg();
typeCG_[0] = scaleDia_;
Info << "Beetstra using scale from liggghts cg = " << scaleDia_ << endl;
}
@ -171,7 +170,7 @@ void BeetstraDrag::setForce() const
scalar ds(0);
scalar ds_scaled(0);
scalar dSauter(0);
scalar scaleDia3 = typeCG_[0]*typeCG_[0]*typeCG_[0];
scalar scaleDia3 = scaleDia_*scaleDia_*scaleDia_;
scalar nuf(0);
scalar rho(0);
scalar magUr(0);
@ -180,7 +179,7 @@ void BeetstraDrag::setForce() const
scalar GCcorr(1.);
scalar PCcorr(1.);
scalar cg = typeCG_[0];
scalar cg = scaleDia_;
label partType = 1;
vector dragExplicit(0,0,0);

4
src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ImEx/ImEx.H
View File

@ -77,10 +77,6 @@ public:
~ImEx();
// Member Functions
word myType() const{return typeName; };
};

1
src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/ScaleForce/ScaleForce.H
View File

@ -73,7 +73,6 @@ public:
void partToArray(label, vector&, const vector&, const vector& Ufluid=vector::zero, scalar Cd=scalar(0)) const;
word myType() const{return typeName; };
};

2
src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.C
View File

@ -192,7 +192,7 @@ void forceSubModel::explicitCorr
void forceSubModel::readSwitches()
{
Info << "\nreading switches for forceSubModel:" << myType() << endl;
Info << "\nreading switches for forceSubModel:" << type() << endl;
forAll(switchesNameList_,i)
{
if(switchesList_[i]) //check if switch is required

2
src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/forceSubModel/forceSubModel.H
View File

@ -158,8 +158,6 @@ public:
inline bool useParcelSizeDependentFilteredDrag() const { return switches_[SW_PARCEL_SIZE_DEPENDENT_FILTERED_DRAG]; }
virtual word myType() const = 0;
inline forceModel& myForceM() const { return forceModel_; }
inline const List<Switch>& switches() const { return switches_; }

1
src/lagrangian/cfdemParticle/subModels/forceModel/forceSubModels/scaleForceBoundary/scaleForceBoundary.H
View File

@ -85,7 +85,6 @@ public:
void partToArray(label, vector&, const vector&, const vector& Ufluid=vector::zero, scalar Cd=scalar(0)) const;
word myType() const {return typeName; }
};

3
src/lagrangian/cfdemParticleComp/Make/options
View File

@ -28,7 +28,8 @@ EXE_INC = \
-I$(CFDEM_SRC_DIR)/cfdTools \
-Wno-old-style-cast \
-Wno-unused-result \
-Wno-literal-suffix
-Wno-literal-suffix \
-Wno-deprecated-copy
LIB_LIBS = \
$(PLIBS) \

1
src/recurrence/Make/files
View File

@ -2,6 +2,7 @@ recBase/recBase.C
recModel/recModel/recModel.C
recModel/recModel/newRecModel.C
recModel/standardRecModel/standardRecModel.C
recModel/lruRecModel/lruRecModel.C
recNorm/recNorm/recNorm.C
recNorm/recNorm/newRecNorm.C
recNorm/diffNorm/diffNorm.C

1
src/recurrence/Make/options
View File

@ -18,6 +18,7 @@ EXE_INC = \
-I$(CFDEM_LIGGGHTS_SRC_DIR) \
-I$(CFDEM_M2MLIB_PATH) \
-I$(CFDEM_SRC_DIR)/cfdTools \
-Wno-deprecated-copy
LIB_LIBS = \

62
src/recurrence/recModel/gerhardsRecModel/gerhardsRecModel.C → src/recurrence/recModel/lruRecModel/lruRecModel.C
View File

@ -24,7 +24,7 @@ License
#include "error.H"
#include "Random.H"
#include "gerhardsRecModel.H"
#include "lruRecModel.H"
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -34,12 +34,12 @@ namespace Foam
// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
defineTypeNameAndDebug(gerhardsRecModel, 0);
defineTypeNameAndDebug(lruRecModel, 0);
addToRunTimeSelectionTable
(
recModel,
gerhardsRecModel,
lruRecModel,
dictionary
);
@ -47,7 +47,7 @@ addToRunTimeSelectionTable
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
// Construct from components
gerhardsRecModel::gerhardsRecModel
lruRecModel::lruRecModel
(
const dictionary& dict,
recBase& base
@ -161,12 +161,12 @@ gerhardsRecModel::gerhardsRecModel
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
gerhardsRecModel::~gerhardsRecModel()
lruRecModel::~lruRecModel()
{}
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
scalar gerhardsRecModel::checkTimeStep()
scalar lruRecModel::checkTimeStep()
{
// check time step of provided data
scalar dtCur(0.0);
@ -242,7 +242,7 @@ scalar gerhardsRecModel::checkTimeStep()
return dtCur;
}
void gerhardsRecModel::readFieldSeries()
void lruRecModel::readFieldSeries()
{
Info << "Checking all " << numRecFields() << " fields\n" << endl;
@ -497,7 +497,7 @@ void gerhardsRecModel::readFieldSeries()
}
void gerhardsRecModel::readTimeSeries()
void lruRecModel::readTimeSeries()
{
bool firsttime = true;
// fill the data structure for the time indices
@ -567,7 +567,7 @@ void gerhardsRecModel::readTimeSeries()
void gerhardsRecModel::fetchStateForDataBase(label index)
void lruRecModel::fetchStateForDataBase(label index)
{
if (verboseVerbose_)
{
@ -617,7 +617,7 @@ void gerhardsRecModel::fetchStateForDataBase(label index)
}
void gerhardsRecModel::updateStorageUsageList(label index)
void lruRecModel::updateStorageUsageList(label index)
{
if (verboseVerbose_)
{
@ -652,7 +652,7 @@ void gerhardsRecModel::updateStorageUsageList(label index)
}
void gerhardsRecModel::readNewSnapshot(label index, label oldIndex)
void lruRecModel::readNewSnapshot(label index, label oldIndex)
{
if (verboseVerbose_)
{
@ -764,19 +764,19 @@ void gerhardsRecModel::readNewSnapshot(label index, label oldIndex)
void gerhardsRecModel::exportVolScalarField(word fieldname, volScalarField& field)
void lruRecModel::exportVolScalarField(word fieldname, volScalarField& field)
{
field = exportVolScalarField(fieldname, virtualTimeIndex);
}
void gerhardsRecModel::exportVolVectorField(word fieldname, volVectorField& field)
void lruRecModel::exportVolVectorField(word fieldname, volVectorField& field)
{
field = exportVolVectorField(fieldname, virtualTimeIndex);
}
void gerhardsRecModel::exportSurfaceScalarField(word fieldname, surfaceScalarField& field)
void lruRecModel::exportSurfaceScalarField(word fieldname, surfaceScalarField& field)
{
field = exportSurfaceScalarField(fieldname, virtualTimeIndex);
}
@ -784,7 +784,7 @@ void gerhardsRecModel::exportSurfaceScalarField(word fieldname, surfaceScalarFie
const volScalarField& gerhardsRecModel::exportVolScalarField(word fieldname, label index)
const volScalarField& lruRecModel::exportVolScalarField(word fieldname, label index)
{
const label fieldI = getVolScalarFieldIndex(fieldname, index);
@ -814,7 +814,7 @@ const volScalarField& gerhardsRecModel::exportVolScalarField(word fieldname, lab
const volVectorField& gerhardsRecModel::exportVolVectorField(word fieldname, label index)
const volVectorField& lruRecModel::exportVolVectorField(word fieldname, label index)
{
const label fieldI = getVolVectorFieldIndex(fieldname, index);
@ -843,7 +843,7 @@ const volVectorField& gerhardsRecModel::exportVolVectorField(word fieldname, lab
return volVectorFieldList_[fieldI][storageIndex_[index]];
}
const surfaceScalarField& gerhardsRecModel::exportSurfaceScalarField(word fieldname, label index)
const surfaceScalarField& lruRecModel::exportSurfaceScalarField(word fieldname, label index)
{
const label fieldI = getSurfaceScalarFieldIndex(fieldname, index);
@ -867,21 +867,21 @@ const surfaceScalarField& gerhardsRecModel::exportSurfaceScalarField(word fieldn
}
PtrList<volScalarField>& gerhardsRecModel::exportVolScalarFieldList(word fieldname)
PtrList<volScalarField>& lruRecModel::exportVolScalarFieldList(word fieldname)
{
const label fieldI = getVolScalarFieldIndex(fieldname);
return volScalarFieldList_[fieldI];
}
PtrList<volVectorField>& gerhardsRecModel::exportVolVectorFieldList(word fieldname)
PtrList<volVectorField>& lruRecModel::exportVolVectorFieldList(word fieldname)
{
const label fieldI = getVolVectorFieldIndex(fieldname);
return volVectorFieldList_[fieldI];
}
PtrList<surfaceScalarField>& gerhardsRecModel::exportSurfaceScalarFieldList(word fieldname)
PtrList<surfaceScalarField>& lruRecModel::exportSurfaceScalarFieldList(word fieldname)
{
const label fieldI = getSurfaceScalarFieldIndex(fieldname);
@ -890,40 +890,40 @@ PtrList<surfaceScalarField>& gerhardsRecModel::exportSurfaceScalarFieldList(word
SymmetricSquareMatrix<scalar>& gerhardsRecModel::recurrenceMatrix()
SymmetricSquareMatrix<scalar>& lruRecModel::recurrenceMatrix()
{
return recurrenceMatrix_;
}
const HashTable<label,word>& gerhardsRecModel::timeIndexList() const
const HashTable<label,word>& lruRecModel::timeIndexList() const
{
return timeIndexList_;
}
label gerhardsRecModel::lowerSeqLim() const
label lruRecModel::lowerSeqLim() const
{
return lowerSeqLim_;
}
label gerhardsRecModel::upperSeqLim() const
label lruRecModel::upperSeqLim() const
{
return upperSeqLim_;
}
label gerhardsRecModel::numRecFields() const
label lruRecModel::numRecFields() const
{
return numRecFields_;
}
label gerhardsRecModel::numDataBaseFields() const
label lruRecModel::numDataBaseFields() const
{
return numDataBaseFields_;
}
void gerhardsRecModel::updateRecFields()
void lruRecModel::updateRecFields()
{
virtualTimeIndex=virtualTimeIndexNext;
virtualTimeIndexNext++;
@ -942,7 +942,7 @@ void gerhardsRecModel::updateRecFields()
}
void gerhardsRecModel::writeRecMatrix() const
void lruRecModel::writeRecMatrix() const
{
if (writeRecMat_)
{
@ -958,7 +958,7 @@ void gerhardsRecModel::writeRecMatrix() const
Switch gerhardsRecModel::checkSkipZero()
Switch lruRecModel::checkSkipZero()
{
if (skipZero_)
{
@ -983,7 +983,7 @@ Switch gerhardsRecModel::checkSkipZero()
// tmp<surfaceScalarField> gerhardsRecModel::exportAveragedSurfaceScalarField(word fieldname, scalar threshold, label index)
// tmp<surfaceScalarField> lruRecModel::exportAveragedSurfaceScalarField(word fieldname, scalar threshold, label index)
// {
// label timeIndex;
// if (index < 0)
@ -1021,7 +1021,7 @@ Switch gerhardsRecModel::checkSkipZero()
// return tAveragedSurfaceScalarField;
// }
void gerhardsRecModel::exportAveragedVolVectorField(volVectorField& smoothfield, word fieldname, scalar threshold, label index) const
void lruRecModel::exportAveragedVolVectorField(volVectorField& smoothfield, word fieldname, scalar threshold, label index) const
{
label timeIndex;
if (index < 0)

22
src/recurrence/recModel/gerhardsRecModel/gerhardsRecModel.H → src/recurrence/recModel/lruRecModel/lruRecModel.H
View File

@ -22,7 +22,7 @@ License
along with CFDEMcoupling academic. If not, see <http://www.gnu.org/licenses/>.
Class
Foam::gerhardsRecModel
Foam::lruRecModel
Description
A recurrence model for a dataBase with a smaller, or equal number of slots
@ -42,13 +42,13 @@ Description
\endverbatim
SourceFiles
gerhardsRecModelI.H
gerhardsRecModel.C
lruRecModelI.H
lruRecModel.C
\*---------------------------------------------------------------------------*/
#ifndef gerhardsRecModel_H
#define gerhardsRecModel_H
#ifndef lruRecModel_H
#define lruRecModel_H
#include "recModel.H"
@ -58,10 +58,10 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class gerhardsRecModel Declaration
Class lruRecModel Declaration
\*---------------------------------------------------------------------------*/
class gerhardsRecModel
class lruRecModel
:
public recModel
{
@ -119,13 +119,13 @@ protected:
public:
//- Runtime type information
TypeName("gerhardsRecModel");
TypeName("lruRecModel");
// Constructors
//- Construct from components
gerhardsRecModel
lruRecModel
(
const dictionary& dict,
recBase& base
@ -133,7 +133,7 @@ public:
// Destructor
~gerhardsRecModel();
~lruRecModel();
void exportVolScalarField(word, volScalarField&);
void exportVolVectorField(word, volVectorField&);
@ -204,7 +204,7 @@ private:
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#include "gerhardsRecModelI.H"
#include "lruRecModelI.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

18
src/recurrence/recModel/gerhardsRecModel/gerhardsRecModelI.H → src/recurrence/recModel/lruRecModel/lruRecModelI.H
View File

@ -24,11 +24,11 @@ License
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
inline Foam::label Foam::gerhardsRecModel::getVolScalarFieldIndex(word fieldname, label index) const
inline Foam::label Foam::lruRecModel::getVolScalarFieldIndex(word fieldname, label index) const
{
if(index < 0 || index > numRecFields_ - 1)
{
FatalError<<"gerhardsRecModel: Index out of bounds for volScalarField with name "
FatalError<<"lruRecModel: Index out of bounds for volScalarField with name "
<< fieldname << abort(FatalError);
}
@ -44,18 +44,18 @@ inline Foam::label Foam::gerhardsRecModel::getVolScalarFieldIndex(word fieldname
if (fieldI == -1)
{
FatalError<<"gerhardsRecModel: Could not find volScalarField with name "
FatalError<<"lruRecModel: Could not find volScalarField with name "
<< fieldname << abort(FatalError);
}
return fieldI;
}
inline Foam::label Foam::gerhardsRecModel::getVolVectorFieldIndex(word fieldname, label index) const
inline Foam::label Foam::lruRecModel::getVolVectorFieldIndex(word fieldname, label index) const
{
if(index < 0 || index > numRecFields_ - 1)
{
FatalError<<"gerhardsRecModel: Index out of bounds for volVectorField with name "
FatalError<<"lruRecModel: Index out of bounds for volVectorField with name "
<< fieldname << abort(FatalError);
}
@ -71,18 +71,18 @@ inline Foam::label Foam::gerhardsRecModel::getVolVectorFieldIndex(word fieldname
if (fieldI == -1)
{
FatalError<<"gerhardsRecModel: Could not find volVectorField with name "
FatalError<<"lruRecModel: Could not find volVectorField with name "
<< fieldname << abort(FatalError);
}
return fieldI;
}
inline Foam::label Foam::gerhardsRecModel::getSurfaceScalarFieldIndex(word fieldname, label index) const
inline Foam::label Foam::lruRecModel::getSurfaceScalarFieldIndex(word fieldname, label index) const
{
if(index < 0 || index > numRecFields_ - 1)
{
FatalError<<"gerhardsRecModel: Index out of bounds for surfaceScalarField with name "
FatalError<<"lruRecModel: Index out of bounds for surfaceScalarField with name "
<< fieldname << abort(FatalError);
}
@ -98,7 +98,7 @@ inline Foam::label Foam::gerhardsRecModel::getSurfaceScalarFieldIndex(word field
if (fieldI == -1)
{
FatalError<<"gerhardsRecModel: Could not find surfaceScalarField with name "
FatalError<<"lruRecModel: Could not find surfaceScalarField with name "
<< fieldname << abort(FatalError);
}

16
tutorials/rStatAnalysis/testingLargeIncompleteDataBases/.gitignore vendored Normal file
View File

@ -0,0 +1,16 @@
[0-9]*
!0.org
*/polyMesh
*.log
log.*
*.txt
*.aux
*.pdf
*.dat
recMat/myDistMatrix.tex
recurrenceMatrix
recurrencePath

4
tutorials/rStatAnalysis/testingLargeIncompleteDataBases/constant/recProperties
View File

@ -28,7 +28,7 @@ FoamFile
//recModel standardRecModel;
recModel gerhardsRecModel;
recModel lruRecModel;
verbose false;
@ -64,7 +64,7 @@ standardRecModelProps
skipZero on;
}
gerhardsRecModelProps
lruRecModelProps
{
dataBase ".";

6
tutorials/rStatAnalysis/testingLargeIncompleteDataBases/system/fvSolution
View File

@ -80,11 +80,13 @@ PIMPLE
residualControl
{
U
/*U
{
relTol 0;
tolerance 0.00001;
}
}*/
relTol 0;
tolerance 0.00001;
}
}