diff --git a/applications/solvers/compressible/sonicFoam/UEqn.H b/applications/solvers/compressible/sonicFoam/UEqn.H new file mode 100644 index 0000000000..25506783ae --- /dev/null +++ b/applications/solvers/compressible/sonicFoam/UEqn.H @@ -0,0 +1,8 @@ +fvVectorMatrix UEqn +( + fvm::ddt(rho, U) + + fvm::div(phi, U) + + turbulence->divDevRhoReff(U) +); + +solve(UEqn == -fvc::grad(p)); diff --git a/applications/solvers/compressible/sonicFoam/compressibleContinuityErrs.H b/applications/solvers/compressible/sonicFoam/compressibleContinuityErrs.H deleted file mode 100644 index 128d99c946..0000000000 --- a/applications/solvers/compressible/sonicFoam/compressibleContinuityErrs.H +++ /dev/null @@ -1,12 +0,0 @@ -{ -# include "rhoEqn.H" -} -{ - scalar sumLocalContErr = (sum(mag(rho - psi*p))/sum(rho)).value(); - scalar globalContErr = (sum(rho - psi*p)/sum(rho)).value(); - cumulativeContErr += globalContErr; - - Info<< "time step continuity errors : sum local = " << sumLocalContErr - << ", global = " << globalContErr - << ", cumulative = " << cumulativeContErr << endl; -} diff --git a/applications/solvers/compressible/sonicFoam/createFields.H b/applications/solvers/compressible/sonicFoam/createFields.H index bbb5d10526..5d03dd2bb7 100644 --- a/applications/solvers/compressible/sonicFoam/createFields.H +++ b/applications/solvers/compressible/sonicFoam/createFields.H @@ -7,7 +7,7 @@ basicPsiThermo& thermo = pThermo(); volScalarField& p = thermo.p(); - volScalarField& h = thermo.h(); + volScalarField& e = thermo.e(); const volScalarField& psi = thermo.psi(); volScalarField rho @@ -35,7 +35,7 @@ mesh ); -# include "compressibleCreatePhi.H" + #include "compressibleCreatePhi.H" Info<< "Creating turbulence model\n" << endl; @@ -49,7 +49,3 @@ thermo ) ); - - Info<< "Creating field DpDt\n" << endl; - volScalarField DpDt = - fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p); diff --git a/applications/solvers/compressible/sonicFoam/eEqn.H b/applications/solvers/compressible/sonicFoam/eEqn.H new file mode 100644 index 0000000000..1d1d6aef0b --- /dev/null +++ b/applications/solvers/compressible/sonicFoam/eEqn.H @@ -0,0 +1,12 @@ +{ + solve + ( + fvm::ddt(rho, e) + + fvm::div(phi, e) + - fvm::laplacian(turbulence->alphaEff(), e) + == + - p*fvc::div(phi/fvc::interpolate(rho)) + ); + + thermo.correct(); +} diff --git a/applications/solvers/compressible/sonicFoam/hEqn.H b/applications/solvers/compressible/sonicFoam/hEqn.H deleted file mode 100644 index baa2dab343..0000000000 --- a/applications/solvers/compressible/sonicFoam/hEqn.H +++ /dev/null @@ -1,12 +0,0 @@ -{ - solve - ( - fvm::ddt(rho, h) - + fvm::div(phi, h) - - fvm::laplacian(turbulence->alphaEff(), h) - == - DpDt - ); - - thermo.correct(); -} diff --git a/applications/solvers/compressible/sonicFoam/pEqn.H b/applications/solvers/compressible/sonicFoam/pEqn.H new file mode 100644 index 0000000000..96a500d4c2 --- /dev/null +++ b/applications/solvers/compressible/sonicFoam/pEqn.H @@ -0,0 +1,37 @@ +rho = thermo.rho(); + +volScalarField rUA = 1.0/UEqn.A(); +U = rUA*UEqn.H(); + +surfaceScalarField phid +( + "phid", + fvc::interpolate(psi) + *( + (fvc::interpolate(U) & mesh.Sf()) + + fvc::ddtPhiCorr(rUA, rho, U, phi) + ) +); + +for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) +{ + fvScalarMatrix pEqn + ( + fvm::ddt(psi, p) + + fvm::div(phid, p) + - fvm::laplacian(rho*rUA, p) + ); + + pEqn.solve(); + + if (nonOrth == nNonOrthCorr) + { + phi = pEqn.flux(); + } +} + +#include "rhoEqn.H" +#include "compressibleContinuityErrs.H" + +U -= rUA*fvc::grad(p); +U.correctBoundaryConditions(); diff --git a/applications/solvers/compressible/sonicFoam/readThermodynamicProperties.H b/applications/solvers/compressible/sonicFoam/readThermodynamicProperties.H deleted file mode 100644 index 1fc57fc5fd..0000000000 --- a/applications/solvers/compressible/sonicFoam/readThermodynamicProperties.H +++ /dev/null @@ -1,23 +0,0 @@ - Info<< "Reading thermodynamicProperties\n" << endl; - - IOdictionary thermodynamicProperties - ( - IOobject - ( - "thermodynamicProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ, - IOobject::NO_WRITE - ) - ); - - dimensionedScalar R - ( - thermodynamicProperties.lookup("R") - ); - - dimensionedScalar Cv - ( - thermodynamicProperties.lookup("Cv") - ); diff --git a/applications/solvers/compressible/sonicFoam/readTransportProperties.H b/applications/solvers/compressible/sonicFoam/readTransportProperties.H deleted file mode 100644 index 1502e2033a..0000000000 --- a/applications/solvers/compressible/sonicFoam/readTransportProperties.H +++ /dev/null @@ -1,18 +0,0 @@ - Info<< "Reading transportProperties\n" << endl; - - IOdictionary transportProperties - ( - IOobject - ( - "transportProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ, - IOobject::NO_WRITE - ) - ); - - dimensionedScalar mu - ( - transportProperties.lookup("mu") - ); diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C index c9eda00fa3..df100262ef 100644 --- a/applications/solvers/compressible/sonicFoam/sonicFoam.C +++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C @@ -58,64 +58,21 @@ int main(int argc, char *argv[]) #include "rhoEqn.H" - fvVectorMatrix UEqn - ( - fvm::ddt(rho, U) - + fvm::div(phi, U) - + turbulence->divDevRhoReff(U) - ); + #include "UEqn.H" - solve(UEqn == -fvc::grad(p)); - - #include "hEqn.H" + #include "eEqn.H" // --- PISO loop for (int corr=0; corrcorrect(); - rho = psi*p; + rho = thermo.rho(); runTime.write(); diff --git a/applications/test/speed/Make/files b/applications/test/speed/Make/files deleted file mode 100644 index 84a6d2fa62..0000000000 --- a/applications/test/speed/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -speedTest.C - -EXE = $(FOAM_USER_APPBIN)/speedTest diff --git a/applications/test/speed/Make/options b/applications/test/speed/Make/options deleted file mode 100644 index e680561987..0000000000 --- a/applications/test/speed/Make/options +++ /dev/null @@ -1 +0,0 @@ -EXE_INC = /* -ffast-math -mtune=core2 */ diff --git a/applications/test/speed/scalarSpeedTest/Make/files b/applications/test/speed/scalarSpeedTest/Make/files new file mode 100644 index 0000000000..dae64db89f --- /dev/null +++ b/applications/test/speed/scalarSpeedTest/Make/files @@ -0,0 +1,3 @@ +scalarSpeedTest.C + +EXE = $(FOAM_USER_APPBIN)/scalarSpeedTest diff --git a/applications/test/speed/scalarSpeedTest/Make/options b/applications/test/speed/scalarSpeedTest/Make/options new file mode 100644 index 0000000000..e69de29bb2 diff --git a/applications/test/speed/scalarSpeedTest/scalarSpeedTest.C b/applications/test/speed/scalarSpeedTest/scalarSpeedTest.C new file mode 100644 index 0000000000..e1858e2d42 --- /dev/null +++ b/applications/test/speed/scalarSpeedTest/scalarSpeedTest.C @@ -0,0 +1,192 @@ +#include "primitiveFields.H" +#include "Random.H" +#include "cpuTime.H" +#include "IOstreams.H" +#include "OFstream.H" + +using namespace Foam; + +int main() +{ + Info<< "Initialising fields" << endl; + + const label nIter = 100; + const label size = 10000000; + const label rndAddrSkip = 40; + const label redFac = 6; + const label redSize = size/redFac; + Random genAddr(100); + + double* f1 = new double[size]; + double* f2 = new double[size]; + double* f3 = new double[size]; + double* f4 = new double[size]; + double* fr = new double[redSize]; + label* addr = new label[size]; + label* redAddr = new label[size]; + label* redAddr2 = new label[size]; + + for (register label i=0; i is a 1D array of objects of type 'Type', - where the size of the array is known and used for subscript - bounds checking, etc. - -\*---------------------------------------------------------------------------*/ - -#ifdef List_FOR_ALL - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#undef List_FOR_ALL -#undef List_END_FOR_ALL -#undef List_ELEM -#undef List_ACCESS -#undef List_CONST_ACCESS - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C index 6418537b02..11d997dd3f 100644 --- a/src/OpenFOAM/containers/Lists/PtrList/PtrList.C +++ b/src/OpenFOAM/containers/Lists/PtrList/PtrList.C @@ -27,7 +27,6 @@ License #include "error.H" #include "PtrList.H" -#include "PtrListLoopM.H" #include "SLPtrList.H" // * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/containers/Lists/PtrList/PtrListLoopM.H b/src/OpenFOAM/containers/Lists/PtrList/PtrListLoopM.H deleted file mode 100644 index cbd6fd10df..0000000000 --- a/src/OpenFOAM/containers/Lists/PtrList/PtrListLoopM.H +++ /dev/null @@ -1,56 +0,0 @@ -/*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 1991-2009 OpenCFD Ltd. - \\/ M anipulation | -------------------------------------------------------------------------------- -License - This file is part of OpenFOAM. - - OpenFOAM is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the - Free Software Foundation; either version 2 of the License, or (at your - option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM; if not, write to the Free Software Foundation, - Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -Description - simple generic PtrList MACROS for looping - -\*---------------------------------------------------------------------------*/ - -#ifndef PtrListLoop_H -#define PtrListLoop_H - -#include "undefListLoopM.H" - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -// Element access looping using [] for vector and parallel machines - -#define List_FOR_ALL(f, i) \ - forAll(f, i) \ - { \ - -#define List_END_FOR_ALL } - -#define List_ELEM(f, fp, i) ((f)[i]) - -#define List_ACCESS(type, f, fp) -#define List_CONST_ACCESS(type, f, fp) - - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -#endif - -// ************************************************************************* // diff --git a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C index 02015efb9b..bed0214749 100644 --- a/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C +++ b/src/OpenFOAM/containers/Lists/UPtrList/UPtrList.C @@ -27,7 +27,6 @@ License #include "error.H" #include "UPtrList.H" -#include "PtrListLoopM.H" // * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * * // diff --git a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C index 67cb86e193..db24d88042 100644 --- a/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C +++ b/src/OpenFOAM/fields/Fields/symmTransformField/symmTransformField.C @@ -50,7 +50,7 @@ void transform { TFOR_ALL_F_OP_FUNC_F_F ( - Type, rtf, =, transform, tensor, trf, Type, tf + Type, rtf, =, transform, symmTensor, trf, Type, tf ) } } diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C index 05958edf68..cb376fde10 100644 --- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C +++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrixATmul.C @@ -67,38 +67,15 @@ void Foam::lduMatrix::Amul register const label nCells = diag().size(); for (register label cell=0; cell Foam::lduMatrix::H1() const for (register label face=0; face=0; face--) { - #ifdef ICC_IA64_PREFETCH - __builtin_prefetch (&uPtr[face-95],0,0); - __builtin_prefetch (&lPtr[face-95],0,0); - __builtin_prefetch (&rDPtr[lPtr[face-16]],0,1); - __builtin_prefetch (&wAPtr[lPtr[face-16]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-16]],0,1); - __builtin_prefetch (&rDPtr[lPtr[face-24]],0,1); - __builtin_prefetch (&wAPtr[lPtr[face-24]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-24]],0,1); - __builtin_prefetch (&rDPtr[lPtr[face-32]],0,1); - __builtin_prefetch (&wAPtr[lPtr[face-32]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-32]],0,1); - #endif - wAPtr[lPtr[face]] -= rDPtr[lPtr[face]]*upperPtr[face]*wAPtr[uPtr[face]]; } } diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/DILUPreconditioner/DILUPreconditioner.C b/src/OpenFOAM/matrices/lduMatrix/preconditioners/DILUPreconditioner/DILUPreconditioner.C index 5193acb5eb..4fdebcd9c5 100644 --- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/DILUPreconditioner/DILUPreconditioner.C +++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/DILUPreconditioner/DILUPreconditioner.C @@ -72,30 +72,15 @@ void Foam::DILUPreconditioner::calcReciprocalD register label nFaces = matrix.upper().size(); for (register label face=0; face=0; face--) { - #ifdef ICC_IA64_PREFETCH - __builtin_prefetch (&uPtr[face-95],0,0); - __builtin_prefetch (&lPtr[face-95],0,0); - __builtin_prefetch (&upperPtr[face-95],0,1); - __builtin_prefetch (&rDPtr[lPtr[face-16]],0,1); - __builtin_prefetch (&wAPtr[lPtr[face-16]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-16]],0,1); - __builtin_prefetch (&rDPtr[lPtr[face-24]],0,1); - __builtin_prefetch (&wAPtr[lPtr[face-24]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-24]],0,1); - __builtin_prefetch (&rDPtr[lPtr[face-32]],0,1); - __builtin_prefetch (&wAPtr[lPtr[face-32]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-32]],0,1); - #endif - wAPtr[lPtr[face]] -= rDPtr[lPtr[face]]*upperPtr[face]*wAPtr[uPtr[face]]; } @@ -210,46 +163,20 @@ void Foam::DILUPreconditioner::preconditionT register label nFaces = solver_.matrix().upper().size(); register label nFacesM1 = nFaces - 1; - #ifdef ICC_IA64_PREFETCH - #pragma ivdep - #endif - for (register label cell=0; cell=0; face--) { sface = losortPtr[face]; diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.C b/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.C index 9b17ef902d..db4a51c4b7 100644 --- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.C +++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/FDICPreconditioner/FDICPreconditioner.C @@ -66,47 +66,17 @@ Foam::FDICPreconditioner::FDICPreconditioner for (register label face=0; face=0; face--) { - #ifdef ICC_IA64_PREFETCH - __builtin_prefetch (&uPtr[face-95],0,0); - __builtin_prefetch (&lPtr[face-95],0,0); - __builtin_prefetch (&rDlUpperPtr[face-95],0,0); - __builtin_prefetch (&wAPtr[lPtr[face-16]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-16]],0,1); - __builtin_prefetch (&wAPtr[lPtr[face-24]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-24]],0,1); - __builtin_prefetch (&wAPtr[lPtr[face-32]],0,1); - __builtin_prefetch (&wAPtr[uPtr[face-32]],0,1); - #endif - wAPtr[lPtr[face]] -= rDlUpperPtr[face]*wAPtr[uPtr[face]]; } } diff --git a/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.C b/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.C index e5a32fa168..04ccc2add0 100644 --- a/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.C +++ b/src/OpenFOAM/matrices/lduMatrix/preconditioners/diagonalPreconditioner/diagonalPreconditioner.C @@ -58,18 +58,9 @@ Foam::diagonalPreconditioner::diagonalPreconditioner register label nCells = rD.size(); - #ifdef ICC_IA64_PREFETCH - #pragma ivdep - #endif - // Generate reciprocal diagonal for (register label cell=0; cell +Foam::eConstThermo::eConstThermo(Istream& is) : - specieThermo(is), + equationOfState(is), Cv_(readScalar(is)), Hf_(readScalar(is)) { @@ -41,9 +42,15 @@ Foam::eConstThermo::eConstThermo(Istream& is) // * * * * * * * * * * * * * * * Ostream Operator * * * * * * * * * * * * * // -Foam::Ostream& Foam::operator<<(Ostream& os, const eConstThermo& ct) +template +Foam::Ostream& Foam::operator<< +( + Ostream& os, + const eConstThermo& ct +) { - os << (const specieThermo&)ct << tab << ct.Cv_ << tab << ct.Hf_; + os << static_cast(ct) << tab + << ct.Cv_ << tab << ct.Hf_; os.check("Ostream& operator<<(Ostream& os, const eConstThermo& ct)"); return os; diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H index c01600eabd..6d9bef7423 100644 --- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H +++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermo.H @@ -26,8 +26,8 @@ Class Foam::eConstThermo Description - Constant properties thermodynamics package derived from the basic - thermo package data type specieThermo. + Constant properties thermodynamics package templated on an equation of + state SourceFiles eConstThermoI.H @@ -86,12 +86,13 @@ Ostream& operator<< /*---------------------------------------------------------------------------*\ - Class eConstThermo Declaration + Class eConstThermo Declaration \*---------------------------------------------------------------------------*/ +template class eConstThermo : - public specieThermo + public equationOfState { // Private data @@ -104,7 +105,7 @@ class eConstThermo //- Construct from components inline eConstThermo ( - const specieThermo& st, + const equationOfState& st, const scalar cv, const scalar hf ); @@ -147,20 +148,10 @@ public: inline scalar s(const scalar T) const; - // Some derived properties - // Other derived properties obtained from specieThermo base type - - //- Temperature from Enthalpy given an initial temperature T0 - inline scalar TH(const scalar h, const scalar T0) const; - - //- Temperature from internal energy given an initial temperature T0 - inline scalar TE(const scalar e, const scalar T0) const; - - // Member operators - inline void operator+=(const hConstThermo&); - inline void operator-=(const hConstThermo&); + inline void operator+=(const eConstThermo&); + inline void operator-=(const eConstThermo&); // Friend operators @@ -194,7 +185,8 @@ public: friend Ostream& operator<< ( - Ostream&, const eConstThermo& + Ostream&, + const eConstThermo& ); }; @@ -207,6 +199,10 @@ public: #include "eConstThermoI.H" +#ifdef NoRepository +# include "eConstThermo.C" +#endif + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // #endif diff --git a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H index aba6da1eef..8e021c53ab 100644 --- a/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H +++ b/src/thermophysicalModels/specie/thermo/eConst/eConstThermoI.H @@ -26,14 +26,15 @@ License // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // -inline Foam::eConstThermo::eConstThermo +template +inline Foam::eConstThermo::eConstThermo ( - const specieThermo& st, + const equationOfState& st, const scalar cv, const scalar hf ) : - specieThermo(st), + equationOfState(st), Cv_(cv), Hf_(hf) {} @@ -41,20 +42,21 @@ inline Foam::eConstThermo::eConstThermo // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -inline Foam::eConstThermo::eConstThermo +template +inline Foam::eConstThermo::eConstThermo ( const word& name, - const eConstThermo& ct + const eConstThermo& ct ) : - specieThermo(name, ct), + equationOfState(name, ct), Cv_(ct.Cv_), Hf_(ct.Hf_) {} template -inline Foam::autoPtr > +inline Foam::autoPtr > Foam::eConstThermo::clone() const { return autoPtr > @@ -65,7 +67,7 @@ Foam::eConstThermo::clone() const template -inline autoPtr > +inline Foam::autoPtr > Foam::eConstThermo::New(Istream& is) { return autoPtr > @@ -77,19 +79,31 @@ Foam::eConstThermo::New(Istream& is) // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -inline Foam::scalar Foam::eConstThermo::cp(const scalar) const +template +inline Foam::scalar Foam::eConstThermo::cp +( + const scalar +) const { - return Cv_*W() + RR; + return Cv_*this->W() + specie::RR; } -inline Foam::scalar Foam::eConstThermo::h(const scalar T) const +template +inline Foam::scalar Foam::eConstThermo::h +( + const scalar T +) const { - return cp(T)*T + Hf_*W(); + return cp(T)*T + Hf_*this->W(); } -inline Foam::scalar Foam::eConstThermo::hs(const scalar T) const +template +inline Foam::scalar Foam::eConstThermo::hs +( + const scalar T +) const { return cp(T)*T; } @@ -102,104 +116,126 @@ inline Foam::scalar Foam::eConstThermo::hc() const } -inline Foam::scalar Foam::eConstThermo::s(const scalar T) const +template +inline Foam::scalar Foam::eConstThermo::s +( + const scalar T +) const { notImplemented("scalar eConstThermo::s(const scalar T) const"); return T; } -inline Foam::scalar Foam::eConstThermo::TH -( - const scalar h, - const scalar T0 -) const -{ - return (h - Hf_)/Cp(T0); -} - - -inline Foam::scalar Foam::eConstThermo::TE -( - const scalar e, - const scalar -) const -{ - return (e - Hf_)/Cv_; -} - - // * * * * * * * * * * * * * * * Member Operators * * * * * * * * * * * * * // -inline Foam::eConstThermo& Foam::eConstThermo::operator= +template +inline void Foam::eConstThermo::operator+= ( - const eConstThermo& ct + const eConstThermo& ct ) { - specieThermo::operator=(ct); + scalar molr1 = this->nMoles(); - Cv_ = ct.Cv_; - Hf_ = ct.Hf_; + equationOfState::operator+=(ct); - return *this; + molr1 /= this->nMoles(); + scalar molr2 = ct.nMoles()/this->nMoles(); + + Cv_ = molr1*Cv_ + molr2*ct.Cv_; + Hf_ = molr1*Hf_ + molr2*ct.Hf_; +} + + +template +inline void Foam::eConstThermo::operator-= +( + const eConstThermo& ct +) +{ + scalar molr1 = this->nMoles(); + + equationOfState::operator-=(ct); + + molr1 /= this->nMoles(); + scalar molr2 = ct.nMoles()/this->nMoles(); + + Cv_ = molr1*Cv_ - molr2*ct.Cv_; + Hf_ = molr1*Hf_ - molr2*ct.Hf_; } // * * * * * * * * * * * * * * * Friend Operators * * * * * * * * * * * * * // -inline Foam::eConstThermo Foam::operator+ +template +inline Foam::eConstThermo Foam::operator+ ( - const eConstThermo& ct1, - const eConstThermo& ct2 + const eConstThermo& ct1, + const eConstThermo& ct2 ) { - specieThermo st(((const specieThermo&)ct1) + ((const specieThermo&)ct2)); - - return eConstThermo + equationOfState eofs ( - st, - ct1.nMoles()/st.nMoles()*ct1.Cv_ + ct2.nMoles()/st.nMoles()*ct2.Cv_, - ct1.nMoles()/st.nMoles()*ct1.Hf_ + ct2.nMoles()/st.nMoles()*ct2.Hf_ + static_cast(ct1) + + static_cast(ct2) + ); + + return eConstThermo + ( + eofs, + ct1.nMoles()/eofs.nMoles()*ct1.Cv_ + + ct2.nMoles()/eofs.nMoles()*ct2.Cv_, + ct1.nMoles()/eofs.nMoles()*ct1.Hf_ + + ct2.nMoles()/eofs.nMoles()*ct2.Hf_ ); } -inline Foam::eConstThermo Foam::operator- +template +inline Foam::eConstThermo Foam::operator- ( - const eConstThermo& ct1, - const eConstThermo& ct2 + const eConstThermo& ct1, + const eConstThermo& ct2 ) { - specieThermo st(((const specieThermo&)ct1) - ((const specieThermo&)ct2)); - - return eConstThermo + equationOfState eofs ( - st, - ct1.nMoles()/st.nMoles()*ct1.Cv_ - ct2.nMoles()/st.nMoles()*ct2.Cv_, - ct1.nMoles()/st.nMoles()*ct1.Hf_ - ct2.nMoles()/st.nMoles()*ct2.Hf_ + static_cast(ct1) + - static_cast(ct2) + ); + + return eConstThermo + ( + eofs, + ct1.nMoles()/eofs.nMoles()*ct1.Cv_ + - ct2.nMoles()/eofs.nMoles()*ct2.Cv_, + ct1.nMoles()/eofs.nMoles()*ct1.Hf_ + - ct2.nMoles()/eofs.nMoles()*ct2.Hf_ ); } -inline Foam::eConstThermo Foam::operator* +template +inline Foam::eConstThermo Foam::operator* ( const scalar s, - const eConstThermo& ct + const eConstThermo& ct ) { - return eConstThermo + return eConstThermo ( - s*((const specieThermo&)ct), + s*static_cast(ct), ct.Cv_, ct.Hf_ ); } -inline Foam::eConstThermo Foam::operator== +template +inline Foam::eConstThermo Foam::operator== ( - const eConstThermo& ct1, - const eConstThermo& ct2 + const eConstThermo& ct1, + const eConstThermo& ct2 ) { return ct2 - ct1; diff --git a/tutorials/combustion/XiFoam/les/Allrun b/tutorials/combustion/XiFoam/les/Allrun new file mode 100755 index 0000000000..e43b54e4e3 --- /dev/null +++ b/tutorials/combustion/XiFoam/les/Allrun @@ -0,0 +1,17 @@ +#!/bin/sh +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +# Get application name from directory +application="XiFoam" + +cases=" \ +pitzDaily \ +pitzDaily3D +" + +for i in $cases; do + blockMesh -case $i + $application -case $i +done + diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs new file mode 100644 index 0000000000..9a83c0337e --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object alphaSgs; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + inlet + { + type zeroGradient; + } + + outlet + { + type zeroGradient; + } + + upperWall + { + type zeroGradient; + } + + lowerWall + { + type zeroGradient; + } + + frontAndBack + { + type empty; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs new file mode 100644 index 0000000000..c5331748ae --- /dev/null +++ b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs @@ -0,0 +1,49 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5 | +| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class volScalarField; + object alphaSgs; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +dimensions [1 -1 -1 0 0 0 0]; + +internalField uniform 0; + +boundaryField +{ + inlet + { + type zeroGradient; + } + + outlet + { + type zeroGradient; + } + + upperWall + { + type zeroGradient; + } + + lowerWall + { + type zeroGradient; + } + + frontAndBack + { + type cyclic; + } +} + +// ************************************************************************* // diff --git a/tutorials/combustion/XiFoam/Allclean b/tutorials/combustion/XiFoam/ras/Allclean similarity index 100% rename from tutorials/combustion/XiFoam/Allclean rename to tutorials/combustion/XiFoam/ras/Allclean diff --git a/tutorials/combustion/XiFoam/Allrun b/tutorials/combustion/XiFoam/ras/Allrun similarity index 100% rename from tutorials/combustion/XiFoam/Allrun rename to tutorials/combustion/XiFoam/ras/Allrun diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/alphat b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat index 2684dd73c8..c56c4724ce 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/alphat +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/alphat @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -23,7 +23,7 @@ boundaryField { walls { - type alphatWallFunction; + type compressible::alphatWallFunction; value uniform 0; } } diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon b/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon index e9dd46eb33..e38ed02784 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/epsilon @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -23,7 +23,7 @@ boundaryField { walls { - type epsilonWallFunction; + type compressible::epsilonWallFunction; value uniform 90; } } diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/k b/tutorials/combustion/dieselFoam/aachenBomb/0/k index 251a39ce81..b037171c72 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/k +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/k @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -23,7 +23,7 @@ boundaryField { walls { - type kQRWallFunction; + type compressible::kQRWallFunction; value uniform 1; } } diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/mut b/tutorials/combustion/dieselFoam/aachenBomb/0/mut index e687f9b8fa..2750ce32ec 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/mut +++ b/tutorials/combustion/dieselFoam/aachenBomb/0/mut @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/combustion/dieselFoam/aachenBomb/0/spray b/tutorials/combustion/dieselFoam/aachenBomb/0/spray deleted file mode 100644 index c5f9cb2f59..0000000000 --- a/tutorials/combustion/dieselFoam/aachenBomb/0/spray +++ /dev/null @@ -1,20 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object spray; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -( -) - -// ************************************************************************* // diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties index be340ec092..72c8fd655e 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/chemistryProperties @@ -15,9 +15,11 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +psiChemistryModel ODEChemistryModel; + chemistry off; -chemistrySolver ODE; +chemistrySolver ode; initialChemicalTimeStep 1e-07; @@ -32,7 +34,7 @@ EulerImplicitCoeffs equilibriumRateLimiter off; } -ODECoeffs +odeCoeffs { ODESolver SIBS; eps 0.05; diff --git a/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties b/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties index 2423823385..f94afe7312 100644 --- a/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties +++ b/tutorials/combustion/dieselFoam/aachenBomb/constant/thermophysicalProperties @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hMixtureThermo; +thermoType hPsiMixtureThermo>; CHEMKINFile "$FOAM_CASE/chemkin/chem.inp"; diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat index f609fa6c14..dc2104f83c 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/alphat @@ -23,22 +23,22 @@ boundaryField { front { - type alphatWallFunction; + type compressible::alphatWallFunction; value uniform 0; } back { - type alphatWallFunction; + type compressible::alphatWallFunction; value uniform 0; } wall { - type alphatWallFunction; + type compressible::alphatWallFunction; value uniform 0; } porosityWall { - type alphatWallFunction; + type compressible::alphatWallFunction; value uniform 0; } inlet diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon index 502e048957..e4dccfe577 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/epsilon @@ -23,27 +23,27 @@ boundaryField { front { - type epsilonWallFunction; + type compressible::epsilonWallFunction; value uniform 200; } back { - type epsilonWallFunction; + type compressible::epsilonWallFunction; value uniform 200; } wall { - type epsilonWallFunction; + type compressible::epsilonWallFunction; value uniform 200; } porosityWall { - type epsilonWallFunction; + type compressible::epsilonWallFunction; value uniform 200; } inlet { - type turbulentMixingLengthDissipationRateInlet; + type compressible::turbulentMixingLengthDissipationRateInlet; mixingLength 0.005; value uniform 200; } diff --git a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k index 6171b9506b..36be49f2ea 100644 --- a/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k +++ b/tutorials/compressible/rhoPimpleFoam/angledDuct/0/k @@ -23,22 +23,22 @@ boundaryField { front { - type kQRWallFunction; + type compressible::kQRWallFunction; value uniform 1; } back { - type kQRWallFunction; + type compressible::kQRWallFunction; value uniform 1; } wall { - type kQRWallFunction; + type compressible::kQRWallFunction; value uniform 1; } porosityWall { - type kQRWallFunction; + type compressible::kQRWallFunction; value uniform 1; } inlet diff --git a/tutorials/compressible/sonicFoam/Allrun b/tutorials/compressible/sonicFoam/Allrun new file mode 100755 index 0000000000..4f1a1e464a --- /dev/null +++ b/tutorials/compressible/sonicFoam/Allrun @@ -0,0 +1,5 @@ +#!/bin/sh +set -x + +(cd laminar && ./Allrun) +(cd ras && ./Allrun) diff --git a/tutorials/compressible/sonicFoam/laminar/Allrun b/tutorials/compressible/sonicFoam/laminar/Allrun new file mode 100755 index 0000000000..573ff3a12d --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/Allrun @@ -0,0 +1,22 @@ +#!/bin/sh +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +# Get application name from directory +application=sonicFoam + +cases=" \ +forwardStep \ +shockTube \ +" +for case in $cases +do + (cd $case && runApplication blockMesh) +# + if [ "$case" = "shockTube" ] ; then + (cd $case && ./Allrun) + else + (cd $case && runApplication $application) + fi +# +done diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties new file mode 100644 index 0000000000..82d43de570 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermophysicalProperties @@ -0,0 +1,23 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType ePsiThermo>>>>; + +mixture air 1 11640.31 1.78571 0 0 0.7; + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/transportProperties b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/turbulenceProperties similarity index 84% rename from tutorials/compressible/sonicFoam/laminar/shockTube/constant/transportProperties rename to tutorials/compressible/sonicFoam/laminar/forwardStep/constant/turbulenceProperties index 1e9d5be60c..c2c3b28a1b 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/transportProperties +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/turbulenceProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -11,11 +11,11 @@ FoamFile format ascii; class dictionary; location "constant"; - object transportProperties; + object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -mu mu [ 1 -1 -1 0 0 0 0 ] 0; +simulationType laminar; // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes index 1c36c50aa6..6bebe35dfb 100644 --- a/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes +++ b/tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes @@ -30,17 +30,19 @@ gradSchemes divSchemes { default none; - div(phi,U) Gauss limitedLinearV 1; + div(phi,U) Gauss upwind; div(phid,p) Gauss limitedLinear 1; div(phi,e) Gauss limitedLinear 1; + div(phiU,p) Gauss limitedLinear 1; + div((muEff*dev2(grad(U).T()))) Gauss linear 1; } laplacianSchemes { default none; - laplacian(mu,U) Gauss linear corrected; - laplacian(mu,e) Gauss linear corrected; laplacian((rho*(1|A(U))),p) Gauss linear corrected; + laplacian(muEff,U) Gauss linear corrected; + laplacian(alphaEff,e) Gauss linear corrected; } interpolationSchemes diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties new file mode 100644 index 0000000000..2560f39757 --- /dev/null +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties @@ -0,0 +1,23 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object thermophysicalProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +thermoType ePsiThermo>>>>; + +mixture air 1 28.9 717.5 0 0 0.7; + + +// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/transportProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/turbulenceProperties similarity index 84% rename from tutorials/compressible/sonicFoam/laminar/forwardStep/constant/transportProperties rename to tutorials/compressible/sonicFoam/laminar/shockTube/constant/turbulenceProperties index 1e9d5be60c..c2c3b28a1b 100644 --- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/transportProperties +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/turbulenceProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -11,11 +11,11 @@ FoamFile format ascii; class dictionary; location "constant"; - object transportProperties; + object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -mu mu [ 1 -1 -1 0 0 0 0 ] 0; +simulationType laminar; // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes index deef4abd26..6bebe35dfb 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes @@ -33,14 +33,16 @@ divSchemes div(phi,U) Gauss upwind; div(phid,p) Gauss limitedLinear 1; div(phi,e) Gauss limitedLinear 1; + div(phiU,p) Gauss limitedLinear 1; + div((muEff*dev2(grad(U).T()))) Gauss linear 1; } laplacianSchemes { default none; - laplacian(mu,U) Gauss linear corrected; - laplacian(mu,e) Gauss linear corrected; laplacian((rho*(1|A(U))),p) Gauss linear corrected; + laplacian(muEff,U) Gauss linear corrected; + laplacian(alphaEff,e) Gauss linear corrected; } interpolationSchemes diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties index 97425177af..5580ffd632 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties @@ -15,9 +15,9 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hPsiThermo>>>>; +thermoType ePsiThermo>>>>; -mixture air 1 28.9 1000 2.544e+06 1.8e-05 0.7; +mixture air 1 28.9 717.5 0 1.8e-05 0.7; // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermodynamicProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/turbulenceProperties similarity index 79% rename from tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermodynamicProperties rename to tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/turbulenceProperties index 99575bf65f..3721a46a2e 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermodynamicProperties +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/turbulenceProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -11,13 +11,11 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermodynamicProperties; + object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Cv Cv [ 0 2 -2 -1 0 0 0 ] 717.5; - -R R [ 0 2 -2 -1 0 0 0 ] 287; +simulationType RASModel; // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict index ce2e9218c9..aad6ecd97e 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/controlDict @@ -49,7 +49,12 @@ functions { type forceCoeffs; functionObjectLibs ( "libforces.so" ); - patches ( WALL10 ); + outputControl timeStep; + outputInterval 1; + patches + ( + WALL10 + ); pName p; UName U; log true; diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes index 0cab17b88e..444443d62d 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes @@ -35,7 +35,7 @@ divSchemes div(R) Gauss linear; div(phid,p) Gauss limitedLinear 1; div(phiU,p) Gauss limitedLinear 1; - div(phi,h) Gauss limitedLinear 1; + div(phi,e) Gauss limitedLinear 1; div((muEff*dev2(grad(U).T()))) Gauss linear; } @@ -47,7 +47,7 @@ laplacianSchemes laplacian(DREff,R) Gauss linear limited 0.5; laplacian(DepsilonEff,epsilon) Gauss linear limited 0.5; laplacian((rho*(1|A(U))),p) Gauss linear limited 0.5; - laplacian(alphaEff,h) Gauss linear limited 0.5; + laplacian(alphaEff,e) Gauss linear limited 0.5; } interpolationSchemes @@ -63,7 +63,7 @@ snGradSchemes fluxRequired { default no; - p ; + p; } diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution index a1782db685..d46dcd13cf 100644 --- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution +++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSolution @@ -41,7 +41,7 @@ solvers relTol 0; } - h + e { solver PBiCG; preconditioner DILU; diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties index 39b28b3681..5580ffd632 100644 --- a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties +++ b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -15,9 +15,9 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -thermoType hPsiThermo>>>>; +thermoType ePsiThermo>>>>; -mixture air 1 28.9 1300 2.544e+06 1.84e-05 0.7; +mixture air 1 28.9 717.5 0 1.8e-05 0.7; // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermodynamicProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/turbulenceProperties similarity index 79% rename from tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermodynamicProperties rename to tutorials/compressible/sonicFoam/ras/prism/constant/turbulenceProperties index c6bf31c073..3721a46a2e 100644 --- a/tutorials/compressible/sonicFoam/laminar/forwardStep/constant/thermodynamicProperties +++ b/tutorials/compressible/sonicFoam/ras/prism/constant/turbulenceProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | +| \\ / O peration | Version: dev | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -11,13 +11,11 @@ FoamFile format ascii; class dictionary; location "constant"; - object thermodynamicProperties; + object turbulenceProperties; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -Cv Cv [ 0 2 -2 -1 0 0 0 ] 1.78571; - -R R [ 0 2 -2 -1 0 0 0 ] 0.714286; +simulationType RASModel; // ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes index 7b3c03466f..9737d97c28 100644 --- a/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes +++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes @@ -35,7 +35,7 @@ divSchemes div(R) Gauss linear; div(phid,p) Gauss limitedLinear 1; div(phiU,p) Gauss limitedLinear 1; - div(phi,h) Gauss limitedLinear 1; + div(phi,e) Gauss limitedLinear 1; div((muEff*dev2(grad(U).T()))) Gauss linear; } @@ -47,7 +47,7 @@ laplacianSchemes laplacian(DREff,R) Gauss linear corrected; laplacian(DepsilonEff,epsilon) Gauss linear corrected; laplacian((rho*(1|A(U))),p) Gauss linear corrected; - laplacian(alphaEff,h) Gauss linear corrected; + laplacian(alphaEff,e) Gauss linear corrected; } interpolationSchemes @@ -63,7 +63,7 @@ snGradSchemes fluxRequired { default no; - p ; + p; } diff --git a/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution b/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution index 5341a980f4..5ff77210a9 100644 --- a/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution +++ b/tutorials/compressible/sonicFoam/ras/prism/system/fvSolution @@ -41,7 +41,7 @@ solvers relTol 0; } - h + e { solver PBiCG; preconditioner DILU; diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution index 9ff08c3657..c543e87527 100644 --- a/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleFoam/hotRoom/system/fvSolution @@ -76,9 +76,9 @@ SIMPLE relaxationFactors { rho 1; - p 0.3; - U 0.7; - h 0.1; + p 0.7; + U 0.2; + h 0.7; k 0.7; epsilon 0.7; R 0.7; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p index f200e3eeb0..bb1ff51259 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/p @@ -22,25 +22,25 @@ boundaryField { floor { - type calculated; + type fixedFluxBuoyantPressure; value uniform 100000; } ceiling { - type calculated; + type fixedFluxBuoyantPressure; value uniform 100000; } fixedWalls { - type calculated; + type fixedFluxBuoyantPressure; value uniform 100000; } box { - type calculated; + type fixedFluxBuoyantPressure; value uniform 100000; } } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/pd b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/pd deleted file mode 100644 index 1841d7882f..0000000000 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/0/pd +++ /dev/null @@ -1,48 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object pd; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - floor - { - type fixedFluxBuoyantPressure; - value uniform 0; - } - - ceiling - { - type fixedFluxBuoyantPressure; - value uniform 0; - } - - fixedWalls - { - type fixedFluxBuoyantPressure; - value uniform 0; - } - - box - { - type fixedFluxBuoyantPressure; - value uniform 0; - } -} - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes index 2263c09775..cd290308eb 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSchemes @@ -41,7 +41,7 @@ laplacianSchemes { default none; laplacian(muEff,U) Gauss linear corrected; - laplacian((rho*(1|A(U))),pd) Gauss linear corrected; + laplacian((rho*(1|A(U))),p) Gauss linear corrected; laplacian(alphaEff,h) Gauss linear corrected; laplacian(DkEff,k) Gauss linear corrected; laplacian(DepsilonEff,epsilon) Gauss linear corrected; @@ -62,7 +62,7 @@ snGradSchemes fluxRequired { default no; - pd ; + p; } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution index f6c1f9453a..25a07616b3 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoom/system/fvSolution @@ -17,7 +17,7 @@ FoamFile solvers { - pd + p { solver PCG; preconditioner DIC; @@ -69,14 +69,14 @@ solvers SIMPLE { nNonOrthogonalCorrectors 0; - pdRefCell 0; - pdRefValue 0; + pRefCell 0; + pRefValue 0; } relaxationFactors { rho 1; - pd 0.3; + p 0.3; U 0.7; h 0.7; k 0.7; diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p index f200e3eeb0..bb1ff51259 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/p @@ -22,25 +22,25 @@ boundaryField { floor { - type calculated; + type fixedFluxBuoyantPressure; value uniform 100000; } ceiling { - type calculated; + type fixedFluxBuoyantPressure; value uniform 100000; } fixedWalls { - type calculated; + type fixedFluxBuoyantPressure; value uniform 100000; } box { - type calculated; + type fixedFluxBuoyantPressure; value uniform 100000; } } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/pd b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/pd deleted file mode 100644 index 1841d7882f..0000000000 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/0/pd +++ /dev/null @@ -1,48 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object pd; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - floor - { - type fixedFluxBuoyantPressure; - value uniform 0; - } - - ceiling - { - type fixedFluxBuoyantPressure; - value uniform 0; - } - - fixedWalls - { - type fixedFluxBuoyantPressure; - value uniform 0; - } - - box - { - type fixedFluxBuoyantPressure; - value uniform 0; - } -} - -// ************************************************************************* // diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes index 0800e9f932..ee909d216c 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSchemes @@ -42,7 +42,7 @@ laplacianSchemes { default none; laplacian(muEff,U) Gauss linear corrected; - laplacian((rho*(1|A(U))),pd) Gauss linear corrected; + laplacian((rho*(1|A(U))),p) Gauss linear corrected; laplacian(alphaEff,h) Gauss linear corrected; laplacian(DkEff,k) Gauss linear corrected; laplacian(DepsilonEff,epsilon) Gauss linear corrected; @@ -63,7 +63,7 @@ snGradSchemes fluxRequired { default no; - pd ; + p; } diff --git a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution index a5d6208674..685132185b 100644 --- a/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution +++ b/tutorials/heatTransfer/buoyantSimpleRadiationFoam/hotRadiationRoomFvDOM/system/fvSolution @@ -17,7 +17,7 @@ FoamFile solvers { - pd + p { solver GAMG; tolerance 1e-06; @@ -73,14 +73,14 @@ solvers SIMPLE { nNonOrthogonalCorrectors 0; - pdRefCell 0; - pdRefValue 0; + pRefCell 0; + pRefValue 0; } relaxationFactors { rho 1.0; - pd 0.3; + p 0.3; U 0.7; h 0.7; k 0.7; diff --git a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun index 1fce68e81c..c3c4b5e504 100755 --- a/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun +++ b/tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/Allrun @@ -15,13 +15,13 @@ runApplication splitMeshRegions -cellZones for i in bottomAir topAir heater leftSolid rightSolid do - changeDictionary -region $i + changeDictionary -region $i >& log.changeDictionary.$i done # remove fluid fields from solid regions (important for post-processing) for i in heater leftSolid rightSolid do - rm -f 0*/$i/{mut,alphat,epsilon,k,p,pd,U} + rm -f 0*/$i/{mut,alphat,epsilon,k,p,p,U} done # remove solid fields from fluid regions (important for post-processing) @@ -37,7 +37,7 @@ done # Decompose for i in bottomAir topAir heater leftSolid rightSolid do - decomposePar -region $i + decomposePar -region $i >& log.decomposePar.$i done # Run @@ -47,7 +47,7 @@ runParallel chtMultiRegionFoam 4 system/machines # Reconstruct for i in bottomAir topAir heater leftSolid rightSolid do - reconstructPar -region $i + reconstructPar -region $i >& log.reconstructPar.$i done diff --git a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/makeMesh b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/makeMesh index b0be10d8e5..b4fc1a22ef 100755 --- a/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/makeMesh +++ b/tutorials/incompressible/MRFSimpleFoam/mixerVessel2D/makeMesh @@ -1,11 +1,13 @@ #!/bin/sh +set -x m4 < constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict -blockMesh -cellSet +blockMesh >& log.blockMesh +cellSet >& log.cellSet + #- MRF determines its own faceZone if not supplied #cp system/faceSetDict_rotorFaces system/faceSetDict #faceSet #cp system/faceSetDict_noBoundaryFaces system/faceSetDict #faceSet -setsToZones -noFlipMap +setsToZones -noFlipMap >& log.setsToZones diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties index 82b67c9f1f..ca03722b1c 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/radiationProperties @@ -17,7 +17,7 @@ FoamFile radiation off; -radiationModel noRadiation; +radiationModel none; solverFreq 10; diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options index cffe6f344a..2f17d01ffb 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options @@ -4,9 +4,10 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ -llagrangian \ @@ -15,7 +16,7 @@ EXE_LIBS = \ -lmeshTools \ -lthermophysicalFunctions \ -lbasicThermophysicalModels \ - -lcombustionThermophysicalModels \ + -lreactionThermophysicalModels \ -lspecie \ -lradiation \ -lcompressibleRASModels \ diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/UEqn.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/UEqn.H index 4d58a14da8..5f2e597a15 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/UEqn.H +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/UEqn.H @@ -4,8 +4,8 @@ + fvm::div(phi, U) + turbulence->divDevRhoReff(U) == - thermoCloud1.SU1() - + kinematicCloud1.SU1() + thermoCloud1.SU() + + kinematicCloud1.SU() + rho.dimensionedInternalField()*g ); diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createClouds.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createClouds.H index bdf17e19ef..ff41634a4e 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createClouds.H +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createClouds.H @@ -5,7 +5,7 @@ rho, U, g, - thermo() + thermo ); Info<< "Constructing kinematicCloud1" << endl; @@ -14,7 +14,7 @@ "kinematicCloud1", rho, U, - thermo().mu(), + thermo.mu(), g ); diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H index b07398a031..cebd44cfd4 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/createFields.H @@ -1,13 +1,14 @@ Info<< "Reading thermophysical properties\n" << endl; - autoPtr thermo + autoPtr pThermo ( - basicThermo::New(mesh) + basicPsiThermo::New(mesh) ); + basicPsiThermo& thermo = pThermo(); - volScalarField& p = thermo->p(); - volScalarField& h = thermo->h(); - const volScalarField& psi = thermo->psi(); + volScalarField& p = thermo.p(); + volScalarField& h = thermo.h(); + const volScalarField& psi = thermo.psi(); volScalarField rho ( @@ -19,7 +20,7 @@ IOobject::NO_READ, IOobject::AUTO_WRITE ), - thermo->rho() + thermo.rho() ); Info<< "\nReading field U\n" << endl; @@ -48,7 +49,7 @@ rho, U, phi, - thermo() + thermo ) ); diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/hEqn.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/hEqn.H index 5359c9c2ce..2b3b60ce98 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/hEqn.H +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/hEqn.H @@ -6,12 +6,12 @@ - fvm::laplacian(turbulence->alphaEff(), h) == DpDt - + thermoCloud1.Sh1() + + thermoCloud1.Sh() ); hEqn.relax(); hEqn.solve(); - thermo->correct(); + thermo.correct(); } diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H index b506245034..9443f909a3 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/pEqn.H @@ -1,4 +1,4 @@ -rho = thermo->rho(); +rho = thermo.rho(); volScalarField rUA = 1.0/UEqn.A(); U = rUA*UEqn.H(); @@ -8,7 +8,7 @@ if (transonic) surfaceScalarField phid ( "phid", - fvc::interpolate(thermo->psi()) + fvc::interpolate(psi) *( (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, rho, U, phi) @@ -35,8 +35,8 @@ if (transonic) else { phi = - fvc::interpolate(rho)* - ( + fvc::interpolate(rho) + *( (fvc::interpolate(U) & mesh.Sf()) + fvc::ddtPhiCorr(rUA, rho, U, phi) ); diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C index 1082636303..77715fd48c 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam.C @@ -31,7 +31,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "basicThermo.H" +#include "basicPsiThermo.H" #include "turbulenceModel.H" #include "basicThermoCloud.H" @@ -41,62 +41,59 @@ Description int main(int argc, char *argv[]) { + #include "setRootCase.H" -# include "setRootCase.H" + #include "createTime.H" + #include "createMesh.H" + #include "readEnvironmentalProperties.H" + #include "createFields.H" + #include "createClouds.H" + #include "readPISOControls.H" + #include "initContinuityErrs.H" + #include "readTimeControls.H" + #include "compressibleCourantNo.H" + #include "setInitialDeltaT.H" -# include "createTime.H" -# include "createMesh.H" -# include "readEnvironmentalProperties.H" -# include "createFields.H" -# include "createClouds.H" -# include "readPISOControls.H" -# include "initContinuityErrs.H" -# include "readTimeControls.H" -# include "compressibleCourantNo.H" -# include "setInitialDeltaT.H" - -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // Info<< "\nStarting time loop\n" << endl; while (runTime.run()) { -# include "readTimeControls.H" -# include "readPISOControls.H" -# include "compressibleCourantNo.H" -# include "setDeltaT.H" + #include "readTimeControls.H" + #include "readPISOControls.H" + #include "compressibleCourantNo.H" + #include "setDeltaT.H" runTime++; Info<< "Time = " << runTime.timeName() << nl << endl; - Info<< "Evolving thermoCloud1" << endl; thermoCloud1.evolve(); thermoCloud1.info(); - Info<< "Evolving kinematicCloud1" << endl; kinematicCloud1.evolve(); kinematicCloud1.info(); -# include "rhoEqn.H" + #include "rhoEqn.H" // --- PIMPLE loop for (int ocorr=1; ocorr<=nOuterCorr; ocorr++) { -# include "UEqn.H" + #include "UEqn.H" // --- PISO loop for (int corr=1; corr<=nCorr; corr++) { -# include "hEqn.H" -# include "pEqn.H" + #include "hEqn.H" + #include "pEqn.H" } } turbulence->correct(); - rho = thermo->rho(); + rho = thermo.rho(); runTime.write(); diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/epsilon b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/epsilon index ec63ed1672..9fcf588c0c 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/epsilon +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/epsilon @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object epsilon; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -22,28 +23,28 @@ boundaryField { top { - type zeroGradient; + type compressible::epsilonWallFunction; + value uniform 5390.5; } - bottom { - type zeroGradient; + type compressible::epsilonWallFunction; + value uniform 5390.5; } - walls { - type zeroGradient; + type compressible::epsilonWallFunction; + value uniform 5390.5; } - symmetry { type symmetryPlane; } - frontAndBack { type empty; } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/k b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/k index b2e4f58aab..9abb57fdb0 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/k +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/0/k @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; + location "0"; object k; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -22,28 +23,28 @@ boundaryField { top { - type zeroGradient; + type compressible::kQRWallFunction; + value uniform 37.5; } - bottom { - type zeroGradient; + type compressible::kQRWallFunction; + value uniform 37.5; } - walls { - type zeroGradient; + type compressible::kQRWallFunction; + value uniform 37.5; } - symmetry { type symmetryPlane; } - frontAndBack { type empty; } } + // ************************************************************************* // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties index 4a7f8b7b2b..8c69fb42b5 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties @@ -21,20 +21,27 @@ DragModel SphereDrag; DispersionModel StochasticDispersionRAS; -WallInteractionModel StandardWallInteraction; +PatchInteractionModel StandardWallInteraction; -minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; - -rho0 rho0 [ 1 -3 0 0 0 ] 5000; +PostProcessingModel none; coupled true; +cellValueSourceCorrection on; + parcelTypeId 2; +constantProperties +{ + rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15; + minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; + rho0 rho0 [ 1 -3 0 0 0 ] 5000; +} + interpolationSchemes { rho cell; - U cellPointFace; + U cellPoint; mu cell; } @@ -43,12 +50,21 @@ integrationSchemes U Euler; } +particleForces +{ + gravity on; + virtualMass off; + Cvm 0.5; + pressureGradient off; + gradU gradU; +} + ManualInjectionCoeffs { - parcelBasisType mass; massTotal massTotal [ 1 0 0 0 0 ] 0.0002; + parcelBasisType mass; SOI 0; - positionsFile kinematicCloud1Positions; + positionsFile "kinematicCloud1Positions"; U0 ( 0 0 0 ); parcelPDF { @@ -70,29 +86,10 @@ ConeInjectionCoeffs position ( 0.25 0.25 0.05 ); direction ( 0 -1 0 ); parcelsPerSecond 10000; - volumeFlowRate Constant; - volumeFlowRateCoeffs - { - value 0.01; - } - - Umag Constant; - UmagCoeffs - { - value 50; - } - - thetaInner Constant; - thetaInnerCoeffs - { - value 0; - } - - thetaOuter Constant; - thetaOuterCoeffs - { - value 30; - } + volumeFlowRate Constant 0.01; + Umag Constant 50; + thetaInner Constant 0; + thetaOuter Constant 30; parcelPDF { diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary index b8848e2d9c..b130d7bc0a 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties index fd752a082c..a7c19443e2 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties @@ -21,33 +21,37 @@ DragModel SphereDrag; DispersionModel StochasticDispersionRAS; -WallInteractionModel StandardWallInteraction; +PatchInteractionModel StandardWallInteraction; HeatTransferModel RanzMarshall; +PostProcessingModel none; + radiation off; -minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; - -rho0 rho0 [ 1 -3 0 0 0 ] 2500; - -T0 T0 [ 0 0 0 1 0 ] 300; - -cp0 cp0 [ 0 2 -2 -1 0 ] 900; - -epsilon0 epsilon0 [ 0 0 0 0 0 ] 1; - -f0 f0 [ 0 0 0 0 0 ] 0.5; - coupled true; +cellValueSourceCorrection on; + parcelTypeId 1; +constantProperties +{ + rhoMin rhoMin [ 1 -3 0 0 0 ] 1e-15; + TMin TMin [ 0 0 0 1 0 ] 200; + minParticleMass minParticleMass [ 1 0 0 0 0 ] 1e-15; + rho0 rho0 [ 1 -3 0 0 0 ] 2500; + T0 T0 [ 0 0 0 1 0 ] 300; + cp0 cp0 [ 0 2 -2 -1 0 ] 900; + epsilon0 epsilon0 [ 0 0 0 0 0 ] 1; + f0 f0 [ 0 0 0 0 0 ] 0.5; +} + interpolationSchemes { rho cell; - U cellPointFace; mu cell; + U cellPoint; T cell; Cp cell; } @@ -58,12 +62,21 @@ integrationSchemes T Analytical; } +particleForces +{ + gravity on; + virtualMass off; + Cvm 0.5; + pressureGradient off; + gradU gradU; +} + ManualInjectionCoeffs { massTotal massTotal [ 1 0 0 0 0 ] 0.0001; parcelBasisType mass; SOI 0; - positionsFile thermoCloud1Positions; + positionsFile "thermoCloud1Positions"; U0 ( 0 0 0 ); parcelPDF { diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties new file mode 100644 index 0000000000..78f28eca60 --- /dev/null +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: 1.5.x | +| \\ / A nd | Web: www.OpenFOAM.org | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType RASModel; + + +// ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1 index a7c7e625e5..bfa0d6ac4f 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.1 @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object cellSetDict.1; @@ -19,7 +19,13 @@ name c0; action new; -topoSetSources ( boxToCell { box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 ) ; } ); +topoSetSources +( + boxToCell + { + box (0.004 -0.001 -1) (0.012 0.001 1); + } +); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2 index 470258895d..d9684898c8 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.2 @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object cellSetDict.2; @@ -19,7 +19,13 @@ name c0; action new; -topoSetSources ( boxToCell { box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 ) ; } ); +topoSetSources +( + boxToCell + { + box (0.0045 -0.00075 -1) (0.0095 0.00075 1); + } +); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3 index 530c710e1f..10f2c880a5 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/cellSetDict.3 @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object cellSetDict.3; @@ -19,7 +19,13 @@ name c0; action new; -topoSetSources ( boxToCell { box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ) ; } ); +topoSetSources +( + boxToCell + { + box (0.00475 -0.000375 -1) (0.009 0.000375 1); + } +); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1 index a7c7e625e5..88755b2299 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.1 @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object cellSetDict.1; @@ -19,7 +19,13 @@ name c0; action new; -topoSetSources ( boxToCell { box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 ) ; } ); +topoSetSources +( + boxToCell + { + box ( 0.004 -0.001 -1 ) ( 0.012 0.001 1 ); + } +); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2 index 470258895d..a29931d08f 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.2 @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object cellSetDict.2; @@ -19,7 +19,13 @@ name c0; action new; -topoSetSources ( boxToCell { box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 ) ; } ); +topoSetSources +( + boxToCell + { + box ( 0.0045 -0.00075 -1 ) ( 0.0095 0.00075 1 ); + } +); // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3 index 530c710e1f..8ff387dd87 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/cellSetDict.3 @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format binary; + format ascii; class dictionary; location "system"; object cellSetDict.3; @@ -19,7 +19,13 @@ name c0; action new; -topoSetSources ( boxToCell { box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ) ; } ); +topoSetSources +( + boxToCell + { + box ( 0.00475 -0.000375 -1 ) ( 0.009 0.000375 1 ); + } +); // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/pd.org b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p.org similarity index 98% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/pd.org rename to tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p.org index 5f5f977f43..72b59f9e90 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/pd.org +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/0/p.org @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun index f4e775f4ba..f2a0345d68 100755 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/Allrun @@ -7,6 +7,6 @@ application="compressibleInterFoam" runApplication blockMesh cp 0/alpha1.org 0/alpha1 -cp 0/pd.org 0/pd +cp 0/p.org 0/p runApplication setFields runApplication $application diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes index 373e1ca67d..0233a5951a 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSchemes @@ -30,7 +30,7 @@ divSchemes div(rho*phi,U) Gauss upwind; div(phi,alpha) Gauss vanLeer; div(phirb,alpha) Gauss interfaceCompression 1; - div(phi,pd) Gauss upwind; + div(phi,p) Gauss upwind; div(phi,k) Gauss vanLeer; div((nuEff*dev(grad(U).T()))) Gauss linear; } @@ -53,9 +53,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - gamma ; + p; + pcorr; + gamma; } diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution index 3416674d07..f93b56c204 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/fvSolution @@ -45,7 +45,7 @@ solvers solver diagonal; } - pd + p { solver GAMG; tolerance 1e-07; @@ -60,7 +60,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/setFieldsDict index d199264332..00e706b1e5 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge2D/system/setFieldsDict @@ -15,9 +15,33 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues ( volScalarFieldValue alpha1 1 volScalarFieldValue pd 100000 ); +defaultFieldValues +( + volScalarFieldValue alpha1 1 + volScalarFieldValue p 100000 +); -regions ( sphereToCell { centre ( 0.5 0.5 0 ) ; radius 0.1 ; fieldValues ( volScalarFieldValue alpha1 0 volScalarFieldValue pd 1000000 ) ; } boxToCell { box ( -10 1 -1 ) ( 10 10 1 ) ; fieldValues ( volScalarFieldValue alpha1 0 ) ; } ); +regions +( + sphereToCell + { + centre ( 0.5 0.5 0 ); + radius 0.1; + fieldValues + ( + volScalarFieldValue alpha1 0 + volScalarFieldValue p 1000000 + ); + } + boxToCell + { + box ( -10 1 -1 ) ( 10 10 1 ); + fieldValues + ( + volScalarFieldValue alpha1 0 + ); + } +); // ************************************************************************* // diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/pd.org b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/p.org similarity index 97% rename from tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/pd.org rename to tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/p.org index efe6f4ca9c..3377670aaf 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/pd.org +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/0/p.org @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd.org; + object p.org; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean index c422ce058e..99cd62d923 100755 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allclean @@ -2,4 +2,4 @@ foamCleanTutorials cases rm -rf processor* -rm -rf 0/pd.gz 0/alpha1.gz +rm -rf 0/p.gz 0/alpha1.gz diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun index 3302513ed6..7b9b11445e 100755 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/Allrun @@ -7,7 +7,7 @@ application="compressibleInterFoam" runApplication blockMesh cp 0/alpha1.org 0/alpha1 -cp 0/pd.org 0/pd +cp 0/p.org 0/p runApplication setFields runApplication decomposePar hostname > system/machines diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes index 373e1ca67d..0233a5951a 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSchemes @@ -30,7 +30,7 @@ divSchemes div(rho*phi,U) Gauss upwind; div(phi,alpha) Gauss vanLeer; div(phirb,alpha) Gauss interfaceCompression 1; - div(phi,pd) Gauss upwind; + div(phi,p) Gauss upwind; div(phi,k) Gauss vanLeer; div((nuEff*dev(grad(U).T()))) Gauss linear; } @@ -53,9 +53,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - gamma ; + p; + pcorr; + gamma; } diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution index 3416674d07..f93b56c204 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/fvSolution @@ -45,7 +45,7 @@ solvers solver diagonal; } - pd + p { solver GAMG; tolerance 1e-07; @@ -60,7 +60,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner diff --git a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/setFieldsDict b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/setFieldsDict index fb686e791c..3b3c397cb9 100644 --- a/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/setFieldsDict +++ b/tutorials/multiphase/compressibleInterFoam/les/depthCharge3D/system/setFieldsDict @@ -15,9 +15,33 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -defaultFieldValues ( volScalarFieldValue alpha1 1 volScalarFieldValue pd 100000 ); +defaultFieldValues +( + volScalarFieldValue alpha1 1 + volScalarFieldValue p 100000 +); -regions ( sphereToCell { centre ( 0.5 0.5 0.5 ) ; radius 0.1 ; fieldValues ( volScalarFieldValue alpha1 0 volScalarFieldValue pd 1000000 ) ; } boxToCell { box ( -10 1 -1 ) ( 10 10 1 ) ; fieldValues ( volScalarFieldValue alpha1 0 ) ; } ); +regions +( + sphereToCell + { + centre ( 0.5 0.5 0.5 ); + radius 0.1; + fieldValues + ( + volScalarFieldValue alpha1 0 + volScalarFieldValue p 1000000 + ); + } + boxToCell + { + box ( -10 1 -1 ) ( 10 10 1 ); + fieldValues + ( + volScalarFieldValue alpha1 0 + ); + } +); // ************************************************************************* // diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/pd b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p similarity index 98% rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/pd rename to tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p index 0136109909..b3a944b216 100644 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/pd +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0-orig/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/pd b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p similarity index 98% rename from tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/pd rename to tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p index 0136109909..b3a944b216 100644 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/pd +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes index c563a4cd8f..a6ed1d4174 100644 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSchemes @@ -52,9 +52,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - alpha ; + p; + pcorr; + alpha; } diff --git a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution index 2ca306273d..fe7b6a8851 100644 --- a/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-08; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner @@ -122,9 +122,8 @@ PISO nAlphaSubCycles 3; cAlpha 1; - pdRefPoint (0.51 0.51 0.51); - pdRefValue 0; - pRefValue 0; + pRefPoint (0.51 0.51 0.51); + pRefValue 0; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/pd b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p similarity index 98% rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/pd rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p index 020ff7cc00..c69b424dc7 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/pd +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict index e4a69588f6..35735bacbb 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict @@ -54,7 +54,7 @@ functions probes { type probes; - name probes; + functionObjectLibs ( "libsampling.so" ); outputControl timeStep; outputInterval 1; probeLocations diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes index 3a940dbe40..2f7da16bb6 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes @@ -52,9 +52,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - alpha ; + p; + pcorr; + alpha; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution index c9dccc239e..77e4ff75cf 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-08; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner @@ -99,8 +99,7 @@ PISO cAlpha 1.5; correctPhi no; - pdRefPoint (0 0 0.15); - pdRefValue 0; + pRefPoint (0 0 0.15); pRefValue 1e5; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict index 7ff571c6d1..ec8d1717d5 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/setFieldsDict @@ -25,7 +25,10 @@ regions boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ); - fieldValues ( volScalarFieldValue alpha1 1 ); + fieldValues + ( + volScalarFieldValue alpha1 1 + ); } ); diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/pd b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p similarity index 98% rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/pd rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p index 020ff7cc00..c69b424dc7 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/pd +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes index d4eb5a1966..b5c55ba3d7 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSchemes @@ -52,9 +52,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - alpha ; + p; + pcorr; + alpha; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution index c9dccc239e..77e4ff75cf 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-08; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner @@ -99,8 +99,7 @@ PISO cAlpha 1.5; correctPhi no; - pdRefPoint (0 0 0.15); - pdRefValue 0; + pRefPoint (0 0 0.15); pRefValue 1e5; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict index 7ff571c6d1..ec8d1717d5 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank2D3DoF/system/setFieldsDict @@ -25,7 +25,10 @@ regions boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ); - fieldValues ( volScalarFieldValue alpha1 1 ); + fieldValues + ( + volScalarFieldValue alpha1 1 + ); } ); diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/pd b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p similarity index 97% rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/pd rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p index ac7e49da81..d27ad70eb9 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/pd +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes index d4eb5a1966..b5c55ba3d7 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSchemes @@ -52,9 +52,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - alpha ; + p; + pcorr; + alpha; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution index c9dccc239e..77e4ff75cf 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-08; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner @@ -99,8 +99,7 @@ PISO cAlpha 1.5; correctPhi no; - pdRefPoint (0 0 0.15); - pdRefValue 0; + pRefPoint (0 0 0.15); pRefValue 1e5; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict index 2f947e6241..bceaad67ce 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D/system/setFieldsDict @@ -25,7 +25,10 @@ regions boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ); - fieldValues ( volScalarFieldValue alpha1 1 ); + fieldValues + ( + volScalarFieldValue alpha1 1 + ); } ); diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/pd b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p similarity index 97% rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/pd rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p index ac7e49da81..d27ad70eb9 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/pd +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes index d4eb5a1966..b5c55ba3d7 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSchemes @@ -52,9 +52,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - alpha ; + p; + pcorr; + alpha; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution index c9dccc239e..77e4ff75cf 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-08; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner @@ -99,8 +99,7 @@ PISO cAlpha 1.5; correctPhi no; - pdRefPoint (0 0 0.15); - pdRefValue 0; + pRefPoint (0 0 0.15); pRefValue 1e5; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict index 7ff571c6d1..ec8d1717d5 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/system/setFieldsDict @@ -25,7 +25,10 @@ regions boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ); - fieldValues ( volScalarFieldValue alpha1 1 ); + fieldValues + ( + volScalarFieldValue alpha1 1 + ); } ); diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/pd b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p similarity index 97% rename from tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/pd rename to tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p index ac7e49da81..d27ad70eb9 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D3DoF/0/pd +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes index d4eb5a1966..b5c55ba3d7 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSchemes @@ -52,9 +52,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - alpha ; + p; + pcorr; + alpha; } diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution index c9dccc239e..77e4ff75cf 100644 --- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution +++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-08; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner @@ -99,8 +99,7 @@ PISO cAlpha 1.5; correctPhi no; - pdRefPoint (0 0 0.15); - pdRefValue 0; + pRefPoint (0 0 0.15); pRefValue 1e5; } diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/pd b/tutorials/multiphase/interFoam/laminar/damBreak/0/p similarity index 98% rename from tutorials/multiphase/interFoam/ras/damBreak/0/pd rename to tutorials/multiphase/interFoam/laminar/damBreak/0/p index 520a3e9b0b..15ab9897a8 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/pd +++ b/tutorials/multiphase/interFoam/laminar/damBreak/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes index d242b76b75..0b17c289c2 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes +++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSchemes @@ -52,9 +52,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - alpha1 ; + p; + pcorr; + alpha1; } diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution index b1b00223fc..6c3a8c5da3 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution +++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution @@ -25,7 +25,7 @@ solvers relTol 0; } - pd + p { solver PCG; preconditioner DIC; @@ -33,7 +33,7 @@ solvers relTol 0.05; } - pdFinal + pFinal { solver PCG; preconditioner DIC; diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/pd b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p similarity index 98% rename from tutorials/multiphase/interFoam/les/nozzleFlow2D/0/pd rename to tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p index b533fbc016..8f01f473bb 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/pd +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes index 2a273c5e51..153a1ea73a 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSchemes @@ -56,9 +56,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - alpha1 ; + p; + pcorr; + alpha; } diff --git a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution index 660482ad37..4642da1396 100644 --- a/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution +++ b/tutorials/multiphase/interFoam/les/nozzleFlow2D/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-07; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner diff --git a/tutorials/multiphase/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/ras/Allrun index c01b35fcbd..e222cf7e15 100755 --- a/tutorials/multiphase/interFoam/ras/Allrun +++ b/tutorials/multiphase/interFoam/ras/Allrun @@ -32,7 +32,7 @@ cloneCase damBreak damBreakFine cd damBreakFine # Modify case setDamBreakFine - cp ../damBreak/0/gamma.org 0/gamma + cp ../damBreak/0/alpha1.org 0/alpha1 # And execute runApplication blockMesh runApplication setFields diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/U b/tutorials/multiphase/interFoam/ras/damBreak/0/U index d4cc4c65a6..7ea3a0c323 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/U +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/U @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class volVectorField; + location "0"; object U; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -38,7 +39,6 @@ boundaryField atmosphere { type pressureInletOutletVelocity; - phi phi; value uniform (0 0 0); } defaultFaces @@ -47,4 +47,5 @@ boundaryField } } + // ************************************************************************* // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/gamma.org b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1 similarity index 98% rename from tutorials/multiphase/interFoam/ras/damBreak/0/gamma.org rename to tutorials/multiphase/interFoam/ras/damBreak/0/alpha1 index 742f297443..36d4d31dcd 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/gamma.org +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1 @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object gamma; + object alpha1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/gamma b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1.org similarity index 98% rename from tutorials/multiphase/interFoam/ras/damBreak/0/gamma rename to tutorials/multiphase/interFoam/ras/damBreak/0/alpha1.org index 742f297443..36d4d31dcd 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/gamma +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/alpha1.org @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object gamma; + object alpha1; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/epsilon b/tutorials/multiphase/interFoam/ras/damBreak/0/epsilon index 92ed8a7d75..b49a804284 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/epsilon +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/epsilon @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [ 0 2 -3 0 0 0 0 ]; +dimensions [0 2 -3 0 0 0 0]; internalField uniform 0.1; @@ -24,28 +24,24 @@ boundaryField leftWall { type epsilonWallFunction; - value uniform 0; + value uniform 0.1; } - rightWall { type epsilonWallFunction; - value uniform 0; + value uniform 0.1; } - lowerWall { type epsilonWallFunction; - value uniform 0; + value uniform 0.1; } - atmosphere { type inletOutlet; inletValue uniform 0.1; value uniform 0.1; } - defaultFaces { type empty; diff --git a/tutorials/multiphase/interFoam/ras/damBreak/0/k b/tutorials/multiphase/interFoam/ras/damBreak/0/k index c8071de03b..897224d725 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/0/k +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/k @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -dimensions [ 0 2 -2 0 0 0 0 ]; +dimensions [0 2 -2 0 0 0 0]; internalField uniform 0.1; @@ -24,28 +24,24 @@ boundaryField leftWall { type kQRWallFunction; - value uniform 0; + value uniform 0.1; } - rightWall { type kQRWallFunction; - value uniform 0; + value uniform 0.1; } - lowerWall { type kQRWallFunction; - value uniform 0; + value uniform 0.1; } - atmosphere { type inletOutlet; inletValue uniform 0.1; value uniform 0.1; } - defaultFaces { type empty; diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/0/pd b/tutorials/multiphase/interFoam/ras/damBreak/0/p similarity index 98% rename from tutorials/multiphase/interFoam/laminar/damBreak/0/pd rename to tutorials/multiphase/interFoam/ras/damBreak/0/p index 520a3e9b0b..15ab9897a8 100644 --- a/tutorials/multiphase/interFoam/laminar/damBreak/0/pd +++ b/tutorials/multiphase/interFoam/ras/damBreak/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes index 499ad01e5c..81f8e2c48b 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes +++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSchemes @@ -28,8 +28,8 @@ gradSchemes divSchemes { div(rho*phi,U) Gauss linear; - div(phi,gamma) Gauss vanLeer; - div(phirb,gamma) Gauss interfaceCompression; + div(phi,alpha) Gauss vanLeer; + div(phirb,alpha) Gauss interfaceCompression; div(phi,k) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,R) Gauss upwind; @@ -57,9 +57,9 @@ snGradSchemes fluxRequired { default no; - pd ; - pcorr ; - gamma ; + p; + pcorr; + alpha; } diff --git a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution index ea7bd97c27..6af3dad37e 100644 --- a/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution +++ b/tutorials/multiphase/interFoam/ras/damBreak/system/fvSolution @@ -25,7 +25,7 @@ solvers relTol 0; } - pd + p { solver PCG; preconditioner DIC; @@ -33,7 +33,7 @@ solvers relTol 0.05; } - pdFinal + pFinal { solver PCG; preconditioner DIC; @@ -87,9 +87,9 @@ PISO momentumPredictor no; nCorrectors 3; nNonOrthogonalCorrectors 0; - nGammaCorr 1; - nGammaSubCycles 4; - cGamma 2; + nAlphaCorr 1; + nAlphaSubCycles 4; + cAlpha 2; } diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/pd b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p similarity index 98% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/pd rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p index 520a3e9b0b..15ab9897a8 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/pd +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution index 8c303f9540..47957b22b3 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-07; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/pd b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p similarity index 98% rename from tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/pd rename to tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p index 520a3e9b0b..15ab9897a8 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phase/0/pd +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/0/p @@ -10,7 +10,7 @@ FoamFile version 2.0; format ascii; class volScalarField; - object pd; + object p; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution index 8c303f9540..47957b22b3 100644 --- a/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution +++ b/tutorials/multiphase/multiphaseInterFoam/laminar/damBreak4phaseFine/system/fvSolution @@ -40,7 +40,7 @@ solvers maxIter 100; } - pd + p { solver GAMG; tolerance 1e-07; @@ -55,7 +55,7 @@ solvers mergeLevels 1; } - pdFinal + pFinal { solver PCG; preconditioner diff --git a/wmake/rules/linux64Gcc/c++Opt b/wmake/rules/linux64Gcc/c++Opt index 8ac07d2124..3446f7f58c 100644 --- a/wmake/rules/linux64Gcc/c++Opt +++ b/wmake/rules/linux64Gcc/c++Opt @@ -1,4 +1,4 @@ -c++DBUG = +c++DBUG = c++OPT = -O3 #c++OPT = -march=nocona -O3 # -ftree-vectorize -ftree-vectorizer-verbose=3