diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C index da994894bd..f48d6e9fb9 100644 --- a/applications/solvers/DNS/dnsFoam/dnsFoam.C +++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMeshNoClear.H" #include "createControl.H" diff --git a/applications/solvers/basic/laplacianFoam/laplacianFoam.C b/applications/solvers/basic/laplacianFoam/laplacianFoam.C index da2bb4b022..6f1e4a8fc1 100644 --- a/applications/solvers/basic/laplacianFoam/laplacianFoam.C +++ b/applications/solvers/basic/laplacianFoam/laplacianFoam.C @@ -37,7 +37,7 @@ Description int main(int argc, char *argv[]) { - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C index e0b2a419b3..9617b9302f 100644 --- a/applications/solvers/basic/potentialFoam/potentialFoam.C +++ b/applications/solvers/basic/potentialFoam/potentialFoam.C @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) "execute functionObjects" ); - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" diff --git a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C index c94f8b4007..8524ad6d75 100644 --- a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C +++ b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C @@ -37,7 +37,7 @@ Description int main(int argc, char *argv[]) { - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C index 443a506a65..4c7a0813b5 100644 --- a/applications/solvers/combustion/PDRFoam/PDRFoam.C +++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C @@ -85,7 +85,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C index 30e5f5a6cf..ad04d8b42d 100644 --- a/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C +++ b/applications/solvers/combustion/PDRFoam/PDRFoamAutoRefine.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -72,7 +72,7 @@ Description int main(int argc, char *argv[]) { - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createDynamicFvMesh.H" diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H index 1ee0719076..2a4599424e 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -57,8 +57,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef compressiblePDRkEpsilon_H -#define compressiblePDRkEpsilon_H +#ifndef compressible_PDRkEpsilon_H +#define compressible_PDRkEpsilon_H #include "kEpsilon.H" #include "turbulentFluidThermoModel.H" diff --git a/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C b/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C index 6ac9443f4c..123e71661d 100644 --- a/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C +++ b/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) #define CREATE_MESH createEngineMesh.H #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createEngineTime.H" #include "createEngineMesh.H" #include "createControl.H" diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C index 3401aba31d..5959d4af42 100644 --- a/applications/solvers/combustion/XiFoam/XiFoam.C +++ b/applications/solvers/combustion/XiFoam/XiFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -64,7 +64,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/combustion/chemFoam/chemFoam.C b/applications/solvers/combustion/chemFoam/chemFoam.C index 5e79f6227c..ff27156957 100644 --- a/applications/solvers/combustion/chemFoam/chemFoam.C +++ b/applications/solvers/combustion/chemFoam/chemFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,7 +32,7 @@ Description \*---------------------------------------------------------------------------*/ #include "fvCFD.H" -#include "psiReactionThermo.H" +#include "rhoReactionThermo.H" #include "BasicChemistryModel.H" #include "reactingMixture.H" #include "chemistrySolver.H" @@ -40,6 +40,7 @@ Description #include "thermoPhysicsTypes.H" #include "basicSpecieMixture.H" #include "cellModeller.H" +#include "thermoTypeFunctions.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +52,7 @@ int main(int argc, char *argv[]) #define NO_CONTROL #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createSingleCellMesh.H" #include "createFields.H" diff --git a/applications/solvers/combustion/chemFoam/createFieldRefs.H b/applications/solvers/combustion/chemFoam/createFieldRefs.H index 7458054910..73f65df785 100644 --- a/applications/solvers/combustion/chemFoam/createFieldRefs.H +++ b/applications/solvers/combustion/chemFoam/createFieldRefs.H @@ -1,7 +1,7 @@ -BasicChemistryModel& chemistry = pChemistry(); +BasicChemistryModel& chemistry = pChemistry(); scalar dtChem = min ( - refCast> + refCast> ( chemistry ).deltaTChem()[0], diff --git a/applications/solvers/combustion/chemFoam/createFields.H b/applications/solvers/combustion/chemFoam/createFields.H index a707609627..b0baa21d01 100644 --- a/applications/solvers/combustion/chemFoam/createFields.H +++ b/applications/solvers/combustion/chemFoam/createFields.H @@ -24,13 +24,13 @@ #include "createBaseFields.H" Info<< "Reading thermophysical properties\n" << endl; - autoPtr pThermo(psiReactionThermo::New(mesh)); - psiReactionThermo& thermo = pThermo(); + autoPtr pThermo(rhoReactionThermo::New(mesh)); + rhoReactionThermo& thermo = pThermo(); thermo.validate(args.executable(), "h"); - autoPtr> pChemistry + autoPtr> pChemistry ( - BasicChemistryModel::New(thermo) + BasicChemistryModel::New(thermo) ); volScalarField rho diff --git a/applications/solvers/combustion/chemFoam/pEqn.H b/applications/solvers/combustion/chemFoam/pEqn.H index a919ff198c..7d62559817 100644 --- a/applications/solvers/combustion/chemFoam/pEqn.H +++ b/applications/solvers/combustion/chemFoam/pEqn.H @@ -5,7 +5,7 @@ scalar invW = 0.0; forAll(Y, i) { - invW += Y[i][0]/specieData[i].W(); + invW += Y[i][0]/W[i]; } Rspecific[0] = 1000.0*constant::physicoChemical::R.value()*invW; diff --git a/applications/solvers/combustion/chemFoam/readInitialConditions.H b/applications/solvers/combustion/chemFoam/readInitialConditions.H index 8e340a7e16..2c29ca9825 100644 --- a/applications/solvers/combustion/chemFoam/readInitialConditions.H +++ b/applications/solvers/combustion/chemFoam/readInitialConditions.H @@ -1,4 +1,4 @@ - word constProp(initialConditions.lookup("constantProperty")); + const word constProp(initialConditions.lookup("constantProperty")); if ((constProp != "pressure") && (constProp != "volume")) { FatalError << "in initialConditions, unknown constantProperty type " @@ -6,7 +6,7 @@ << abort(FatalError); } - word fractionBasis(initialConditions.lookup("fractionBasis")); + const word fractionBasis(initialConditions.lookup("fractionBasis")); if ((fractionBasis != "mass") && (fractionBasis != "mole")) { FatalError << "in initialConditions, unknown fractionBasis type " << nl @@ -14,20 +14,8 @@ << fractionBasis << abort(FatalError); } - label nSpecie = Y.size(); - PtrList specieData(Y.size()); - forAll(specieData, i) - { - specieData.set - ( - i, - new gasHThermoPhysics - ( - dynamic_cast&> - (thermo).speciesData()[i] - ) - ); - } + const label nSpecie = Y.size(); + const scalarList W(::W(thermo)); scalarList Y0(nSpecie, 0.0); scalarList X0(nSpecie, 0.0); @@ -49,12 +37,12 @@ forAll(Y, i) { X0[i] /= mTot; - mw += specieData[i].W()*X0[i]; + mw += W[i]*X0[i]; } forAll(Y, i) { - Y0[i] = X0[i]*specieData[i].W()/mw; + Y0[i] = X0[i]*W[i]/mw; } } else // mass fraction @@ -73,21 +61,21 @@ forAll(Y, i) { Y0[i] /= mTot; - invW += Y0[i]/specieData[i].W(); + invW += Y0[i]/W[i]; } const scalar mw = 1.0/invW; forAll(Y, i) { - X0[i] = Y0[i]*mw/specieData[i].W(); + X0[i] = Y0[i]*mw/W[i]; } } - scalar h0 = 0.0; + const scalar h0 = ::h0(thermo, Y0, p[0], T0); + forAll(Y, i) { Y[i] = Y0[i]; - h0 += Y0[i]*specieData[i].Hs(p[0], T0); } thermo.he() = dimensionedScalar("h", dimEnergy/dimMass, h0); diff --git a/applications/solvers/combustion/chemFoam/thermoTypeFunctions.H b/applications/solvers/combustion/chemFoam/thermoTypeFunctions.H new file mode 100644 index 0000000000..d8fcc68a03 --- /dev/null +++ b/applications/solvers/combustion/chemFoam/thermoTypeFunctions.H @@ -0,0 +1,117 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2018 OpenFOAM Foundation + \\/ 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 3 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, see . + +\*---------------------------------------------------------------------------*/ + +template +scalarList W(const rhoReactionThermo& thermo) +{ + const PtrList& specieData = + dynamicCast>(thermo) + .speciesData(); + + scalarList W(specieData.size()); + + forAll(specieData, i) + { + W[i] = specieData[i].W(); + } + + return W; +} + + +template +scalar h0 +( + const rhoReactionThermo& thermo, + const scalarList& Y, + const scalar p, + const scalar T +) +{ + const PtrList& specieData = + dynamic_cast&>(thermo) + .speciesData(); + + scalar h0 = 0; + forAll(Y, i) + { + h0 += Y[i]*specieData[i].Hs(p, T); + } + + return h0; +} + + +scalarList W(const rhoReactionThermo& thermo) +{ + if (isA>(thermo)) + { + return W(thermo); + } + else if (isA>(thermo)) + { + return W(thermo); + } + else + { + FatalErrorInFunction + << "Thermodynamics type " << thermo.type() + << " not supported by chemFoam" + << exit(FatalError); + + return scalarList::null(); + } +} + + +scalar h0 +( + const rhoReactionThermo& thermo, + const scalarList& Y, + const scalar p, + const scalar T +) +{ + if (isA>(thermo)) + { + return h0(thermo, Y, p, T); + } + else if (isA>(thermo)) + { + return h0(thermo, Y, p, T); + } + else + { + FatalErrorInFunction + << "Thermodynamics type " << thermo.type() + << " not supported by chemFoam" + << exit(FatalError); + + return 0; + } +} + + +// ************************************************************************* // diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C index ac6d039c1b..af0ff24b2d 100644 --- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C +++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) #define CREATE_MESH createEngineMesh.H #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createEngineTime.H" #include "createEngineMesh.H" #include "createControl.H" diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options index 2c51626426..b50245d7ed 100644 --- a/applications/solvers/combustion/fireFoam/Make/options +++ b/applications/solvers/combustion/fireFoam/Make/options @@ -6,6 +6,7 @@ EXE_INC = \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C index ad51a77feb..07bae92baf 100644 --- a/applications/solvers/combustion/fireFoam/fireFoam.C +++ b/applications/solvers/combustion/fireFoam/fireFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C index 2135823563..31dd49791a 100644 --- a/applications/solvers/combustion/reactingFoam/reactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C index eb0200aeda..b8bfd27e4c 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C index d3f4234f41..73939f9102 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H index 0e2e83eb74..980aedc0b9 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/rho/fixedRhoFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,9 +24,6 @@ License Class Foam::fixedRhoFvPatchScalarField -Group - grpInletBoundaryConditions - Description Foam::fixedRhoFvPatchScalarField diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C index 7f31cf3cb4..898f2eba95 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) #define NO_CONTROL #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createDynamicFvMesh.H" #include "createFields.H" diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C index 2d5357bf24..ae735b1d7f 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) #define NO_CONTROL #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createFields.H" diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C index 36287119d3..f438e6799e 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createDynamicFvMesh.H" #include "createDyMControls.H" @@ -141,7 +141,7 @@ int main(int argc, char *argv[]) } } - if (pimple.firstIter()) + if (pimple.firstIter() && !pimple.simpleRho()) { #include "rhoEqn.H" } diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C index 2528b96bb9..b3fe905d34 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C index f7e857e478..a84445d7d6 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C @@ -42,7 +42,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C b/applications/solvers/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C index 6bf5af7e80..61e75fb81a 100644 --- a/applications/solvers/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C +++ b/applications/solvers/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,7 +40,7 @@ int main(int argc, char *argv[]) #define NO_CONTROL #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createFields.H" diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C index b05ad54dac..5ed437b5a7 100644 --- a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C +++ b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C @@ -1,9 +1,9 @@ /*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\/ M anipulation | ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -34,7 +34,7 @@ Description int main(int argc, char *argv[]) { - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C index 02c9083881..8c002d84b3 100644 --- a/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C +++ b/applications/solvers/discreteMethods/molecularDynamics/mdFoam/mdFoam.C @@ -1,9 +1,9 @@ /*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\/ M anipulation | ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) #define NO_CONTROL #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createFields.H" diff --git a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C index 94cd1f0ca7..96f9ea37bd 100644 --- a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C +++ b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -35,7 +35,7 @@ Description int main(int argc, char *argv[]) { - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" diff --git a/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C b/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C index 1b7d4f4f94..76733ad987 100644 --- a/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C +++ b/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -62,7 +62,7 @@ int main(int argc, char *argv[]) "write the paramagnetic particle force field" ); - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" diff --git a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C index 0fa7ab41bd..dd19c9fa79 100644 --- a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C +++ b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/financial/financialFoam/financialFoam.C b/applications/solvers/financial/financialFoam/financialFoam.C index 74636b59ae..bd7be11e83 100644 --- a/applications/solvers/financial/financialFoam/financialFoam.C +++ b/applications/solvers/financial/financialFoam/financialFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -40,7 +40,7 @@ int main(int argc, char *argv[]) #define NO_CONTROL #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createFields.H" diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C index 6af00497fc..42c7dc21ed 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C index fb70d3157f..51a1072d66 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C index 1968b44a8c..be481de6b1 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C index b97a015545..0689bc236e 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C @@ -43,7 +43,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C index c58eadb06c..b76f20aa5b 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionFoam.C @@ -25,11 +25,9 @@ Application chtMultiRegionFoam Description - Transient solver for buoyant, turbulent fluid flow and solid heat - conduction with conjugate heat transfer between solid and fluid regions. - - It handles secondary fluid or solid circuits which can be coupled - thermally with the main fluid region. i.e radiators, etc. + Solver for steady or transient fluid flow and solid heat conduction, with + conjugate heat transfer between regions, buoyancy effects, turbulence, + reactions and radiation modelling. \*---------------------------------------------------------------------------*/ @@ -56,7 +54,7 @@ int main(int argc, char *argv[]) #define CREATE_MESH createMeshesPostProcess.H #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMeshes.H" #include "createFields.H" diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H index c8484f8f71..a38cffc637 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H @@ -121,13 +121,7 @@ forAll(fluidRegions, i) ) ); - dimensionedScalar ghRef - ( - mag(gFluid[i].value()) > small - ? gFluid[i] - & (cmptMag(gFluid[i].value())/mag(gFluid[i].value()))*hRefFluid[i] - : dimensionedScalar("ghRef", gFluid[i].dimensions()*dimLength, 0) - ); + dimensionedScalar ghRef(- mag(gFluid[i])*hRefFluid[i]); Info<< " Adding to ghFluid\n" << endl; ghFluid.set diff --git a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C index 294ce4af0a..3cf1bbb9a0 100644 --- a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C +++ b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) #define NO_CONTROL #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createFields.H" diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C index a89e91b350..98bb2eb2eb 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C +++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C @@ -71,7 +71,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C index 7ea05b37b1..0167d9d84a 100644 --- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C +++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) { argList::noParallel(); - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" diff --git a/applications/solvers/incompressible/icoFoam/icoFoam.C b/applications/solvers/incompressible/icoFoam/icoFoam.C index 04581bcb20..f2e1efce13 100644 --- a/applications/solvers/incompressible/icoFoam/icoFoam.C +++ b/applications/solvers/incompressible/icoFoam/icoFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -36,7 +36,7 @@ Description int main(int argc, char *argv[]) { - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C index 82179a9686..60c275c19b 100644 --- a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C +++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,7 +39,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMeshNoClear.H" #include "createControl.H" diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C index bb91f01790..15a367beb4 100644 --- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C index 5e29dc3aa1..55fdc8dc95 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,8 +25,8 @@ Application pimpleDyMFoam.C Description - Transient solver for incompressible, turbulent flow of Newtonian fluids - on a moving mesh. + Transient solver for incompressible, turbulent flow of Newtonian fluids, + with optional mesh motion and mesh topology changes. Turbulence modelling is generic, i.e. laminar, RAS or LES may be selected. @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createDynamicFvMesh.H" #include "initContinuityErrs.H" diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C index a92bad9856..c6362495de 100644 --- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C +++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C index a29f31a761..1ca3f034e0 100644 --- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C +++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -41,7 +41,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C index f43c7eafec..2b14f51300 100644 --- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C @@ -43,7 +43,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C index 259de8644e..5f55635aa7 100644 --- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) #define CREATE_FIELDS_2 createPorousZones.H #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C index d70af1578f..e7156586eb 100644 --- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C +++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C @@ -42,7 +42,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C index df56530a7d..5822b7ca63 100644 --- a/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C +++ b/applications/solvers/lagrangian/DPMFoam/DPMDyMFoam/DPMDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createDynamicFvMesh.H" #include "createDyMControls.H" diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C index 908a319d7d..919c671a05 100644 --- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C +++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C index 53047c1c87..ca58ae35ca 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C +++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C index 3b876bc9ca..3b22621a16 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createDynamicFvMesh.H" #include "createControl.H" diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C index 4b9a556cfe..7b91a57e19 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C index 3dc11dc84f..18b341c1a1 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C index 99b863c4a2..a1f75b9e03 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C b/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C index 1b7076e3a5..e17eb9b21f 100644 --- a/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) #define CREATE_MESH createEngineMesh.H #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createEngineTime.H" #include "createEngineMesh.H" #include "createControl.H" diff --git a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C index 1422c7401f..112279e061 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,7 +48,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createDynamicFvMesh.H" #include "createDyMControls.H" diff --git a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C index d428d743e3..b86412870d 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/uncoupledKinematicParcelDyMFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/uncoupledKinematicParcelDyMFoam.C index 18f8e63869..f0c7674835 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/uncoupledKinematicParcelDyMFoam.C +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelDyMFoam/uncoupledKinematicParcelDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) #define NO_CONTROL #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createDynamicFvMesh.H" #include "createFields.H" diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C index 2154014cef..55b2037547 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) #define NO_CONTROL #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createFields.H" diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C index 380ab3b8e0..c9db98e755 100644 --- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C +++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createDynamicFvMesh.H" #include "createControls.H" diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C index 4f20f53313..3a16ea026b 100644 --- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C +++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C index 22a675972f..678b3015e7 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,11 +22,12 @@ License along with OpenFOAM. If not, see . Application - compressibleInterFoam + compressibleInterFilmFoam Description Solver for 2 compressible, non-isothermal immiscible fluids using a VOF - (volume of fluid) phase-fraction based interface capturing approach. + (volume of fluid) phase-fraction based interface capturing approach + and surface film modelling. The momentum and other fluid properties are of the "mixture" and a single momentum equation is solved. @@ -55,7 +56,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C index 91fdfcd16e..b40230935b 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C @@ -59,7 +59,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createDynamicFvMesh.H" #include "initContinuityErrs.H" diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C index 192dee724d..df79d50c0a 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C +++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C @@ -26,7 +26,7 @@ License #include "twoPhaseMixtureThermo.H" #include "gradientEnergyFvPatchScalarField.H" #include "mixedEnergyFvPatchScalarField.H" - +#include "collatedFileOperation.H" // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // @@ -80,6 +80,10 @@ Foam::twoPhaseMixtureThermo::twoPhaseMixtureThermo T2.write(); } + // Note: we're writing files to be read in immediately afterwards. + // Avoid any thread-writing problems. + fileHandler().flush(); + thermo1_ = rhoThermo::New(U.mesh(), phase1Name()); thermo2_ = rhoThermo::New(U.mesh(), phase2Name()); diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C index 3dc33d6a64..d807918d7f 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C index 211a19488f..5af99e3d84 100644 --- a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C +++ b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,7 +51,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C index ff7db8f738..8f4f02652e 100644 --- a/applications/solvers/multiphase/interFoam/interFoam.C +++ b/applications/solvers/multiphase/interFoam/interFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createDynamicFvMesh.H" #include "initContinuityErrs.H" diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C index c9fb5dc69c..d51768a9ff 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,7 +49,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createDynamicFvMesh.H" #include "initContinuityErrs.H" diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C index 3d7bf2f542..83912bee09 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createDynamicFvMesh.H" #include "createDyMControls.H" diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C index 2ca0fdcef9..cfae36e927 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -55,7 +55,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H index 0b1c155f45..0e0bd298c3 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,23 +44,23 @@ Description SourceFiles Kunz.C -\*--------------------------------------------------------------------*/ +\*---------------------------------------------------------------------------*/ #ifndef Kunz_H #define Kunz_H #include "phaseChangeTwoPhaseMixture.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { namespace phaseChangeTwoPhaseMixtures { -/*--------------------------------------------------------------------*\ - Class Kunz -\*--------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*\ + Class Kunz +\*---------------------------------------------------------------------------*/ class Kunz : diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H index 1de1263e5c..11c47ba7c3 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Merkle/Merkle.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,23 +38,23 @@ Description SourceFiles Merkle.C -\*--------------------------------------------------------------------*/ +\*---------------------------------------------------------------------------*/ #ifndef Merkle_H #define Merkle_H #include "phaseChangeTwoPhaseMixture.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { namespace phaseChangeTwoPhaseMixtures { -/*--------------------------------------------------------------------*\ - Class Merkle -\*--------------------------------------------------------------------*/ +/*---------------------------------------------------------------------------*\ + Class Merkle +\*---------------------------------------------------------------------------*/ class Merkle : diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H index c3b8f86a46..e2d665a8f2 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -38,23 +38,23 @@ Description SourceFiles SchnerrSauer.C -\*--------------------------------------------------------------------*/ +\*---------------------------------------------------------------------------*/ #ifndef SchnerrSauer_H #define SchnerrSauer_H #include "phaseChangeTwoPhaseMixture.H" -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // namespace Foam { namespace phaseChangeTwoPhaseMixtures { -/*--------------------------------------------------------------------*\ +/*---------------------------------------------------------------------------*\ Class SchnerrSauer -\*--------------------------------------------------------------------*/ +\*---------------------------------------------------------------------------*/ class SchnerrSauer : diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C index a1b7f7f718..20596a6c8e 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C @@ -25,7 +25,7 @@ Application multiphaseEulerFoam Description - Solver for a system of many compressible fluid phases including + Solver for a system of many incompressible fluid phases including heat-transfer. \*---------------------------------------------------------------------------*/ @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C index 9723bb5b84..5765878b43 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,7 +47,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createDynamicFvMesh.H" #include "initContinuityErrs.H" diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C index 70113ade70..c6c3184e55 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createDynamicFvMesh.H" #include "initContinuityErrs.H" diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C index 79af884167..559f7608a5 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H index 25cb73feac..46b11855c0 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H +++ b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,9 +25,6 @@ Class Foam::compressible:: alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField -Group - grpCmpWallFunctions - Description A simple alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField with a fixed volumetric phase-change mass flux. diff --git a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H index 5b2f77b79f..1a8ec52ef8 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H +++ b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,9 +25,6 @@ Class Foam::compressible:: alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField -Group - grpCmpWallFunctions - Description This boundary condition provides a thermal wall function for turbulent thermal diffusivity (usually\c alphat) based on the Jayatilleke model for @@ -62,8 +59,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef compressiblealphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField_H -#define compressiblealphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField_H +#ifndef compressible_alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField_H +#define compressible_alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField_H #include "alphatPhaseChangeWallFunctionFvPatchScalarField.H" @@ -75,7 +72,7 @@ namespace compressible { /*---------------------------------------------------------------------------*\ - Class alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField Declaration + Class alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ class alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField diff --git a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H index 597324397e..317098d3f6 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H +++ b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatPhaseChangeWallFunction/alphatPhaseChangeWallFunctionFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,9 +24,6 @@ License Class Foam::compressible::alphatPhaseChangeWallFunctionFvPatchScalarField -Group - grpCmpWallFunctions - Description Abstract base-class for all alphatWallFunctions supporting phase-change. diff --git a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H index e004c5526f..9226208c71 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H +++ b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,9 +24,6 @@ License Class Foam::compressible::alphatWallBoilingWallFunctionFvPatchScalarField -Group - grpCmpWallFunctions - Description A thermal wall function for simulation of subcooled nucleate wall boiling with runtime selctable submodels for: @@ -123,8 +120,8 @@ SourceFiles \*---------------------------------------------------------------------------*/ -#ifndef compressiblealphatWallBoilingWallFunctionFvPatchScalarField_H -#define compressiblealphatWallBoilingWallFunctionFvPatchScalarField_H +#ifndef compressible_alphatWallBoilingWallFunctionFvPatchScalarField_H +#define compressible_alphatWallBoilingWallFunctionFvPatchScalarField_H #include "alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.H" #include "partitioningModel.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H index 67f06f799b..a0420d2cda 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H +++ b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/copiedFixedValue/copiedFixedValueFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,9 +24,6 @@ License Class Foam::copiedFixedValueFvPatchScalarField -Group - grpCmpWallFunctions - Description Copies the boundary values from a user specified field. diff --git a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H index 7229042abc..3a04f11a75 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H +++ b/applications/solvers/multiphase/reactingEulerFoam/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,9 +24,6 @@ License Class Foam::fixedMultiPhaseHeatFluxFvPatchScalarField -Group - grpCmpWallFunctions - Description Calculates a wall temperature that produces the specified overall wall heat flux across all the phases in an Eulerian multi-phase simulation. diff --git a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/phaseForces/phaseForces.H b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/phaseForces/phaseForces.H index 227c759df1..2afb3b6052 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/phaseForces/phaseForces.H +++ b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/phaseForces/phaseForces.H @@ -24,9 +24,6 @@ License Class Foam::functionObjects::phaseForces -Group - grpForcesFunctionObjects - Description This function object calculates and outputs the blended interfacial forces acting on a given phase (drag, virtual mass, lift, wall-lubrication and diff --git a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H index 86bc22260e..a6448813f9 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H +++ b/applications/solvers/multiphase/reactingEulerFoam/functionObjects/sizeDistribution/sizeDistribution.H @@ -24,9 +24,6 @@ License Class Foam::functionObjects::sizeDistribution -Group - grpFieldFunctionObjects - Description This function object calculates and outputs information about the size distribution of the dispersed phase, such as the number density function or diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C index bb2eca1834..1efa90073b 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C @@ -63,33 +63,32 @@ Foam::dragModels::IshiiZuber::~IshiiZuber() Foam::tmp Foam::dragModels::IshiiZuber::CdRe() const { - volScalarField Re(pair_.Re()); - volScalarField Eo(pair_.Eo()); + const volScalarField Re(pair_.Re()); + const volScalarField Eo(pair_.Eo()); - volScalarField mud(pair_.dispersed().mu()); - volScalarField muc(pair_.continuous().mu()); + const volScalarField mud(pair_.dispersed().mu()); + const volScalarField muc(pair_.continuous().mu()); - volScalarField muStar((mud + 0.4*muc)/(mud + muc)); + const volScalarField muStar((mud + 0.4*muc)/(mud + muc)); - volScalarField muMix + const volScalarField muMix ( - muc - *pow(max(1 - pair_.dispersed(), scalar(1e-3)), -2.5*muStar) + muc*pow(max(1 - pair_.dispersed(), scalar(1e-3)), -2.5*muStar) ); - volScalarField ReM(Re*muc/muMix); - volScalarField CdRe + const volScalarField ReM(Re*muc/muMix); + const volScalarField CdRe ( - pos0(1000 - ReM)*24*(scalar(1) + 0.15*pow(ReM, 0.687)) + pos0(1000 - ReM)*24*(scalar(1) + 0.1*pow(ReM, 0.75)) + neg(1000 - ReM)*0.44*ReM ); volScalarField F((muc/muMix)*sqrt(1 - pair_.dispersed())); F.max(1e-3); - volScalarField Ealpha((1 + 17.67*pow(F, 0.8571428))/(18.67*F)); + const volScalarField Ealpha((1 + 17.67*pow(F, 0.8571428))/(18.67*F)); - volScalarField CdReEllipse(Ealpha*0.6666*sqrt(Eo)*Re); + const volScalarField CdReEllipse(Ealpha*0.6666*sqrt(Eo)*Re); return pos0(CdReEllipse - CdRe) diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H index 0212b08f05..08a8080529 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H @@ -2,10 +2,9 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- - License This file is part of OpenFOAM. diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C index 1cff0aa636..701e1eee88 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C @@ -24,6 +24,7 @@ License \*---------------------------------------------------------------------------*/ #include "phasePair.H" +#include "phaseSystem.H" #include "surfaceTensionModel.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -166,13 +167,9 @@ Foam::tmp Foam::phasePair::EoH2() const Foam::tmp Foam::phasePair::sigma() const { return - phase1().mesh().lookupObject + phase1().fluid().lookupSubModel ( - IOobject::groupName - ( - surfaceTensionModel::typeName, - phasePair::name() - ) + phasePair(phase1(), phase2()) ).sigma(); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C index e22ff881b2..c142229637 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/driftModels/phaseChange/phaseChange.C @@ -8,7 +8,6 @@ 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 3 of the License, or diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C index 6d269cd033..8cbe0d25a2 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C @@ -30,6 +30,7 @@ License #include "driftModel.H" #include "nucleationModel.H" #include "phaseSystem.H" +#include "surfaceTensionModel.H" #include "fvmDdt.H" #include "fvcDdt.H" #include "fvmSup.H" @@ -1152,13 +1153,11 @@ Foam::diameterModels::populationBalanceModel::sigmaWithContinuousPhase const phaseModel& dispersedPhase ) const { - const phasePairKey key - ( - dispersedPhase.name(), - continuousPhase_.name() - ); - - return fluid_.sigma(key); + return + fluid_.lookupSubModel + ( + phasePair(dispersedPhase, continuousPhase_) + ).sigma(); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C index 65d311e59c..1f427c699e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C index 67e38316e8..b48f35684a 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C @@ -46,7 +46,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H index b534865923..87b1630b7f 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.H @@ -1,8 +1,8 @@ -/*---------------------------------------------------------------------------* \ +/*---------------------------------------------------------------------------*\ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C index 45a6e71469..4b3bb89940 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C index 74adfb84a9..1efa90073b 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -63,33 +63,32 @@ Foam::dragModels::IshiiZuber::~IshiiZuber() Foam::tmp Foam::dragModels::IshiiZuber::CdRe() const { - volScalarField Re(pair_.Re()); - volScalarField Eo(pair_.Eo()); + const volScalarField Re(pair_.Re()); + const volScalarField Eo(pair_.Eo()); - volScalarField mud(pair_.dispersed().mu()); - volScalarField muc(pair_.continuous().mu()); + const volScalarField mud(pair_.dispersed().mu()); + const volScalarField muc(pair_.continuous().mu()); - volScalarField muStar((mud + 0.4*muc)/(mud + muc)); + const volScalarField muStar((mud + 0.4*muc)/(mud + muc)); - volScalarField muMix + const volScalarField muMix ( - muc - *pow(max(1 - pair_.dispersed(), scalar(1e-3)), -2.5*muStar) + muc*pow(max(1 - pair_.dispersed(), scalar(1e-3)), -2.5*muStar) ); - volScalarField ReM(Re*muc/muMix); - volScalarField CdRe + const volScalarField ReM(Re*muc/muMix); + const volScalarField CdRe ( - pos0(1000 - ReM)*24.0*(scalar(1) + 0.15*pow(ReM, 0.687)) + pos0(1000 - ReM)*24*(scalar(1) + 0.1*pow(ReM, 0.75)) + neg(1000 - ReM)*0.44*ReM ); volScalarField F((muc/muMix)*sqrt(1 - pair_.dispersed())); F.max(1e-3); - volScalarField Ealpha((1 + 17.67*pow(F, 0.8571428))/(18.67*F)); + const volScalarField Ealpha((1 + 17.67*pow(F, 0.8571428))/(18.67*F)); - volScalarField CdReEllipse(Ealpha*0.6666*sqrt(Eo)*Re); + const volScalarField CdReEllipse(Ealpha*0.6666*sqrt(Eo)*Re); return pos0(CdReEllipse - CdRe) diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H index ec4b476a9b..08a8080529 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/IshiiZuber/IshiiZuber.H @@ -2,10 +2,9 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2014-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- - License This file is part of OpenFOAM. diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C index ee8d157df6..3033d9b019 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControl.H" diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C index a21ff6c2da..098cda1a58 100644 --- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C +++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C @@ -44,7 +44,7 @@ int main(int argc, char *argv[]) { #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControls.H" diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C index 93c1c0de4b..14c730fa02 100644 --- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C +++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,7 +45,7 @@ int main(int argc, char *argv[]) #define NO_CONTROL #include "postProcess.H" - #include "setRootCase.H" + #include "setRootCaseLists.H" #include "createTime.H" #include "createMesh.H" #include "createControls.H" diff --git a/applications/test/BinSum/Make/options b/applications/test/BinSum/Make/options index 6a9e9810b3..e69de29bb2 100644 --- a/applications/test/BinSum/Make/options +++ b/applications/test/BinSum/Make/options @@ -1,2 +0,0 @@ -/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */ -/* EXE_LIBS = -lfiniteVolume */ diff --git a/applications/test/Distribution/Make/files b/applications/test/Distribution/Make/files index 3b3486c124..627b32aea2 100644 --- a/applications/test/Distribution/Make/files +++ b/applications/test/Distribution/Make/files @@ -1,3 +1,3 @@ Test-Distribution.C -EXE = $(FOAM_USER_APPBIN)/Test-DistributionTest +EXE = $(FOAM_USER_APPBIN)/Test-Distribution diff --git a/applications/test/Distribution/Test-Distribution.C b/applications/test/Distribution/Test-Distribution.C index f893e1e4bc..fa6748b0ec 100644 --- a/applications/test/Distribution/Test-Distribution.C +++ b/applications/test/Distribution/Test-Distribution.C @@ -1,9 +1,9 @@ /*---------------------------------------------------------------------------*\ - ========= | - \\ / F ield | OpenFOAM: The Open Source CFD Toolbox - \\ / O peration | - \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation - \\/ M anipulation | + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2011-2018 OpenFOAM Foundation + \\/ M anipulation | ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -66,12 +66,12 @@ int main(int argc, char *argv[]) Info<< nl << "Distribution" << nl << "Sampling " << randomDistributionTestSize - << " times from GaussNormal distribution." + << " times from a standard normal distribution." << endl; for (label i = 0; i < randomDistributionTestSize; i++) { - dS.add(2.5*R.GaussNormal() + 8.5); + dS.add(2.5*R.scalarNormal() + 8.5); } Info<< "Mean " << dS.mean() << nl @@ -85,12 +85,12 @@ int main(int argc, char *argv[]) Info<< nl << "Distribution" << nl << "Sampling " << randomDistributionTestSize - << " times from GaussNormal distribution." + << " times from a standard normal distribution." << endl; for (label i = 0; i < randomDistributionTestSize; i++) { - dS2.add(1.5*R.GaussNormal() -6.0); + dS2.add(1.5*R.scalarNormal() -6.0); } Info<< "Mean " << dS2.mean() << nl @@ -150,23 +150,23 @@ int main(int argc, char *argv[]) Info<< nl << "Distribution" << nl << "Sampling " << randomDistributionTestSize - << " times from uniform and GaussNormal distribution." + << " times from uniform and a standard normal distribution." << endl; for (label i = 0; i < randomDistributionTestSize; i++) { - dV.add(R.vector01()); + dV.add(R.sample01()); - // Adding separate GaussNormal components with component + // Adding separate standard normal components with component // weights dV.add ( vector ( - R.GaussNormal()*3.0 + 1.5, - R.GaussNormal()*0.25 + 4.0, - R.GaussNormal()*3.0 - 1.5 + R.scalarNormal()*3.0 + 1.5, + R.scalarNormal()*0.25 + 4.0, + R.scalarNormal()*3.0 - 1.5 ), vector(1.0, 2.0, 5.0) ); @@ -197,9 +197,9 @@ int main(int argc, char *argv[]) // ( // labelVector // ( - // R.integer(-1000, 1000), - // R.integer(-5000, 5000), - // R.integer(-2000, 7000) + // R.sampleAB