diff --git a/applications/solvers/cfdemSolverMultiphaseScalar/Allwclean b/applications/solvers/cfdemSolverMultiphaseScalar/Allwclean index 1c8a5a68..8f8e3fe7 100755 --- a/applications/solvers/cfdemSolverMultiphaseScalar/Allwclean +++ b/applications/solvers/cfdemSolverMultiphaseScalar/Allwclean @@ -2,7 +2,7 @@ cd ${0%/*} || exit 1 # Run from this directory set -x -wclean libso multiphaseMixture +wclean libso multiphaseMixtureScalar wclean #------------------------------------------------------------------------------ diff --git a/applications/solvers/cfdemSolverMultiphaseScalar/Allwmake b/applications/solvers/cfdemSolverMultiphaseScalar/Allwmake index fbe71a59..2e60481b 100755 --- a/applications/solvers/cfdemSolverMultiphaseScalar/Allwmake +++ b/applications/solvers/cfdemSolverMultiphaseScalar/Allwmake @@ -6,7 +6,7 @@ targetType=libso . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments set -x -wmake $targetType multiphaseMixture +wmake $targetType multiphaseMixtureScalar wmake #------------------------------------------------------------------------------ diff --git a/applications/solvers/cfdemSolverMultiphaseScalar/Make/options b/applications/solvers/cfdemSolverMultiphaseScalar/Make/options index 72a134ad..ce909f3b 100644 --- a/applications/solvers/cfdemSolverMultiphaseScalar/Make/options +++ b/applications/solvers/cfdemSolverMultiphaseScalar/Make/options @@ -6,7 +6,7 @@ include $(CFDEM_ADD_LIBS_DIR)/additionalLibs EXE_INC = \ $(PFLAGS) \ -I$(CFDEM_OFVERSION_DIR) \ - -ImultiphaseMixture/lnInclude \ + -ImultiphaseMixtureScalar/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ diff --git a/applications/solvers/cfdemSolverMultiphaseScalar/cfdemSolverMultiphaseScalar.C b/applications/solvers/cfdemSolverMultiphaseScalar/cfdemSolverMultiphaseScalar.C index 504450fc..0ce0ae16 100644 --- a/applications/solvers/cfdemSolverMultiphaseScalar/cfdemSolverMultiphaseScalar.C +++ b/applications/solvers/cfdemSolverMultiphaseScalar/cfdemSolverMultiphaseScalar.C @@ -30,7 +30,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "multiphaseMixture.H" +#include "multiphaseMixtureScalar.H" #include "turbulentTransportModel.H" #include "pimpleControl.H" #include "fvOptions.H" diff --git a/applications/solvers/cfdemSolverMultiphaseScalar/createFields.H b/applications/solvers/cfdemSolverMultiphaseScalar/createFields.H index 009bd16d..d3b65ec2 100644 --- a/applications/solvers/cfdemSolverMultiphaseScalar/createFields.H +++ b/applications/solvers/cfdemSolverMultiphaseScalar/createFields.H @@ -88,7 +88,7 @@ surfaceScalarField phi linearInterpolate(U*voidfraction) & mesh.Sf() ); -multiphaseMixture mixture(U, phi, voidfraction); +multiphaseMixtureScalar mixture(U, phi, voidfraction); // Need to store rho for ddt(rho, U) volScalarField rho diff --git a/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/Make/files b/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/Make/files similarity index 83% rename from applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/Make/files rename to applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/Make/files index 998255e4..91bbae6b 100644 --- a/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/Make/files +++ b/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/Make/files @@ -1,5 +1,5 @@ phase/phase.C alphaContactAngle/alphaContactAngleFvPatchScalarField.C -multiphaseMixture.C +multiphaseMixtureScalar.C LIB = $(CFDEM_LIB_DIR)/libcfdemMultiphaseInterFoamScalar diff --git a/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/Make/options b/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/Make/options similarity index 100% rename from applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/Make/options rename to applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/Make/options diff --git a/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/alphaContactAngle/alphaContactAngleFvPatchScalarField.C similarity index 100% rename from applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C rename to applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/alphaContactAngle/alphaContactAngleFvPatchScalarField.C diff --git a/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.H b/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/alphaContactAngle/alphaContactAngleFvPatchScalarField.H similarity index 96% rename from applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.H rename to applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/alphaContactAngle/alphaContactAngleFvPatchScalarField.H index 09249c72..bbad25b3 100644 --- a/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.H +++ b/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/alphaContactAngle/alphaContactAngleFvPatchScalarField.H @@ -26,7 +26,7 @@ Class Description Contact-angle boundary condition for multi-phase interface-capturing - simulations. Used in conjuction with multiphaseMixture. + simulations. Used in conjuction with multiphaseMixtureScalar. SourceFiles alphaContactAngleFvPatchScalarField.C @@ -37,7 +37,7 @@ SourceFiles #define alphaContactAngleFvPatchScalarField_H #include "zeroGradientFvPatchFields.H" -#include "multiphaseMixture.H" +#include "multiphaseMixtureScalar.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -117,8 +117,8 @@ public: typedef HashTable < interfaceThetaProps, - multiphaseMixture::interfacePair, - multiphaseMixture::interfacePair::hash + multiphaseMixtureScalar::interfacePair, + multiphaseMixtureScalar::interfacePair::hash > thetaPropsTable; diff --git a/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/multiphaseMixture.C b/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/multiphaseMixtureScalar.C similarity index 93% rename from applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/multiphaseMixture.C rename to applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/multiphaseMixtureScalar.C index 9d6cc130..0445368f 100644 --- a/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/multiphaseMixture.C +++ b/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/multiphaseMixtureScalar.C @@ -18,7 +18,7 @@ License \*---------------------------------------------------------------------------*/ -#include "multiphaseMixture.H" +#include "multiphaseMixtureScalar.H" #include "alphaContactAngleFvPatchScalarField.H" #include "Time.H" #include "subCycle.H" @@ -31,13 +31,13 @@ License // * * * * * * * * * * * * * * * Static Member Data * * * * * * * * * * * * // -const Foam::scalar Foam::multiphaseMixture::convertToRad = +const Foam::scalar Foam::multiphaseMixtureScalar::convertToRad = Foam::constant::mathematical::pi/180.0; // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -void Foam::multiphaseMixture::calcAlphas() +void Foam::multiphaseMixtureScalar::calcAlphas() { scalar level = 0.0; alphas_ == 0.0; @@ -51,7 +51,7 @@ void Foam::multiphaseMixture::calcAlphas() Foam::tmp -Foam::multiphaseMixture::calcNu() const +Foam::multiphaseMixtureScalar::calcNu() const { PtrDictionary::const_iterator iter = phases_.begin(); @@ -74,7 +74,7 @@ Foam::multiphaseMixture::calcNu() const } Foam::tmp -Foam::multiphaseMixture::calcStf() const +Foam::multiphaseMixtureScalar::calcStf() const { tmp tstf ( @@ -134,7 +134,7 @@ Foam::multiphaseMixture::calcStf() const // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::multiphaseMixture::multiphaseMixture +Foam::multiphaseMixtureScalar::multiphaseMixtureScalar ( const volVectorField& U, const surfaceScalarField& phi, @@ -230,7 +230,7 @@ Foam::multiphaseMixture::multiphaseMixture // * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * // Foam::tmp -Foam::multiphaseMixture::rho() const +Foam::multiphaseMixtureScalar::rho() const { PtrDictionary::const_iterator iter = phases_.begin(); @@ -247,7 +247,7 @@ Foam::multiphaseMixture::rho() const Foam::tmp -Foam::multiphaseMixture::rho(const label patchi) const +Foam::multiphaseMixtureScalar::rho(const label patchi) const { PtrDictionary::const_iterator iter = phases_.begin(); @@ -264,9 +264,9 @@ Foam::multiphaseMixture::rho(const label patchi) const Foam::tmp -Foam::multiphaseMixture::mu() const +Foam::multiphaseMixtureScalar::mu() const { - Info << "In multiphasemixture mu()" << endl; + Info << "In multiphaseMixtureScalar mu()" << endl; return rho()*nu(); // PtrDictionary::const_iterator iter = phases_.begin(); @@ -283,7 +283,7 @@ Foam::multiphaseMixture::mu() const Foam::tmp -Foam::multiphaseMixture::mu(const label patchi) const +Foam::multiphaseMixtureScalar::mu(const label patchi) const { PtrDictionary::const_iterator iter = phases_.begin(); @@ -306,7 +306,7 @@ Foam::multiphaseMixture::mu(const label patchi) const Foam::tmp -Foam::multiphaseMixture::muf() const +Foam::multiphaseMixtureScalar::muf() const { return nuf()*fvc::interpolate(rho()); @@ -327,13 +327,13 @@ Foam::multiphaseMixture::muf() const Foam::tmp -Foam::multiphaseMixture::nu() const +Foam::multiphaseMixtureScalar::nu() const { return nu_; } Foam::tmp -Foam::multiphaseMixture::nu(const label patchi) const +Foam::multiphaseMixtureScalar::nu(const label patchi) const { //return nu_.boundaryField()[patchi]; PtrDictionary::const_iterator iter = phases_.begin(); @@ -355,7 +355,7 @@ Foam::multiphaseMixture::nu(const label patchi) const Foam::tmp -Foam::multiphaseMixture::nuf() const +Foam::multiphaseMixtureScalar::nuf() const { //return muf()/fvc::interpolate(rho()); PtrDictionary::const_iterator iter = phases_.begin(); @@ -374,7 +374,7 @@ Foam::multiphaseMixture::nuf() const } Foam::tmp -Foam::multiphaseMixture::Cp() const +Foam::multiphaseMixtureScalar::Cp() const { PtrDictionary::const_iterator iter = phases_.begin(); @@ -395,7 +395,7 @@ Foam::multiphaseMixture::Cp() const } Foam::tmp -Foam::multiphaseMixture::kf() const +Foam::multiphaseMixtureScalar::kf() const { PtrDictionary::const_iterator iter = phases_.begin(); @@ -417,7 +417,7 @@ Foam::multiphaseMixture::kf() const } Foam::tmp -Foam::multiphaseMixture::D() const +Foam::multiphaseMixtureScalar::D() const { PtrDictionary::const_iterator iter = phases_.begin(); @@ -439,7 +439,7 @@ Foam::multiphaseMixture::D() const } Foam::tmp -Foam::multiphaseMixture::Cs() const +Foam::multiphaseMixtureScalar::Cs() const { PtrDictionary::const_iterator iter = phases_.begin(); @@ -456,7 +456,7 @@ Foam::multiphaseMixture::Cs() const } Foam::tmp -Foam::multiphaseMixture::diffusionCorrection() const +Foam::multiphaseMixtureScalar::diffusionCorrection() const { surfaceScalarField numerator @@ -517,7 +517,7 @@ Foam::multiphaseMixture::diffusionCorrection() const return correction; } -void Foam::multiphaseMixture::solve() +void Foam::multiphaseMixtureScalar::solve() { correct(); @@ -570,7 +570,7 @@ void Foam::multiphaseMixture::solve() } -void Foam::multiphaseMixture::correct() +void Foam::multiphaseMixtureScalar::correct() { forAllIter(PtrDictionary, phases_, iter) { @@ -579,7 +579,7 @@ void Foam::multiphaseMixture::correct() } -Foam::tmp Foam::multiphaseMixture::nHatfv +Foam::tmp Foam::multiphaseMixtureScalar::nHatfv ( const volScalarField& alpha1, const volScalarField& alpha2 @@ -605,7 +605,7 @@ Foam::tmp Foam::multiphaseMixture::nHatfv } -Foam::tmp Foam::multiphaseMixture::nHatf +Foam::tmp Foam::multiphaseMixtureScalar::nHatf ( const volScalarField& alpha1, const volScalarField& alpha2 @@ -622,7 +622,7 @@ Foam::tmp Foam::multiphaseMixture::nHatf // The dynamic contact angle is calculated from the component of the // velocity on the direction of the interface, parallel to the wall. -void Foam::multiphaseMixture::correctContactAngle +void Foam::multiphaseMixtureScalar::correctContactAngle ( const phase& alpha1, const phase& alpha2, @@ -726,7 +726,7 @@ void Foam::multiphaseMixture::correctContactAngle } -Foam::tmp Foam::multiphaseMixture::K +Foam::tmp Foam::multiphaseMixtureScalar::K ( const phase& alpha1, const phase& alpha2 @@ -742,7 +742,7 @@ Foam::tmp Foam::multiphaseMixture::K Foam::tmp -Foam::multiphaseMixture::nearInterface() const +Foam::multiphaseMixtureScalar::nearInterface() const { tmp tnearInt ( @@ -768,7 +768,7 @@ Foam::multiphaseMixture::nearInterface() const } -void Foam::multiphaseMixture::solveAlphas +void Foam::multiphaseMixtureScalar::solveAlphas ( const scalar cAlpha ) @@ -901,7 +901,7 @@ void Foam::multiphaseMixture::solveAlphas } -bool Foam::multiphaseMixture::read() +bool Foam::multiphaseMixtureScalar::read() { if (transportModel::read()) { diff --git a/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/multiphaseMixture.H b/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/multiphaseMixtureScalar.H similarity index 96% rename from applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/multiphaseMixture.H rename to applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/multiphaseMixtureScalar.H index 5fe5a939..f1fbd153 100644 --- a/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/multiphaseMixture.H +++ b/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/multiphaseMixtureScalar.H @@ -17,10 +17,10 @@ License Copyright (C) 2018- Mathias Vångö, JKU Linz, Austria Class - multiphaseMixture + multiphaseMixtureScalar Description - This class is based on the OpenFOAM(R) Foam::multiphaseMixture class, + This class is based on the OpenFOAM(R) Foam::multiphaseMixtureScalar class, which is an incompressible multi-phase mixture with built in solution for the phase fractions with interface compression for interface-capturing. It has been extended to include the void fraction in the volume fraction @@ -33,11 +33,11 @@ Description between each phase-pair. SourceFiles - multiphaseMixture.C + multiphaseMixtureScalar.C \*---------------------------------------------------------------------------*/ -#ifndef multiphaseMixture_H -#define multiphaseMixture_H +#ifndef multiphaseMixtureScalar_H +#define multiphaseMixtureScalar_H #include "incompressible/transportModel/transportModel.H" #include "IOdictionary.H" @@ -52,10 +52,10 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class multiphaseMixture Declaration + Class multiphaseMixtureScalar Declaration \*---------------------------------------------------------------------------*/ -class multiphaseMixture +class multiphaseMixtureScalar : public IOdictionary, public transportModel @@ -191,7 +191,7 @@ public: // Constructors //- Construct from components - multiphaseMixture + multiphaseMixtureScalar ( const volVectorField& U, const surfaceScalarField& phi, @@ -200,7 +200,7 @@ public: //- Destructor - virtual ~multiphaseMixture() + virtual ~multiphaseMixtureScalar() {} diff --git a/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/phase/phase.C b/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/phase/phase.C similarity index 100% rename from applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/phase/phase.C rename to applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/phase/phase.C diff --git a/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/phase/phase.H b/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/phase/phase.H similarity index 98% rename from applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/phase/phase.H rename to applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/phase/phase.H index 8237f374..0bab2d57 100644 --- a/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixture/phase/phase.H +++ b/applications/solvers/cfdemSolverMultiphaseScalar/multiphaseMixtureScalar/phase/phase.H @@ -26,7 +26,7 @@ Class Description Single incompressible phase derived from the phase-fraction. - Used as part of the multiPhaseMixture for interface-capturing multi-phase + Used as part of the multiphaseMixtureScalar for interface-capturing multi-phase simulations. SourceFiles diff --git a/applications/solvers/cfdemSolverPisoFreeStreaming/Make/options b/applications/solvers/cfdemSolverPisoFreeStreaming/Make/options index ef370ae5..3b6c16f4 100644 --- a/applications/solvers/cfdemSolverPisoFreeStreaming/Make/options +++ b/applications/solvers/cfdemSolverPisoFreeStreaming/Make/options @@ -12,7 +12,8 @@ EXE_INC = \ -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/lnInclude \ -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/cfdTools \ -I$(CFDEM_SRC_DIR)/lagrangian/cfdemParticle/derived/cfdemCloudRec \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/sampling/lnInclude \ + -Wno-deprecated-copy EXE_LIBS = \ -L$(CFDEM_LIB_DIR)\ diff --git a/applications/solvers/cfdemSolverRhoPimple/EEqn.H b/applications/solvers/cfdemSolverRhoPimple/EEqn.H index 11c69f91..ddc6348f 100644 --- a/applications/solvers/cfdemSolverRhoPimple/EEqn.H +++ b/applications/solvers/cfdemSolverRhoPimple/EEqn.H @@ -51,8 +51,4 @@ thermo.correct(); Info<< "T max/min/ave : " << max(T).value() << " " << min(T).value() << " " << average(T).value() << endl; - - particleCloud.clockM().start(31,"energySolve"); - particleCloud.solve(); - particleCloud.clockM().stop("energySolve"); } diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/EEqn.H b/applications/solvers/cfdemSolverRhoPimpleChem/EEqn.H index efcf6fa1..292e1d5b 100644 --- a/applications/solvers/cfdemSolverRhoPimpleChem/EEqn.H +++ b/applications/solvers/cfdemSolverRhoPimpleChem/EEqn.H @@ -55,8 +55,4 @@ fvScalarMatrix EEqn Info << "Cpv :" << max(Cpv).value() << " " << min(Cpv).value() << endl; Info<< "T max/min : " << max(T).value() << " " << min(T).value() << endl; Info << "he max/min : " << max(he).value() << " " << min(he).value() << endl; - - particleCloud.clockM().start(31,"energySolve"); - particleCloud.solve(); - particleCloud.clockM().stop("energySolve"); } diff --git a/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H b/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H index d5daf875..674efed4 100644 --- a/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H +++ b/applications/solvers/cfdemSolverRhoPimpleChem/createFields.H @@ -303,18 +303,4 @@ mesh, dimensionedScalar("zero",dimensionSet(0, -3, 0, 0, 1),0) ); - - volScalarField dSauter - ( - IOobject - ( - "dSauter", - runTime.timeName(), - mesh, - IOobject::READ_IF_PRESENT, - IOobject::AUTO_WRITE - ), - mesh, - dimensionedScalar("zero",dimensionSet(0, 1, 0, 0, 0,0,0),0) - ); //=============================== diff --git a/applications/solvers/rcfdemSolverCoupledHeattransfer/TEqImp.H b/applications/solvers/rcfdemSolverCoupledHeattransfer/TEqn.H similarity index 76% rename from applications/solvers/rcfdemSolverCoupledHeattransfer/TEqImp.H rename to applications/solvers/rcfdemSolverCoupledHeattransfer/TEqn.H index c79de93c..b5d5bca9 100644 --- a/applications/solvers/rcfdemSolverCoupledHeattransfer/TEqImp.H +++ b/applications/solvers/rcfdemSolverCoupledHeattransfer/TEqn.H @@ -1,4 +1,4 @@ - volScalarField rhoeps = rhoRec*voidfractionRec; + rhoeps = rhoRec*voidfractionRec; particleCloud.energyContributions(Qsource); @@ -23,10 +23,17 @@ fvOptions(rhoeps, T) // no fvOptions support yet ); - fvOptions.constrain(TEqn); // no fvOptions support yet + // fvOptions.constrain(TEqn); // no fvOptions support yet + + TEqn.relax(); TEqn.solve(); + T = max(T, TMin); + T = min(T, TMax); + + Info<< "T max/min/ave : " << max(T).value() << " " << min(T).value() << " " << average(T).value() << endl; + particleCloud.clockM().start(31,"postFlow"); counter++; diff --git a/applications/solvers/rcfdemSolverCoupledHeattransfer/createFields.H b/applications/solvers/rcfdemSolverCoupledHeattransfer/createFields.H index 4fe8e7b1..34d727f4 100644 --- a/applications/solvers/rcfdemSolverCoupledHeattransfer/createFields.H +++ b/applications/solvers/rcfdemSolverCoupledHeattransfer/createFields.H @@ -73,6 +73,9 @@ dimensionedVector("zero", dimensionSet(0, 1, -1, 0, 0), vector::zero) ); + volScalarField rhoeps("rhoeps", rhoRec*voidfractionRec); + rhoeps.oldTime(); // switch on saving old time + // heat transfer fields Info << "\nCreating heat transfer fields.\n" << endl; @@ -228,3 +231,25 @@ ) ); weightDict.add("weights",scalarList(1,1.0)); + + dimensionedScalar TMax + ( + dimensionedScalar::lookupOrDefault + ( + "TMax", + transportProps, + dimTemperature, + GREAT + ) + ); + + dimensionedScalar TMin + ( + dimensionedScalar::lookupOrDefault + ( + "TMin", + transportProps, + dimTemperature, + 0.0 + ) + ); diff --git a/applications/solvers/rcfdemSolverCoupledHeattransfer/rcfdemSolverCoupledHeattransfer.C b/applications/solvers/rcfdemSolverCoupledHeattransfer/rcfdemSolverCoupledHeattransfer.C index c54e1f76..c6feec14 100644 --- a/applications/solvers/rcfdemSolverCoupledHeattransfer/rcfdemSolverCoupledHeattransfer.C +++ b/applications/solvers/rcfdemSolverCoupledHeattransfer/rcfdemSolverCoupledHeattransfer.C @@ -98,7 +98,7 @@ int main(int argc, char *argv[]) particleCloud.clockM().start(26,"Flow"); #include "updateRho.H" - #include "TEqImp.H" + #include "TEqn.H" particleCloud.clockM().stop("Flow"); stepCounter++; diff --git a/applications/solvers/rcfdemSolverCoupledHeattransfer/updateRho.H b/applications/solvers/rcfdemSolverCoupledHeattransfer/updateRho.H index 63c7da64..0dd3249e 100644 --- a/applications/solvers/rcfdemSolverCoupledHeattransfer/updateRho.H +++ b/applications/solvers/rcfdemSolverCoupledHeattransfer/updateRho.H @@ -1 +1,2 @@ -rhoRec = pRec / (T * R); \ No newline at end of file +dimensionedScalar Tave = T.weightedAverage(voidfractionRec); +rhoRec = pRec / (Tave * R); diff --git a/applications/solvers/rcfdemSolverForcedTracers/Make/options b/applications/solvers/rcfdemSolverForcedTracers/Make/options index 9443c2f8..bb12e544 100644 --- a/applications/solvers/rcfdemSolverForcedTracers/Make/options +++ b/applications/solvers/rcfdemSolverForcedTracers/Make/options @@ -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)\ @@ -24,4 +25,4 @@ EXE_LIBS = \ -lfvOptions \ -l$(CFDEM_LIB_NAME) \ $(CFDEM_ADD_LIB_PATHS) \ -$(CFDEM_ADD_LIBS) + $(CFDEM_ADD_LIBS) diff --git a/applications/solvers/rcfdemSolverRhoSteadyPimple/EEqn.H b/applications/solvers/rcfdemSolverRhoSteadyPimple/EEqn.H index d4011345..130ec961 100644 --- a/applications/solvers/rcfdemSolverRhoSteadyPimple/EEqn.H +++ b/applications/solvers/rcfdemSolverRhoSteadyPimple/EEqn.H @@ -60,9 +60,4 @@ thermo.correct(); Info<< "T max/min : " << max(T).value() << " " << min(T).value() << endl; - - - particleCloud.clockM().start(31,"energySolve"); - particleCloud.solve(); - particleCloud.clockM().stop("energySolve"); } diff --git a/applications/solvers/rcfdemSolverRhoSteadyPimpleChem/EEqn.H b/applications/solvers/rcfdemSolverRhoSteadyPimpleChem/EEqn.H index 576fe6a4..c524365d 100644 --- a/applications/solvers/rcfdemSolverRhoSteadyPimpleChem/EEqn.H +++ b/applications/solvers/rcfdemSolverRhoSteadyPimpleChem/EEqn.H @@ -59,9 +59,4 @@ thermo.correct(); Info<< "T max/min : " << max(T).value() << " " << min(T).value() << endl; - - - particleCloud.clockM().start(31,"energySolve"); - particleCloud.solve(); - particleCloud.clockM().stop("energySolve"); } diff --git a/applications/solvers/rcfdemSolverRhoSteadyPimpleChem/Make/options b/applications/solvers/rcfdemSolverRhoSteadyPimpleChem/Make/options index 9290ba36..bfb52167 100644 --- a/applications/solvers/rcfdemSolverRhoSteadyPimpleChem/Make/options +++ b/applications/solvers/rcfdemSolverRhoSteadyPimpleChem/Make/options @@ -27,6 +27,7 @@ EXE_INC = \ -I$(LIB_SRC)/ODE/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude \ -I$(CFDEM_SRC_DIR)/recurrence/lnInclude \ + -Wno-deprecated-copy EXE_LIBS = \ -L$(CFDEM_LIB_DIR)\ diff --git a/applications/solvers/rctfSpeciesTransport/Make/options b/applications/solvers/rctfSpeciesTransport/Make/options index 686f676c..bb12e544 100755 --- a/applications/solvers/rctfSpeciesTransport/Make/options +++ b/applications/solvers/rctfSpeciesTransport/Make/options @@ -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)\ diff --git a/applications/utilities/displacementField/displacementField.C b/applications/utilities/displacementField/displacementField.C index 6f7be11e..ad73aaed 100644 --- a/applications/utilities/displacementField/displacementField.C +++ b/applications/utilities/displacementField/displacementField.C @@ -37,11 +37,19 @@ Application // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // void findPairs(labelList &, labelList &, labelPairList &); void findPairsUnordered(labelList &, labelList &, labelPairList &); -void fillEmptyCells(fvMesh &, label, label, labelList &, volVectorField &, volVectorField &, scalarList &, volVectorField &, volVectorField &, bool, scalar); -void nearestNeighborCells(fvMesh &, label, label, label, labelList &, labelList &); -void normalizeFields(labelList &, volVectorField &, volVectorField &); -void readDump(std::string, labelList &, vectorList &); +void fillEmptyCells(fvMesh &, label, label, scalarList &, volVectorField &, volVectorField &, scalarList &, volVectorField &, volVectorField &, bool, scalar); +void nearestNeighborCells(fvMesh &, label, label, label, scalarList &, labelList &); +void normalizeFields(scalarList &, volVectorField &, volVectorField &); +void readDump(std::string, labelList &, scalarList &, vectorList &); scalar weightFun(scalar); +label maxNumParticles = 1000000; +scalar minVol = 1e-12; +scalar Pi43 = 4.1888; +label posIndex = -1; +label posRad = -1; +label posX = -1; +label posY = -1; +label posZ = -1; int main(int argc, char *argv[]) { @@ -88,6 +96,11 @@ int main(int argc, char *argv[]) label dumpIndexDisplacementIncrement(readLabel(displacementProperties.lookup("dumpIndexDisplacementIncrement"))); label nNeighMin(readLabel(displacementProperties.lookup("nNeighMin"))); label maxSearchLayers(displacementProperties.lookupOrDefault