diff --git a/applications/solvers/combustion/PDRFoam/Make/options b/applications/solvers/combustion/PDRFoam/Make/options index b9937a8a69..135659c276 100644 --- a/applications/solvers/combustion/PDRFoam/Make/options +++ b/applications/solvers/combustion/PDRFoam/Make/options @@ -23,7 +23,7 @@ EXE_LIBS = \ -lmeshTools \ -lcompressibleTurbulenceModel \ -lcompressibleRASModels \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ -lspecie \ -llaminarFlameSpeedModels \ diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C index 1e08ae1197..79b9fb7756 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.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-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,7 +50,7 @@ PDRkEpsilon::PDRkEpsilon const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - const basicThermo& thermophysicalModel, + const fluidThermo& thermophysicalModel, const word& turbulenceModelName, const word& modelName ) diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H index 68387c934a..d210aab70c 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 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -100,7 +100,7 @@ public: const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - const basicThermo& thermophysicalModel, + const fluidThermo& thermophysicalModel, const word& turbulenceModelName = turbulenceModel::typeName, const word& modelName = typeName ); diff --git a/applications/solvers/combustion/PDRFoam/createFields.H b/applications/solvers/combustion/PDRFoam/createFields.H index c4be37dfc9..64d3058c0e 100644 --- a/applications/solvers/combustion/PDRFoam/createFields.H +++ b/applications/solvers/combustion/PDRFoam/createFields.H @@ -60,7 +60,17 @@ Info<< "Creating field dpdt\n" << endl; - volScalarField dpdt("dpdt", fvc::ddt(p)); + volScalarField dpdt + ( + IOobject + ( + "dpdt", + runTime.timeName(), + mesh + ), + mesh, + dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + ); Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); diff --git a/applications/solvers/combustion/PDRFoam/pEqn.H b/applications/solvers/combustion/PDRFoam/pEqn.H index f3ba02efbe..e1c4274f33 100644 --- a/applications/solvers/combustion/PDRFoam/pEqn.H +++ b/applications/solvers/combustion/PDRFoam/pEqn.H @@ -70,4 +70,7 @@ U = HbyA - (invA & (betav*fvc::grad(p))); U.correctBoundaryConditions(); K = 0.5*magSqr(U); -dpdt = fvc::ddt(p); +if (thermo.dpdt()) +{ + dpdt = fvc::ddt(p); +} diff --git a/applications/solvers/combustion/XiFoam/Make/options b/applications/solvers/combustion/XiFoam/Make/options index 66dae7fcb3..0812df5e3b 100644 --- a/applications/solvers/combustion/XiFoam/Make/options +++ b/applications/solvers/combustion/XiFoam/Make/options @@ -13,7 +13,7 @@ EXE_LIBS = \ -lcompressibleTurbulenceModel \ -lcompressibleRASModels \ -lcompressibleLESModels \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ -lspecie \ -llaminarFlameSpeedModels \ diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H index a09e1c8f25..c266010adb 100644 --- a/applications/solvers/combustion/XiFoam/createFields.H +++ b/applications/solvers/combustion/XiFoam/createFields.H @@ -61,7 +61,17 @@ ); Info<< "Creating field dpdt\n" << endl; - volScalarField dpdt("dpdt", fvc::ddt(p)); + volScalarField dpdt + ( + IOobject + ( + "dpdt", + runTime.timeName(), + mesh + ), + mesh, + dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + ); Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); diff --git a/applications/solvers/combustion/XiFoam/pEqn.H b/applications/solvers/combustion/XiFoam/pEqn.H index 723df7af98..1543ca539a 100644 --- a/applications/solvers/combustion/XiFoam/pEqn.H +++ b/applications/solvers/combustion/XiFoam/pEqn.H @@ -70,4 +70,7 @@ U = HbyA - rAU*fvc::grad(p); U.correctBoundaryConditions(); K = 0.5*magSqr(U); -dpdt = fvc::ddt(p); +if (thermo.dpdt()) +{ + dpdt = fvc::ddt(p); +} diff --git a/applications/solvers/combustion/chemFoam/Make/options b/applications/solvers/combustion/chemFoam/Make/options index d5a7a75202..7b95c2f16f 100644 --- a/applications/solvers/combustion/chemFoam/Make/options +++ b/applications/solvers/combustion/chemFoam/Make/options @@ -14,7 +14,7 @@ EXE_LIBS = \ -lfiniteVolume \ -lcompressibleRASModels \ -lreactionThermophysicalModels \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lchemistryModel \ -lODE \ -lthermophysicalFunctions \ diff --git a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H index c125a7f31f..e5e7de6496 100644 --- a/applications/solvers/combustion/chemFoam/createSingleCellMesh.H +++ b/applications/solvers/combustion/chemFoam/createSingleCellMesh.H @@ -33,6 +33,14 @@ fvMesh mesh List patches(1); -patches[0] = new emptyPolyPatch("boundary", 6, 0, 0, mesh.boundaryMesh()); +patches[0] = new emptyPolyPatch +( + "boundary", + 6, + 0, + 0, + mesh.boundaryMesh(), + emptyPolyPatch::typeName +); mesh.addFvPatches(patches); diff --git a/applications/solvers/combustion/coldEngineFoam/Make/options b/applications/solvers/combustion/coldEngineFoam/Make/options index dfd9248ded..5af1f2fd61 100644 --- a/applications/solvers/combustion/coldEngineFoam/Make/options +++ b/applications/solvers/combustion/coldEngineFoam/Make/options @@ -13,6 +13,6 @@ EXE_LIBS = \ -lcompressibleTurbulenceModel \ -lcompressibleRASModels \ -lcompressibleLESModels \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lspecie \ -lfiniteVolume diff --git a/applications/solvers/combustion/coldEngineFoam/createFields.H b/applications/solvers/combustion/coldEngineFoam/createFields.H index 0446550579..f97c40eab9 100644 --- a/applications/solvers/combustion/coldEngineFoam/createFields.H +++ b/applications/solvers/combustion/coldEngineFoam/createFields.H @@ -55,7 +55,17 @@ ); Info<< "Creating field dpdt\n" << endl; - volScalarField dpdt("dpdt", fvc::ddt(p)); + volScalarField dpdt + ( + IOobject + ( + "dpdt", + runTime.timeName(), + mesh + ), + mesh, + dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + ); Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); diff --git a/applications/solvers/combustion/engineFoam/Make/options b/applications/solvers/combustion/engineFoam/Make/options index cf5fa5febe..ff38fdf051 100644 --- a/applications/solvers/combustion/engineFoam/Make/options +++ b/applications/solvers/combustion/engineFoam/Make/options @@ -13,7 +13,7 @@ EXE_LIBS = \ -lcompressibleTurbulenceModel \ -lcompressibleRASModels \ -lcompressibleLESModels \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lreactionThermophysicalModels \ -lspecie \ -llaminarFlameSpeedModels \ diff --git a/applications/solvers/combustion/engineFoam/pEqn.H b/applications/solvers/combustion/engineFoam/pEqn.H index 00603dc7d9..d66cdd8130 100644 --- a/applications/solvers/combustion/engineFoam/pEqn.H +++ b/applications/solvers/combustion/engineFoam/pEqn.H @@ -64,4 +64,7 @@ U = HbyA - rAU*fvc::grad(p); U.correctBoundaryConditions(); K = 0.5*magSqr(U); -dpdt = fvc::ddt(p); +if (thermo.dpdt()) +{ + dpdt = fvc::ddt(p); +} diff --git a/applications/solvers/combustion/fireFoam/Make/options b/applications/solvers/combustion/fireFoam/Make/options index f1f6e1d951..861bde659c 100644 --- a/applications/solvers/combustion/fireFoam/Make/options +++ b/applications/solvers/combustion/fireFoam/Make/options @@ -6,7 +6,7 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solid/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ - -I$(LIB_SRC)/thermophysicalModels/basicSolidThermo/lnInclude \ + -I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/chemistryModel/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/solidChemistryModel/lnInclude \ -I$(LIB_SRC)/combustionModels/lnInclude \ @@ -33,7 +33,7 @@ EXE_LIBS = \ -lcompressibleRASModels \ -lcompressibleLESModels \ -lspecie \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lsolidProperties \ -lsolidMixtureProperties \ -lthermophysicalFunctions \ diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H index 555e09aefb..873ae28a07 100644 --- a/applications/solvers/combustion/fireFoam/createFields.H +++ b/applications/solvers/combustion/fireFoam/createFields.H @@ -85,7 +85,17 @@ Info<< "Creating field dpdt\n" << endl; - volScalarField dpdt("dpdt", fvc::ddt(p)); + volScalarField dpdt + ( + IOobject + ( + "dpdt", + runTime.timeName(), + mesh + ), + mesh, + dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + ); Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); diff --git a/applications/solvers/combustion/fireFoam/pEqn.H b/applications/solvers/combustion/fireFoam/pEqn.H index 22c3f0139a..4c33f5633e 100644 --- a/applications/solvers/combustion/fireFoam/pEqn.H +++ b/applications/solvers/combustion/fireFoam/pEqn.H @@ -52,4 +52,7 @@ p = p_rgh + rho*gh; K = 0.5*magSqr(U); -dpdt = fvc::ddt(p); +if (thermo.dpdt()) +{ + dpdt = fvc::ddt(p); +} diff --git a/applications/solvers/combustion/reactingFoam/Make/options b/applications/solvers/combustion/reactingFoam/Make/options index 8eb6d4cabd..46b69a63cd 100644 --- a/applications/solvers/combustion/reactingFoam/Make/options +++ b/applications/solvers/combustion/reactingFoam/Make/options @@ -14,7 +14,7 @@ EXE_LIBS = \ -lcompressibleLESModels \ -lreactionThermophysicalModels \ -lspecie \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lchemistryModel \ -lODE \ -lfiniteVolume \ diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H index 21a7fac1e7..24f4135d7d 100644 --- a/applications/solvers/combustion/reactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/createFields.H @@ -62,7 +62,17 @@ reaction->setTurbulence(turbulence()); Info<< "Creating field dpdt\n" << endl; -volScalarField dpdt("dpdt", fvc::ddt(p)); +volScalarField dpdt +( + IOobject + ( + "dpdt", + runTime.timeName(), + mesh + ), + mesh, + dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) +); Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); diff --git a/applications/solvers/combustion/reactingFoam/pEqn.H b/applications/solvers/combustion/reactingFoam/pEqn.H index 723df7af98..1543ca539a 100644 --- a/applications/solvers/combustion/reactingFoam/pEqn.H +++ b/applications/solvers/combustion/reactingFoam/pEqn.H @@ -70,4 +70,7 @@ U = HbyA - rAU*fvc::grad(p); U.correctBoundaryConditions(); K = 0.5*magSqr(U); -dpdt = fvc::ddt(p); +if (thermo.dpdt()) +{ + dpdt = fvc::ddt(p); +} diff --git a/applications/solvers/combustion/rhoReactingFoam/Make/options b/applications/solvers/combustion/rhoReactingFoam/Make/options index 5a5df2ed7b..8d18c08338 100644 --- a/applications/solvers/combustion/rhoReactingFoam/Make/options +++ b/applications/solvers/combustion/rhoReactingFoam/Make/options @@ -16,7 +16,7 @@ EXE_LIBS = \ -lcompressibleLESModels \ -lreactionThermophysicalModels \ -lspecie \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lchemistryModel \ -lODE \ -lfiniteVolume \ diff --git a/applications/solvers/combustion/rhoReactingFoam/createFields.H b/applications/solvers/combustion/rhoReactingFoam/createFields.H index f58e6e71bd..c0b1a76381 100644 --- a/applications/solvers/combustion/rhoReactingFoam/createFields.H +++ b/applications/solvers/combustion/rhoReactingFoam/createFields.H @@ -64,7 +64,17 @@ reaction->setTurbulence(turbulence()); Info<< "Creating field dpdt\n" << endl; -volScalarField dpdt("dpdt", fvc::ddt(p)); +volScalarField dpdt +( + IOobject + ( + "dpdt", + runTime.timeName(), + mesh + ), + mesh, + dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) +); Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); diff --git a/applications/solvers/combustion/rhoReactingFoam/pEqn.H b/applications/solvers/combustion/rhoReactingFoam/pEqn.H index ef11c677ad..85dbbf7f7e 100644 --- a/applications/solvers/combustion/rhoReactingFoam/pEqn.H +++ b/applications/solvers/combustion/rhoReactingFoam/pEqn.H @@ -89,5 +89,8 @@ U.correctBoundaryConditions(); K = 0.5*magSqr(U); - dpdt = fvc::ddt(p); + if (thermo.dpdt()) + { + dpdt = fvc::ddt(p); + } } diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options index 999e0466cd..6870682cf2 100644 --- a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options +++ b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options @@ -5,6 +5,6 @@ EXE_INC = \ LIB_LIBS = \ -lfiniteVolume \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lspecie diff --git a/applications/solvers/compressible/rhoCentralFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/Make/options index b3be16a505..4ddaa7fb97 100644 --- a/applications/solvers/compressible/rhoCentralFoam/Make/options +++ b/applications/solvers/compressible/rhoCentralFoam/Make/options @@ -9,7 +9,7 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lspecie \ -lrhoCentralFoam \ -lcompressibleTurbulenceModel \ diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options index 250effbee2..33707728f6 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options @@ -10,7 +10,7 @@ EXE_INC = \ EXE_LIBS = \ -lfiniteVolume \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lspecie \ -lrhoCentralFoam \ -lcompressibleTurbulenceModel \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/Make/options index 47a62ae92a..f21e7394e4 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleFoam/Make/options @@ -5,7 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lspecie \ -lcompressibleTurbulenceModel \ -lcompressibleRASModels \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H index e81fea6291..8d3a6ad21d 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H @@ -55,7 +55,17 @@ ); Info<< "Creating field dpdt\n" << endl; - volScalarField dpdt("dpdt", fvc::ddt(p)); + volScalarField dpdt + ( + IOobject + ( + "dpdt", + runTime.timeName(), + mesh + ), + mesh, + dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + ); Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H index 3d324e085b..d40c66d402 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H @@ -94,4 +94,7 @@ U = HbyA - rAU*fvc::grad(p); U.correctBoundaryConditions(); K = 0.5*magSqr(U); -dpdt = fvc::ddt(p); +if (thermo.dpdt()) +{ + dpdt = fvc::ddt(p); +} diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options index d16a0ee1d8..6d3c41f0df 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/Make/options @@ -6,7 +6,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lspecie \ -lcompressibleTurbulenceModel \ -lcompressibleRASModels \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H index 7ef1b62533..75ed20e271 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimplecFoam/pEqn.H @@ -102,7 +102,10 @@ U = HbyA - rAtU*fvc::grad(p); U.correctBoundaryConditions(); K = 0.5*magSqr(U); -dpdt = fvc::ddt(p); +if (thermo.dpdt()) +{ + dpdt = fvc::ddt(p); +} // Recalculate density from the relaxed pressure rho = thermo.rho(); diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/Make/options index dcf5a81490..5c83c910d9 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFLTSPimpleFoam/Make/options @@ -8,7 +8,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lspecie \ -lcompressibleTurbulenceModel \ -lcompressibleRASModels \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/options index 4067875fbc..f01ebda533 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/options @@ -7,7 +7,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lspecie \ -lcompressibleTurbulenceModel \ -lcompressibleRASModels \ diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H index 3c75e87e64..b68823c6e3 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H @@ -96,4 +96,7 @@ U = HbyA - rAU*fvc::grad(p); U.correctBoundaryConditions(); K = 0.5*magSqr(U); -dpdt = fvc::ddt(p); +if (thermo.dpdt()) +{ + dpdt = fvc::ddt(p); +} diff --git a/applications/solvers/compressible/rhoSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/Make/options index 700a6a6753..339cc53bd9 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/Make/options @@ -6,7 +6,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lspecie \ -lcompressibleTurbulenceModel \ -lcompressibleRASModels \ diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/Make/options index 14e73bf2a5..2d328b3ed1 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/Make/options @@ -9,7 +9,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lthermalPorousZone \ -lspecie \ -lcompressibleTurbulenceModel \ diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options index 30c1e55d31..8a8553525f 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimplecFoam/Make/options @@ -7,7 +7,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lspecie \ -lcompressibleRASModels \ -lfiniteVolume \ diff --git a/applications/solvers/compressible/sonicFoam/Make/options b/applications/solvers/compressible/sonicFoam/Make/options index a5b9436ac6..f9c097c874 100644 --- a/applications/solvers/compressible/sonicFoam/Make/options +++ b/applications/solvers/compressible/sonicFoam/Make/options @@ -4,7 +4,7 @@ EXE_INC = \ -I$(LIB_SRC)/finiteVolume/lnInclude EXE_LIBS = \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lspecie \ -lcompressibleTurbulenceModel \ -lcompressibleRASModels \ diff --git a/applications/solvers/compressible/sonicFoam/UEqn.H b/applications/solvers/compressible/sonicFoam/UEqn.H index 27edbece47..c002490b48 100644 --- a/applications/solvers/compressible/sonicFoam/UEqn.H +++ b/applications/solvers/compressible/sonicFoam/UEqn.H @@ -6,3 +6,4 @@ fvVectorMatrix UEqn ); solve(UEqn == -fvc::grad(p)); +K = 0.5*magSqr(U); diff --git a/applications/solvers/compressible/sonicFoam/createFields.H b/applications/solvers/compressible/sonicFoam/createFields.H index 14ae0941d2..3c39d3e7aa 100644 --- a/applications/solvers/compressible/sonicFoam/createFields.H +++ b/applications/solvers/compressible/sonicFoam/createFields.H @@ -49,3 +49,6 @@ thermo ) ); + + Info<< "Creating field kinetic energy K\n" << endl; + volScalarField K("K", 0.5*magSqr(U)); diff --git a/applications/solvers/compressible/sonicFoam/eEqn.H b/applications/solvers/compressible/sonicFoam/eEqn.H index 6733f52885..cfd908ded8 100644 --- a/applications/solvers/compressible/sonicFoam/eEqn.H +++ b/applications/solvers/compressible/sonicFoam/eEqn.H @@ -5,7 +5,7 @@ + fvm::div(phi, e) - fvm::laplacian(turbulence->alphaEff(), e) == - - p*fvc::div(phi/fvc::interpolate(rho)) + - (fvc::ddt(rho, K) + fvc::div(phi, volScalarField("Ekp", K + p/rho))) ); thermo.correct(); diff --git a/applications/solvers/compressible/sonicFoam/pEqn.H b/applications/solvers/compressible/sonicFoam/pEqn.H index aeebee2df5..99ca26fce3 100644 --- a/applications/solvers/compressible/sonicFoam/pEqn.H +++ b/applications/solvers/compressible/sonicFoam/pEqn.H @@ -39,3 +39,4 @@ for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) U = HbyA - rAU*fvc::grad(p); U.correctBoundaryConditions(); +K = 0.5*magSqr(U); diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options index 73e3e02dc4..263b9861ed 100644 --- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options +++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options @@ -7,7 +7,7 @@ EXE_INC = \ -I$(LIB_SRC)/meshTools/lnInclude EXE_LIBS = \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lspecie \ -lcompressibleTurbulenceModel \ -lcompressibleRASModels \ diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C index 2697c3ea96..954404b6a4 100644 --- a/applications/solvers/compressible/sonicFoam/sonicFoam.C +++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C @@ -56,16 +56,12 @@ int main(int argc, char *argv[]) #include "compressibleCourantNo.H" #include "rhoEqn.H" - #include "UEqn.H" - #include "eEqn.H" - - // --- PISO loop - for (int corr=0; corrsetTurbulence(turbulence()); Info<< "Creating field dpdt\n" << endl; - volScalarField dpdt("dpdt", fvc::ddt(p)); + volScalarField dpdt + ( + IOobject + ( + "dpdt", + runTime.timeName(), + mesh + ), + mesh, + dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + ); Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); diff --git a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H index 3a61b28e60..22d927ca6b 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/pEqn.H @@ -82,4 +82,7 @@ sources.correct(U); K = 0.5*magSqr(U); -dpdt = fvc::ddt(p); +if (thermo.dpdt()) +{ + dpdt = fvc::ddt(p); +} diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options index f7bb7d2f2d..4535f635dc 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/Make/options @@ -21,7 +21,7 @@ EXE_LIBS = \ -llagrangian \ -llagrangianIntermediate \ -lthermophysicalFunctions \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lspecie \ -lradiationModels \ -lincompressibleRASModels \ diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C index 557344fa62..8f7619cdd3 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C @@ -72,7 +72,7 @@ int main(int argc, char *argv[]) laminarTransport.correct(); - mu = nu*rhoInfValue; + mu = laminarTransport.nu()*rhoInfValue; kinematicCloud.evolve(); diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options index 9986f9f78b..cb0f90524a 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/Make/options @@ -17,7 +17,7 @@ EXE_LIBS = \ -llagrangian \ -llagrangianIntermediate \ -lthermophysicalFunctions \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lspecie \ -lradiationModels \ -lincompressibleRASModels \ diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H index 125f8706d1..4a9dc609e9 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H @@ -54,8 +54,6 @@ incompressible::turbulenceModel::New(U, phi, laminarTransport) ); - const volScalarField nu(laminarTransport.nu()); - volScalarField mu ( IOobject @@ -66,7 +64,7 @@ IOobject::NO_READ, IOobject::AUTO_WRITE ), - nu*rhoInfValue + laminarTransport.nu()*rhoInfValue ); word kinematicCloudName("kinematicCloud"); diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C index 79436625e2..6e9c2bfe7e 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C @@ -66,7 +66,7 @@ int main(int argc, char *argv[]) laminarTransport.correct(); - mu = nu*rhoInfValue; + mu = laminarTransport.nu()*rhoInfValue; kinematicCloud.evolve(); diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options index 7fc77306fd..1f776f0412 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/Make/options @@ -35,7 +35,7 @@ EXE_LIBS = \ -llagrangian \ -llagrangianIntermediate \ -lspecie \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lliquidProperties \ -lliquidMixtureProperties \ -lsolidProperties \ diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H index 1dfb6aa284..41d5401f08 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/createFields.H @@ -95,7 +95,17 @@ ); Info<< "Creating field dpdt\n" << endl; - volScalarField dpdt("dpdt", fvc::ddt(p)); + volScalarField dpdt + ( + IOobject + ( + "dpdt", + runTime.timeName(), + mesh + ), + mesh, + dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + ); Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); diff --git a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H index 4c9b41bba4..4401afc9fc 100644 --- a/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H +++ b/applications/solvers/lagrangian/porousExplicitSourceReactingParcelFoam/pEqn.H @@ -59,5 +59,8 @@ K = 0.5*magSqr(U); - dpdt = fvc::ddt(p); + if (thermo.dpdt()) + { + dpdt = fvc::ddt(p); + } } diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options index 5a1c428566..a477abff47 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/Make/options @@ -29,7 +29,7 @@ EXE_LIBS = \ -lcompressibleRASModels \ -lcompressibleLESModels \ -lspecie \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lsolidProperties \ -lsolidMixtureProperties \ -lthermophysicalFunctions \ diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H index 6b0dd8655f..d5cd8e6aee 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H @@ -65,7 +65,17 @@ combustion->setTurbulence(turbulence()); Info<< "Creating field dpdt\n" << endl; - volScalarField dpdt("dpdt", fvc::ddt(p)); + volScalarField dpdt + ( + IOobject + ( + "dpdt", + runTime.timeName(), + mesh + ), + mesh, + dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + ); Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H index 3f4f485cf6..6a09845b6b 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H @@ -49,4 +49,7 @@ p = p_rgh + rho*gh; K = 0.5*magSqr(U); -dpdt = fvc::ddt(p); +if (thermo.dpdt()) +{ + dpdt = fvc::ddt(p); +} diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options index ba327a029f..6438a34c29 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options @@ -35,7 +35,7 @@ EXE_LIBS = \ -llagrangian \ -llagrangianIntermediate \ -lspecie \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lliquidProperties \ -lliquidMixtureProperties \ -lsolidProperties \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H index 3d27c50bc6..ead3dac75f 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H @@ -72,7 +72,17 @@ combustion->setTurbulence(turbulence()); Info<< "Creating field dpdt\n" << endl; - volScalarField dpdt("dpdt", fvc::ddt(p)); + volScalarField dpdt + ( + IOobject + ( + "dpdt", + runTime.timeName(), + mesh + ), + mesh, + dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + ); Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H index 511347cdce..d476a6bda8 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/pEqn.H @@ -77,4 +77,7 @@ U.correctBoundaryConditions(); sources.correct(U); K = 0.5*magSqr(U); -dpdt = fvc::ddt(p); +if (thermo.dpdt()) +{ + dpdt = fvc::ddt(p); +} diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options index 647a53c1b4..0d5e4b6dd4 100644 --- a/applications/solvers/lagrangian/sprayFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/Make/options @@ -37,7 +37,7 @@ EXE_LIBS = \ -llagrangianIntermediate \ -llagrangianSpray \ -lspecie \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lliquidProperties \ -lliquidMixtureProperties \ -lsolidProperties \ diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options index f32b47478d..d9ae7414b2 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options @@ -39,7 +39,7 @@ EXE_LIBS = \ -llagrangianIntermediate \ -llagrangianSpray \ -lspecie \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lliquidProperties \ -lliquidMixtureProperties \ -lsolidProperties \ diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H index 1bdc5cf996..475077d317 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H +++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H @@ -77,4 +77,7 @@ U.correctBoundaryConditions(); sources.correct(U); K = 0.5*magSqr(U); -dpdt = fvc::ddt(p); +if (thermo.dpdt()) +{ + dpdt = fvc::ddt(p); +} diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options index d302015a31..12c7c1c551 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/Make/options @@ -15,7 +15,7 @@ EXE_LIBS = \ -llagrangian \ -llagrangianIntermediate \ -lthermophysicalFunctions \ - -lbasicThermophysicalModels \ + -lfluidThermophysicalModels \ -lspecie \ -lradiationModels \ -lcompressibleTurbulenceModel \ diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H index c969d827d5..e0cd5328c9 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H @@ -374,7 +374,17 @@ Info<< "Creating field dpdt\n" << endl; - volScalarField dpdt("dpdt", fvc::ddt(p)); + volScalarField dpdt + ( + IOobject + ( + "dpdt", + runTime.timeName(), + mesh + ), + mesh, + dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) + ); Info<< "Creating field kinetic energy K\n" << endl; volScalarField K1("K1", 0.5*magSqr(U1)); diff --git a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H index d5a5d20631..f7010b1c45 100644 --- a/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H +++ b/applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H @@ -180,5 +180,8 @@ K1 = 0.5*magSqr(U1); K2 = 0.5*magSqr(U2); - dpdt = fvc::ddt(p); + //***HGW if (thermo.dpdt()) + { + dpdt = fvc::ddt(p); + } } diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C index 4dd5c2ef51..d1804b5b6d 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.C @@ -403,11 +403,6 @@ Foam::multiphaseSystem::multiphaseSystem calcAlphas(); alphas_.write(); - forAllIter(PtrDictionary, phases_, iter) - { - phaseModelTable_.add(iter()); - } - interfaceDictTable dragModelsDict(lookup("drag")); forAllConstIter(interfaceDictTable, dragModelsDict, iter) @@ -418,8 +413,8 @@ Foam::multiphaseSystem::multiphaseSystem dragModel::New ( iter(), - *phaseModelTable_.find(iter.key().first())(), - *phaseModelTable_.find(iter.key().second())() + *phases_.lookup(iter.key().first()), + *phases_.lookup(iter.key().second()) ).ptr() ); } diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H index 33ba3d76e9..b9238c9928 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/multiphaseSystem.H @@ -159,25 +159,6 @@ private: //- Dictionary of phases PtrDictionary phases_; - //- phaseModelTable - class phaseModelTable - : - public HashTable - { - public: - - phaseModelTable() - {} - - void add(const phaseModel& pm) - { - this->insert(pm.name(), &pm); - } - }; - - //- Phase model table for quick lookup - phaseModelTable phaseModelTable_; - const fvMesh& mesh_; const surfaceScalarField& phi_; diff --git a/applications/test/dictionary/testDict b/applications/test/dictionary/testDict index 5fdee9401c..af6c565f6f 100644 --- a/applications/test/dictionary/testDict +++ b/applications/test/dictionary/testDict @@ -51,7 +51,7 @@ boundaryField inlet_4 { $inactive } inlet_5 "a primitiveEntry is squashed by a directory entry"; inlet_5 { $inactive } - inlet_6 { $inactive } + inlet_6 { $.inactive } // Test scoping inlet_7 { $inactive } inlet_8 { $inactive } diff --git a/applications/test/dictionary/testDictRegex b/applications/test/dictionary/testDictRegex index c7eeef2613..4a24a74ef3 100644 --- a/applications/test/dictionary/testDictRegex +++ b/applications/test/dictionary/testDictRegex @@ -24,7 +24,7 @@ keyY parentValue5; "(.*)Dict" { foo subdictValue0; - bar $f.*; // should this really match 'foo'? + //bar $f.*; // should this really match 'foo'? // result is dependent on insert order! "a.*c" subdictValue3; diff --git a/applications/test/pointField/Test-PointField.C b/applications/test/pointField/Test-PointField.C index 8646d87801..56528228e1 100644 --- a/applications/test/pointField/Test-PointField.C +++ b/applications/test/pointField/Test-PointField.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-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -43,7 +43,7 @@ int main(int argc, char *argv[]) # include "createTime.H" # include "createMesh.H" - pointMesh pMesh(mesh); + const pointMesh& pMesh = pointMesh::New(mesh); pointVectorField U ( diff --git a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C index 22b757e861..b158dbae38 100644 --- a/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C +++ b/applications/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C @@ -208,7 +208,8 @@ label addPatch(polyMesh& mesh, const word& patchName) 0, mesh.nInternalFaces(), patchI, - patches + patches, + emptyPolyPatch::typeName ); forAll(patches, i) diff --git a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C index 876d46d984..94aecd2ffc 100644 --- a/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.C +++ b/applications/utilities/mesh/advanced/refineHexMesh/refineHexMesh.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-2012 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -60,8 +60,6 @@ int main(int argc, char *argv[]) # include "createMesh.H" const word oldInstance = mesh.pointsInstance(); - pointMesh pMesh(mesh); - word cellSetName(args.args()[1]); const bool overwrite = args.optionFound("overwrite"); @@ -114,11 +112,10 @@ int main(int argc, char *argv[]) // Read point fields PtrList psFlds; - ReadFields(pMesh, objects, psFlds); + ReadFields(pointMesh::New(mesh), objects, psFlds); PtrList pvFlds; - ReadFields(pMesh, objects, pvFlds); - + ReadFields(pointMesh::New(mesh), objects, pvFlds); // Construct refiner without unrefinement. Read existing point/cell level. @@ -164,7 +161,6 @@ int main(int argc, char *argv[]) // Update fields mesh.updateMesh(map); - pMesh.updateMesh(map); // Update numbering of cells/vertices. meshCutter.updateMesh(map); @@ -173,7 +169,6 @@ int main(int argc, char *argv[]) if (map().hasMotionPoints()) { mesh.movePoints(map().preMotionPoints()); - pMesh.movePoints(map().preMotionPoints()); } Pout<< "Refined from " << returnReduce(map().nOldCells(), sumOp