diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C index 720e01f54..b889c3867 100644 --- a/applications/solvers/DNS/dnsFoam/dnsFoam.C +++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C @@ -61,7 +61,7 @@ int main(int argc, char *argv[]) { Info<< "Time = " << runTime.timeName() << nl << endl; - force.internalFieldRef() = ReImSum + force.primitiveFieldRef() = ReImSum ( fft::reverseTransform ( diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C index 82bbbede1..befc3f3b5 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.C @@ -105,7 +105,7 @@ Foam::tmp Foam::XiEqModels::basicSubGrid::XiEq() const mesh, dimensionedScalar("zero", Nv.dimensions(), 0.0) ); - N.internalFieldRef() = Nv.internalField()*Cw; + N.primitiveFieldRef() = Nv.primitiveField()*Cw; volSymmTensorField ns ( @@ -125,7 +125,7 @@ Foam::tmp Foam::XiEqModels::basicSubGrid::XiEq() const Zero ) ); - ns.internalFieldRef() = nsv.internalField()*Cw; + ns.primitiveFieldRef() = nsv.primitiveField()*Cw; volScalarField n(max(N - (Uhat & ns & Uhat), scalar(1e-4))); volScalarField b((Uhat & B_ & Uhat)/sqrt(n)); diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C index 45050a171..26104e40a 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.C @@ -73,7 +73,7 @@ Foam::tmp Foam::XiGModels::basicSubGrid::G() const volScalarField& Gtot = tGtot.ref(); const scalarField Cw = pow(Su_.mesh().V(), 2.0/3.0); - scalarField N(Nv.internalField()*Cw); + scalarField N(Nv.primitiveField()*Cw); forAll(N, celli) { diff --git a/applications/solvers/combustion/PDRFoam/StCourantNo.H b/applications/solvers/combustion/PDRFoam/StCourantNo.H index ab12c922f..738f9d33e 100644 --- a/applications/solvers/combustion/PDRFoam/StCourantNo.H +++ b/applications/solvers/combustion/PDRFoam/StCourantNo.H @@ -36,8 +36,8 @@ Description { scalarField sumPhi ( - fvc::surfaceSum(mag(phiSt))().internalField() - / rho.internalField() + fvc::surfaceSum(mag(phiSt))().primitiveField() + / rho.primitiveField() ); StCoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C index 20ae2215c..c2b863087 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.C @@ -74,7 +74,7 @@ Foam::tmp Foam::XiEqModels::Gulder::XiEq() const if (subGridSchelkin_) { - up.internalFieldRef() += calculateSchelkinEffect(uPrimeCoef_); + up.primitiveFieldRef() += calculateSchelkinEffect(uPrimeCoef_); } volScalarField tauEta(sqrt(mag(thermo_.muu()/(thermo_.rhou()*epsilon)))); diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C index 6a585e388..d91f1b9e3 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.C @@ -82,7 +82,7 @@ Foam::tmp Foam::XiEqModels::SCOPEXiEq::XiEq() const volScalarField up(sqrt((2.0/3.0)*k)); if (subGridSchelkin_) { - up.internalFieldRef() += calculateSchelkinEffect(uPrimeCoef_); + up.primitiveFieldRef() += calculateSchelkinEffect(uPrimeCoef_); } volScalarField l(lCoef_*sqrt(3.0/2.0)*up*k/epsilon); diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C index b436b1b0a..a6301ba97 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C @@ -114,7 +114,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const ) ); volScalarField& N = tN.ref(); - N.internalFieldRef() = Nv.internalField()*pow(mesh.V(), 2.0/3.0); + N.primitiveFieldRef() = Nv.primitiveField()*pow(mesh.V(), 2.0/3.0); volSymmTensorField ns ( @@ -134,7 +134,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const Zero ) ); - ns.internalFieldRef() = nsv.internalField()*pow(mesh.V(), 2.0/3.0); + ns.primitiveFieldRef() = nsv.primitiveField()*pow(mesh.V(), 2.0/3.0); const volVectorField Uhat ( @@ -150,7 +150,7 @@ Foam::XiEqModel::calculateSchelkinEffect(const scalar uPrimeCoef) const const scalarField deltaUp(upLocal*(max(scalar(1.0), pow(nr, 0.5)) - 1.0)); // Re use tN - N.internalFieldRef() = upLocal*(max(scalar(1.0), pow(nr, 0.5)) - 1.0); + N.primitiveFieldRef() = upLocal*(max(scalar(1.0), pow(nr, 0.5)) - 1.0); return tN; } diff --git a/applications/solvers/combustion/reactingFoam/setRDeltaT.H b/applications/solvers/combustion/reactingFoam/setRDeltaT.H index d83e12971..5c24294ef 100644 --- a/applications/solvers/combustion/reactingFoam/setRDeltaT.H +++ b/applications/solvers/combustion/reactingFoam/setRDeltaT.H @@ -68,8 +68,8 @@ License rDeltaT.max(1/maxDeltaT); Info<< " Flow = " - << gMin(1/rDeltaT.internalField()) << ", " - << gMax(1/rDeltaT.internalField()) << endl; + << gMin(1/rDeltaT.primitiveField()) << ", " + << gMax(1/rDeltaT.primitiveField()) << endl; } // Reaction source time scale @@ -120,8 +120,8 @@ License rDeltaT.correctBoundaryConditions(); Info<< " Overall = " - << gMin(1/rDeltaT.internalField()) - << ", " << gMax(1/rDeltaT.internalField()) << endl; + << gMin(1/rDeltaT.primitiveField()) + << ", " << gMax(1/rDeltaT.primitiveField()) << endl; } diff --git a/applications/solvers/compressible/rhoCentralFoam/centralCourantNo.H b/applications/solvers/compressible/rhoCentralFoam/centralCourantNo.H index d915d29ac..a0bc0ffaf 100644 --- a/applications/solvers/compressible/rhoCentralFoam/centralCourantNo.H +++ b/applications/solvers/compressible/rhoCentralFoam/centralCourantNo.H @@ -31,7 +31,7 @@ Description if (mesh.nInternalFaces()) { - scalarField sumAmaxSf(fvc::surfaceSum(amaxSf)().internalField()); + scalarField sumAmaxSf(fvc::surfaceSum(amaxSf)().primitiveField()); CoNum = 0.5*gMax(sumAmaxSf/mesh.V().field())*runTime.deltaTValue(); diff --git a/applications/solvers/compressible/rhoCentralFoam/createFields.H b/applications/solvers/compressible/rhoCentralFoam/createFields.H index 538e936e3..6ea26ef40 100644 --- a/applications/solvers/compressible/rhoCentralFoam/createFields.H +++ b/applications/solvers/compressible/rhoCentralFoam/createFields.H @@ -13,7 +13,7 @@ const volScalarField& psi = thermo.psi(); const volScalarField& mu = thermo.mu(); bool inviscid(true); -if (max(mu.internalField()) > 0.0) +if (max(mu.primitiveField()) > 0.0) { inviscid = false; } diff --git a/applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H b/applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H index 4ebe06a6f..4ad54b23b 100644 --- a/applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H +++ b/applications/solvers/compressible/rhoCentralFoam/setRDeltaT.H @@ -24,6 +24,6 @@ fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff); Info<< "Flow time scale min/max = " - << gMin(1/rDeltaT.internalField()) - << ", " << gMax(1/rDeltaT.internalField()) << endl; + << gMin(1/rDeltaT.primitiveField()) + << ", " << gMax(1/rDeltaT.primitiveField()) << endl; } diff --git a/applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H b/applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H index 8591a74b9..db42fb022 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H +++ b/applications/solvers/compressible/rhoPimpleFoam/setRDeltaT.H @@ -53,8 +53,8 @@ rDeltaT.correctBoundaryConditions(); Info<< "Flow time scale min/max = " - << gMin(1/rDeltaT.internalField()) - << ", " << gMax(1/rDeltaT.internalField()) << endl; + << gMin(1/rDeltaT.primitiveField()) + << ", " << gMax(1/rDeltaT.primitiveField()) << endl; if (rDeltaTSmoothingCoeff < 1.0) { @@ -62,8 +62,8 @@ } Info<< "Smoothed flow time scale min/max = " - << gMin(1/rDeltaT.internalField()) - << ", " << gMax(1/rDeltaT.internalField()) << endl; + << gMin(1/rDeltaT.primitiveField()) + << ", " << gMax(1/rDeltaT.primitiveField()) << endl; // Limit rate of change of time scale // - reduce as much as required @@ -79,7 +79,7 @@ *max(rDeltaT/rDeltaT0, scalar(1) - rDeltaTDampingCoeff); Info<< "Damped flow time scale min/max = " - << gMin(1/rDeltaT.internalField()) - << ", " << gMax(1/rDeltaT.internalField()) << endl; + << gMin(1/rDeltaT.primitiveField()) + << ", " << gMax(1/rDeltaT.primitiveField()) << endl; } } diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleCourantNo.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleCourantNo.C index 719082808..1f06ccfbd 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleCourantNo.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/compressibleCourantNo.C @@ -36,8 +36,8 @@ Foam::scalar Foam::compressibleCourantNo { scalarField sumPhi ( - fvc::surfaceSum(mag(phi))().internalField() - / rho.internalField() + fvc::surfaceSum(mag(phi))().primitiveField() + / rho.primitiveField() ); scalar CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H index 13d95cf01..ab10b81f9 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/createSolidFields.H @@ -61,7 +61,7 @@ ) ); - aniAlphas[i].internalFieldRef() = + aniAlphas[i].primitiveFieldRef() = coordinates[i].R().transformVector(tkappaByCp()); aniAlphas[i].correctBoundaryConditions(); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H index d96c34e36..98b081952 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H @@ -14,7 +14,7 @@ if (!thermo.isotropic()) tmp tkappaByCp = thermo.Kappa()/cp; const coordinateSystem& coodSys = coordinates[i]; - aniAlpha.internalFieldRef() = + aniAlpha.primitiveFieldRef() = coodSys.R().transformVector(tkappaByCp()); aniAlpha.correctBoundaryConditions(); diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C index 0753cd316..eafde0cbc 100644 --- a/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C +++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C @@ -46,7 +46,7 @@ Foam::scalar Foam::solidRegionDiffNo / fvc::interpolate(Cprho) ); - DiNum = gMax(kapparhoCpbyDelta.internalField())*runTime.deltaT().value(); + DiNum = gMax(kapparhoCpbyDelta.primitiveField())*runTime.deltaT().value(); meanDiNum = (average(kapparhoCpbyDelta)).value()*runTime.deltaT().value(); diff --git a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H index ca337512d..24351828e 100644 --- a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H +++ b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H @@ -70,7 +70,7 @@ label cellId = patches[patchId].faceCells()[faceId]; scalarField y ( wallNormal - & (mesh.C().internalField() - mesh.C().boundaryField()[patchId][faceId]) + & (mesh.C().primitiveField() - mesh.C().boundaryField()[patchId][faceId]) ); Info<< " Height to first cell centre y0 = " << y[cellId] << endl; diff --git a/applications/solvers/incompressible/shallowWaterFoam/CourantNo.H b/applications/solvers/incompressible/shallowWaterFoam/CourantNo.H index 50959832e..ffdcae91b 100644 --- a/applications/solvers/incompressible/shallowWaterFoam/CourantNo.H +++ b/applications/solvers/incompressible/shallowWaterFoam/CourantNo.H @@ -38,8 +38,8 @@ if (mesh.nInternalFaces()) { scalarField sumPhi ( - fvc::surfaceSum(mag(phi))().internalField() - / h.internalField() + fvc::surfaceSum(mag(phi))().primitiveField() + / h.primitiveField() ); CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); @@ -53,7 +53,7 @@ if (mesh.nInternalFaces()) fvc::surfaceSum ( fvc::interpolate(sqrt(h))*mesh.magSf() - )().internalField()/mesh.V().field() + )().primitiveField()/mesh.V().field() )*sqrt(magg).value()*runTime.deltaTValue(); } diff --git a/applications/solvers/lagrangian/DPMFoam/CourantNo.H b/applications/solvers/lagrangian/DPMFoam/CourantNo.H index 9ff53ed40..4cf132e3b 100644 --- a/applications/solvers/lagrangian/DPMFoam/CourantNo.H +++ b/applications/solvers/lagrangian/DPMFoam/CourantNo.H @@ -36,7 +36,7 @@ if (mesh.nInternalFaces()) { scalarField sumPhi ( - fvc::surfaceSum(mag(phic))().internalField() + fvc::surfaceSum(mag(phic))().primitiveField() ); CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C index 9aa262d9b..772c80bf1 100644 --- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C +++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C @@ -107,7 +107,7 @@ int main(int argc, char *argv[]) zeroGradientFvPatchVectorField::typeName ); - cloudVolSUSu.internalFieldRef() = -cloudSU.source()/mesh.V(); + cloudVolSUSu.primitiveFieldRef() = -cloudSU.source()/mesh.V(); cloudVolSUSu.correctBoundaryConditions(); cloudSU.source() = Zero; diff --git a/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H b/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H index 403ed28ba..7e2ed6074 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/setRDeltaT.H @@ -68,8 +68,8 @@ License rDeltaT.max(1/maxDeltaT); Info<< " Flow = " - << gMin(1/rDeltaT.internalField()) << ", " - << gMax(1/rDeltaT.internalField()) << endl; + << gMin(1/rDeltaT.primitiveField()) << ", " + << gMax(1/rDeltaT.primitiveField()) << endl; } // Reaction source time scale @@ -127,8 +127,8 @@ License } Info<< " Overall = " - << gMin(1/rDeltaT.internalField()) - << ", " << gMax(1/rDeltaT.internalField()) << endl; + << gMin(1/rDeltaT.primitiveField()) + << ", " << gMax(1/rDeltaT.primitiveField()) << endl; } diff --git a/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H b/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H index 3b5219238..63398fb00 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/setRDeltaT.H @@ -68,8 +68,8 @@ License rDeltaT.max(1/maxDeltaT); Info<< " Flow = " - << gMin(1/rDeltaT.internalField()) << ", " - << gMax(1/rDeltaT.internalField()) << endl; + << gMin(1/rDeltaT.primitiveField()) << ", " + << gMax(1/rDeltaT.primitiveField()) << endl; } // Reaction source time scale @@ -126,8 +126,8 @@ License } Info<< " Overall = " - << gMin(1/rDeltaT.internalField()) - << ", " << gMax(1/rDeltaT.internalField()) << endl; + << gMin(1/rDeltaT.primitiveField()) + << ", " << gMax(1/rDeltaT.primitiveField()) << endl; } diff --git a/applications/solvers/multiphase/cavitatingFoam/CourantNo.H b/applications/solvers/multiphase/cavitatingFoam/CourantNo.H index a5bae7452..4a339f996 100644 --- a/applications/solvers/multiphase/cavitatingFoam/CourantNo.H +++ b/applications/solvers/multiphase/cavitatingFoam/CourantNo.H @@ -37,7 +37,7 @@ if (mesh.nInternalFaces()) { scalarField sumPhi ( - fvc::surfaceSum(mag(phi))().internalField() + fvc::surfaceSum(mag(phi))().primitiveField() ); CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); @@ -50,7 +50,7 @@ if (mesh.nInternalFaces()) fvc::surfaceSum ( fvc::interpolate(scalar(1)/sqrt(psi))*mesh.magSf() - )().internalField()/mesh.V().field() + )().primitiveField()/mesh.V().field() )*runTime.deltaTValue(); } diff --git a/applications/solvers/multiphase/interFoam/alphaCourantNo.H b/applications/solvers/multiphase/interFoam/alphaCourantNo.H index 95ad609a5..24d08b9ea 100644 --- a/applications/solvers/multiphase/interFoam/alphaCourantNo.H +++ b/applications/solvers/multiphase/interFoam/alphaCourantNo.H @@ -41,8 +41,8 @@ if (mesh.nInternalFaces()) { scalarField sumPhi ( - mixture.nearInterface()().internalField() - *fvc::surfaceSum(mag(phi))().internalField() + mixture.nearInterface()().primitiveField() + *fvc::surfaceSum(mag(phi))().primitiveField() ); alphaCoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H index 72a9af2c6..6025b6006 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqnsSubCycle.H @@ -35,7 +35,7 @@ else //solve(fvm::ddt(rho) + fvc::div(rhoPhi)); //Info<< "density error = " - // << max((mag(rho - rhoNew)/mag(rhoNew))().internalField()) << endl; + // << max((mag(rho - rhoNew)/mag(rhoNew))().primitiveField()) << endl; rho == rhoNew; } diff --git a/applications/solvers/multiphase/interFoam/setRDeltaT.H b/applications/solvers/multiphase/interFoam/setRDeltaT.H index 86b7dd9d2..697e6588e 100644 --- a/applications/solvers/multiphase/interFoam/setRDeltaT.H +++ b/applications/solvers/multiphase/interFoam/setRDeltaT.H @@ -84,8 +84,8 @@ rDeltaT.correctBoundaryConditions(); Info<< "Flow time scale min/max = " - << gMin(1/rDeltaT.internalField()) - << ", " << gMax(1/rDeltaT.internalField()) << endl; + << gMin(1/rDeltaT.primitiveField()) + << ", " << gMax(1/rDeltaT.primitiveField()) << endl; if (rDeltaTSmoothingCoeff < 1.0) { @@ -111,8 +111,8 @@ } Info<< "Smoothed flow time scale min/max = " - << gMin(1/rDeltaT.internalField()) - << ", " << gMax(1/rDeltaT.internalField()) << endl; + << gMin(1/rDeltaT.primitiveField()) + << ", " << gMax(1/rDeltaT.primitiveField()) << endl; // Limit rate of change of time scale // - reduce as much as required @@ -130,7 +130,7 @@ ); Info<< "Damped flow time scale min/max = " - << gMin(1/rDeltaT.internalField()) - << ", " << gMax(1/rDeltaT.internalField()) << endl; + << gMin(1/rDeltaT.primitiveField()) + << ", " << gMax(1/rDeltaT.primitiveField()) << endl; } } diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/CourantNo.H b/applications/solvers/multiphase/multiphaseEulerFoam/CourantNo.H index a85e136ea..6ea90af09 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/CourantNo.H +++ b/applications/solvers/multiphase/multiphaseEulerFoam/CourantNo.H @@ -36,7 +36,7 @@ if (mesh.nInternalFaces()) { scalarField sumPhi ( - fvc::surfaceSum(mag(phi))().internalField() + fvc::surfaceSum(mag(phi))().primitiveField() ); forAllIter(PtrDictionary, fluid.phases(), iter) @@ -44,7 +44,7 @@ if (mesh.nInternalFaces()) sumPhi = max ( sumPhi, - fvc::surfaceSum(mag(iter().phi()))().internalField() + fvc::surfaceSum(mag(iter().phi()))().primitiveField() ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C index a1e50a16f..fa2bccdcf 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C +++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/segregated/segregated.C @@ -104,7 +104,7 @@ Foam::tmp Foam::dragModels::segregated::K() const dimensionedScalar("L", dimLength, 0), zeroGradientFvPatchField::typeName ); - L.internalFieldRef() = cbrt(mesh.V()); + L.primitiveFieldRef() = cbrt(mesh.V()); L.correctBoundaryConditions(); volScalarField I diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C index fe0343b2a..624ee667c 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/InterfaceCompositionPhaseChangePhaseSystem/InterfaceCompositionPhaseChangePhaseSystem.C @@ -292,9 +292,9 @@ correctThermo() Tf.correctBoundaryConditions(); Info<< "Tf." << pair.name() - << ": min = " << min(Tf.internalField()) - << ", mean = " << average(Tf.internalField()) - << ", max = " << max(Tf.internalField()) + << ": min = " << min(Tf.primitiveField()) + << ", mean = " << average(Tf.primitiveField()) + << ", max = " << max(Tf.primitiveField()) << endl; // Update the interface compositions diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C index 8ba5a4a50..fec8114fc 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C @@ -337,9 +337,9 @@ void Foam::ThermalPhaseChangePhaseSystem::correctThermo() ); Info<< "iDmdt." << pair.name() - << ": min = " << min(iDmdt.internalField()) - << ", mean = " << average(iDmdt.internalField()) - << ", max = " << max(iDmdt.internalField()) + << ": min = " << min(iDmdt.primitiveField()) + << ", mean = " << average(iDmdt.primitiveField()) + << ", max = " << max(iDmdt.primitiveField()) << ", integral = " << fvc::domainIntegrate(iDmdt).value() << endl; } @@ -370,9 +370,9 @@ void Foam::ThermalPhaseChangePhaseSystem::correctThermo() Tf = (H1*T1 + H2*T2 + mDotL)/(H1 + H2); Info<< "Tf." << pair.name() - << ": min = " << min(Tf.internalField()) - << ", mean = " << average(Tf.internalField()) - << ", max = " << max(Tf.internalField()) + << ": min = " << min(Tf.primitiveField()) + << ", mean = " << average(Tf.primitiveField()) + << ", max = " << max(Tf.primitiveField()) << endl; // Accumulate dmdt contributions from boundaries @@ -433,9 +433,9 @@ void Foam::ThermalPhaseChangePhaseSystem::correctThermo() } Info<< "wDmdt." << pair.name() - << ": min = " << min(wDmdt.internalField()) - << ", mean = " << average(wDmdt.internalField()) - << ", max = " << max(wDmdt.internalField()) + << ": min = " << min(wDmdt.primitiveField()) + << ", mean = " << average(wDmdt.primitiveField()) + << ", max = " << max(wDmdt.primitiveField()) << ", integral = " << fvc::domainIntegrate(wDmdt).value() << endl; } @@ -443,9 +443,9 @@ void Foam::ThermalPhaseChangePhaseSystem::correctThermo() dmdt = wDmdt + iDmdt; Info<< "dmdt." << pair.name() - << ": min = " << min(dmdt.internalField()) - << ", mean = " << average(dmdt.internalField()) - << ", max = " << max(dmdt.internalField()) + << ": min = " << min(dmdt.primitiveField()) + << ", mean = " << average(dmdt.primitiveField()) + << ", max = " << max(dmdt.primitiveField()) << ", integral = " << fvc::domainIntegrate(dmdt).value() << endl; } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H index d7d1cc66d..b85ec4395 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/CourantNo.H @@ -36,7 +36,7 @@ if (mesh.nInternalFaces()) { scalarField sumPhi ( - fvc::surfaceSum(mag(phi))().internalField() + fvc::surfaceSum(mag(phi))().primitiveField() ); forAll(phases, phasei) @@ -44,7 +44,7 @@ if (mesh.nInternalFaces()) sumPhi = max ( sumPhi, - fvc::surfaceSum(mag(phases[phasei].phi()))().internalField() + fvc::surfaceSum(mag(phases[phasei].phi()))().primitiveField() ); } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H index 052f704cb..d89c09f9d 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/setRDeltaT.H @@ -39,6 +39,6 @@ fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff); Info<< "Flow time scale min/max = " - << gMin(1/rDeltaT.internalField()) - << ", " << gMax(1/rDeltaT.internalField()) << endl; + << gMin(1/rDeltaT.primitiveField()) + << ", " << gMax(1/rDeltaT.primitiveField()) << endl; } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/CourantNos.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/CourantNos.H index 7ab578dd3..13c45ad51 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/CourantNos.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/CourantNos.H @@ -3,7 +3,7 @@ { scalar UrCoNum = 0.5*gMax ( - fvc::surfaceSum(mag(phi1 - phi2))().internalField()/mesh.V().field() + fvc::surfaceSum(mag(phi1 - phi2))().primitiveField()/mesh.V().field() )*runTime.deltaTValue(); Info<< "Max Ur Courant Number = " << UrCoNum << endl; diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H index f8e880a47..4cb3de01e 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/setRDeltaT.H @@ -32,6 +32,6 @@ fvc::smooth(rDeltaT, rDeltaTSmoothingCoeff); Info<< "Flow time scale min/max = " - << gMin(1/rDeltaT.internalField()) - << ", " << gMax(1/rDeltaT.internalField()) << endl; + << gMin(1/rDeltaT.primitiveField()) + << ", " << gMax(1/rDeltaT.primitiveField()) << endl; } diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C index 46de9ec4f..7b854df50 100755 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatPhaseChangeJayatillekeWallFunction/alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField.C @@ -139,7 +139,7 @@ alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField::calcAlphat const phaseModel& liquid ( - fluid.phase1().name() == dimensionedInternalField().group() + fluid.phase1().name() == internalField().group() ? fluid.phase1() : fluid.phase2() ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C index 4aac38411..15e7727bc 100755 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C @@ -172,7 +172,7 @@ void alphatWallBoilingWallFunctionFvPatchScalarField::updateCoeffs() const phaseModel& liquid ( - fluid.phase1().name() == dimensionedInternalField().group() + fluid.phase1().name() == internalField().group() ? fluid.phase1() : fluid.phase2() ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C index 04715ecbe..651de2ea0 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C @@ -160,7 +160,7 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::updateCoeffs() const phaseModel& phased ( - fluid.phase1().name() == dimensionedInternalField().group() + fluid.phase1().name() == internalField().group() ? fluid.phase1() : fluid.phase2() ); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C index 220c4c05e..2d8a5cce8 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C @@ -181,7 +181,7 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs() const phaseModel& phased ( - fluid.phase1().name() == dimensionedInternalField().group() + fluid.phase1().name() == internalField().group() ? fluid.phase1() : fluid.phase2() ); diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaCourantNo.H b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaCourantNo.H index 6ea204b00..0ff918e39 100644 --- a/applications/solvers/multiphase/twoLiquidMixingFoam/alphaCourantNo.H +++ b/applications/solvers/multiphase/twoLiquidMixingFoam/alphaCourantNo.H @@ -42,7 +42,7 @@ if (mesh.nInternalFaces()) scalarField sumPhi ( pos(alpha1 - 0.01)*pos(0.99 - alpha1) - *fvc::surfaceSum(mag(phi))().internalField() + *fvc::surfaceSum(mag(phi))().primitiveField() ); alphaCoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H b/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H index 248f4c060..d828f3276 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/CourantNos.H @@ -3,7 +3,7 @@ { scalar UrCoNum = 0.5*gMax ( - fvc::surfaceSum(mag(phi1 - phi2))().internalField()/mesh.V().field() + fvc::surfaceSum(mag(phi1 - phi2))().primitiveField()/mesh.V().field() )*runTime.deltaTValue(); Info<< "Max Ur Courant Number = " << UrCoNum << endl; diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C index d7b156da8..a538ba636 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C @@ -104,7 +104,7 @@ Foam::tmp Foam::dragModels::segregated::K() const dimensionedScalar("L", dimLength, 0), zeroGradientFvPatchField::typeName ); - L.internalFieldRef() = cbrt(mesh.V()); + L.primitiveFieldRef() = cbrt(mesh.V()); L.correctBoundaryConditions(); volScalarField I diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C index 4aa484cb5..32d6431b6 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleSlip/JohnsonJacksonParticleSlipFvPatchVectorField.C @@ -160,7 +160,7 @@ void Foam::JohnsonJacksonParticleSlipFvPatchVectorField::updateCoeffs() const phaseModel& phased ( - fluid.phase1().name() == dimensionedInternalField().group() + fluid.phase1().name() == internalField().group() ? fluid.phase1() : fluid.phase2() ); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C index 95fc5b41b..84303276e 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C +++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/derivedFvPatchFields/JohnsonJacksonParticleTheta/JohnsonJacksonParticleThetaFvPatchScalarField.C @@ -180,7 +180,7 @@ void Foam::JohnsonJacksonParticleThetaFvPatchScalarField::updateCoeffs() const phaseModel& phased ( - fluid.phase1().name() == dimensionedInternalField().group() + fluid.phase1().name() == internalField().group() ? fluid.phase1() : fluid.phase2() ); diff --git a/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C b/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C index a3b6e6821..611c8163b 100644 --- a/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C +++ b/applications/test/GAMGAgglomeration/Test-GAMGAgglomeration.C @@ -87,7 +87,7 @@ int main(int argc, char *argv[]) mesh, dimensionedScalar("aggomeration", dimless, 0.0) ); - scalarField& fld = scalarAgglomeration.internalFieldRef(); + scalarField& fld = scalarAgglomeration.primitiveFieldRef(); forAll(fld, celli) { fld[celli] = cellToCoarse[celli]; @@ -166,7 +166,7 @@ int main(int argc, char *argv[]) mesh, dimensionedScalar("aggomeration", dimless, 0.0) ); - scalarField& fld = scalarAgglomeration.internalFieldRef(); + scalarField& fld = scalarAgglomeration.primitiveFieldRef(); forAll(fld, celli) { fld[celli] = cellToCoarse[celli]; diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C index 061290cf8..d0545b7bb 100644 --- a/applications/test/fieldMapping/Test-fieldMapping.C +++ b/applications/test/fieldMapping/Test-fieldMapping.C @@ -300,8 +300,8 @@ int main(int argc, char *argv[]) // Check face field mapping if (surfaceOne.size()) { - const scalar max = gMax(surfaceOne.internalField()); - const scalar min = gMin(surfaceOne.internalField()); + const scalar max = gMax(surfaceOne.primitiveField()); + const scalar min = gMin(surfaceOne.primitiveField()); Info<< "Uniform surface field min = " << min << " max = " << max << endl; diff --git a/applications/test/hexRef8/Test-hexRef8.C b/applications/test/hexRef8/Test-hexRef8.C index 737401a62..f5a4b7c66 100644 --- a/applications/test/hexRef8/Test-hexRef8.C +++ b/applications/test/hexRef8/Test-hexRef8.C @@ -164,7 +164,7 @@ int main(int argc, char *argv[]) dimensionedScalar("one", dimless, 1.0), calculatedPointPatchScalarField::typeName ); - pointX.internalFieldRef() = mesh.points().component(0); + pointX.primitiveFieldRef() = mesh.points().component(0); pointX.correctBoundaryConditions(); Info<< "Writing x-component field " << pointX.name() << " in " << runTime.timeName() << endl; @@ -381,8 +381,8 @@ int main(int argc, char *argv[]) // Check face field mapping if (surfaceOne.size()) { - const scalar max = gMax(surfaceOne.internalField()); - const scalar min = gMin(surfaceOne.internalField()); + const scalar max = gMax(surfaceOne.primitiveField()); + const scalar min = gMin(surfaceOne.primitiveField()); Info<< "Uniform surface field min = " << min << " max = " << max << endl; diff --git a/applications/test/mappedPatch/Test-MappedPatch.C b/applications/test/mappedPatch/Test-MappedPatch.C index 46577e4c8..1349cf3a1 100644 --- a/applications/test/mappedPatch/Test-MappedPatch.C +++ b/applications/test/mappedPatch/Test-MappedPatch.C @@ -86,7 +86,7 @@ int main(int argc, char *argv[]) patchFieldTypes ); - cc.internalFieldRef() = mesh.C().internalField(); + cc.primitiveFieldRef() = mesh.C().primitiveField(); cc.boundaryFieldRef().updateCoeffs(); forAll(cc.boundaryField(), patchi) diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C index 6d72760f7..b0ef8a48b 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/backgroundMeshDecomposition/backgroundMeshDecomposition.C @@ -904,8 +904,8 @@ Foam::backgroundMeshDecomposition::distribute { Info<< " cellWeightLimit " << cellWeightLimit << endl; - Pout<< " sum(cellWeights) " << sum(cellWeights.internalField()) - << " max(cellWeights) " << max(cellWeights.internalField()) + Pout<< " sum(cellWeights) " << sum(cellWeights.primitiveField()) + << " max(cellWeights) " << max(cellWeights.primitiveField()) << endl; } diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C index 1873af19e..39beaedd2 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C @@ -1137,7 +1137,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes zeroGradientFvPatchScalarField::typeName ); - scalarField& cellSize = targetCellSize.internalFieldRef(); + scalarField& cellSize = targetCellSize.primitiveFieldRef(); const vectorField& C = mesh.cellCentres(); @@ -1163,7 +1163,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes // zeroGradientFvPatchScalarField::typeName // ); - // targetCellVolume.internalFieldRef() = pow3(cellSize); + // targetCellVolume.primitiveFieldRef() = pow3(cellSize); // Info<< nl << "Create actualCellVolume volScalarField" << endl; @@ -1182,7 +1182,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes // zeroGradientFvPatchScalarField::typeName // ); - // actualCellVolume.internalFieldRef() = mesh.cellVolumes(); + // actualCellVolume.primitiveFieldRef() = mesh.cellVolumes(); // Info<< nl << "Create equivalentCellSize volScalarField" << endl; @@ -1201,9 +1201,9 @@ void Foam::conformalVoronoiMesh::writeCellSizes // zeroGradientFvPatchScalarField::typeName // ); - // equivalentCellSize.internalFieldRef() = pow + // equivalentCellSize.primitiveFieldRef() = pow // ( - // actualCellVolume.internalField(), + // actualCellVolume.primitiveField(), // 1.0/3.0 // ); @@ -1247,7 +1247,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes // pointPatchVectorField::calculatedType() // ); - // scalarField& cellSize = ptTargetCellSize.internalFieldRef(); + // scalarField& cellSize = ptTargetCellSize.primitiveFieldRef(); // const vectorField& P = tetMesh.points(); @@ -1283,7 +1283,7 @@ void Foam::conformalVoronoiMesh::writeCellAlignments // zeroGradientFvPatchTensorField::typeName // ); // -// tensorField& cellAlignment = cellAlignments.internalFieldRef(); +// tensorField& cellAlignment = cellAlignments.primitiveFieldRef(); // // const vectorField& C = mesh.cellCentres(); // diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C index 4167cb61d..c4fdca83d 100644 --- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C +++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshTemplates.C @@ -117,7 +117,7 @@ bool Foam::conformalVoronoiMesh::distributeBackground(const Triangulation& mesh) } } - scalarField& cwi = cellWeights.internalFieldRef(); + scalarField& cwi = cellWeights.primitiveFieldRef(); forAll(cellVertices, cI) { diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C index 9887130f4..bd02554c8 100644 --- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C +++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshBackgroundMesh/foamyHexMeshBackgroundMesh.C @@ -636,7 +636,7 @@ int main(int argc, char *argv[]) { // Internal field - cellDistance.internalFieldRef() = signedDistance + cellDistance.primitiveFieldRef() = signedDistance ( distSqr, fvm.C(), @@ -701,7 +701,7 @@ int main(int argc, char *argv[]) -sqr(GREAT) // null value ); - pointDistance.internalFieldRef() = signedDistance + pointDistance.primitiveFieldRef() = signedDistance ( pointDistSqr, fvm.points(), diff --git a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C index a54232387..be0b1d406 100644 --- a/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C +++ b/applications/utilities/mesh/manipulation/deformedGeom/deformedGeom.C @@ -82,7 +82,7 @@ int main(int argc, char *argv[]) pointField newPoints ( zeroPoints - + scaleFactor*pInterp.interpolate(U)().internalField() + + scaleFactor*pInterp.interpolate(U)().primitiveField() ); mesh.polyMesh::movePoints(newPoints); diff --git a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C index 944853ad9..c997f5807 100644 --- a/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C +++ b/applications/utilities/parallelProcessing/decomposePar/domainDecompositionDistribute.C @@ -61,7 +61,7 @@ void Foam::domainDecomposition::distributeCells() ), *this ); - cellWeights = weights.internalField(); + cellWeights = weights.primitiveField(); } cellToProc_ = decomposePtr().decompose(*this, cellWeights); diff --git a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposerDecomposeFields.C b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposerDecomposeFields.C index 52f157633..55961704f 100644 --- a/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposerDecomposeFields.C +++ b/applications/utilities/parallelProcessing/decomposePar/pointFieldDecomposerDecomposeFields.C @@ -36,7 +36,7 @@ Foam::pointFieldDecomposer::decomposeField ) const { // Create and map the internal field values - Field internalField(field.internalField(), pointAddressing_); + Field internalField(field.primitiveField(), pointAddressing_); // Create a list of pointers for the patchFields PtrList> patchFields(boundaryAddressing_.size()); diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C index 1221193c1..eaf5a99af 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C +++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/ensightField.C @@ -603,7 +603,7 @@ void ensightPointField writeField ( "coordinates", - Field(pf.internalField(), eMesh.uniquePointMap()), + Field(pf.primitiveField(), eMesh.uniquePointMap()), ensightFile ); } @@ -646,7 +646,7 @@ void ensightPointField writeField ( "coordinates", - Field(pf.internalField(), uniqueMeshPointLabels), + Field(pf.primitiveField(), uniqueMeshPointLabels), ensightFile ); @@ -692,7 +692,7 @@ void ensightPointField "coordinates", Field ( - pf.internalField(), + pf.primitiveField(), uniqueMeshPointLabels ), ensightFile diff --git a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C index 6017e27fe..19f2097ef 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C +++ b/applications/utilities/postProcessing/dataConversion/foamToTetDualMesh/foamToTetDualMesh.C @@ -91,7 +91,7 @@ void ReadAndMapFields ) ); - Field& fld = tetFields[i].internalFieldRef(); + Field& fld = tetFields[i].primitiveFieldRef(); // Map from read field. Set unmapped entries to nullValue. fld.setSize(map.size(), nullValue); diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C index 5f5ddd263..4dcf09ae2 100644 --- a/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C +++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/writeFunsTemplates.C @@ -79,7 +79,7 @@ void Foam::writeFuns::write DynamicList fField(pTraits::nComponents*nValues); - insert(vvf.internalField(), fField); + insert(vvf.primitiveField(), fField); forAll(superCells, superCelli) { diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H index e74937cd2..885e26e00 100644 --- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H +++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/vtkPV3Foam/vtkPV3FoamPointFields.H @@ -152,7 +152,7 @@ void Foam::vtkPV3Foam::convertPointFields // Extract the field on the zone Field fld ( - ptf.internalField(), + ptf.primitiveField(), mesh.faceZones()[zoneId]().meshPoints() ); diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPointFields.H b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPointFields.H index 2e83520e4..fc22aca9a 100644 --- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPointFields.H +++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamPointFields.H @@ -152,7 +152,7 @@ void Foam::vtkPVFoam::convertPointFields // Extract the field on the zone Field fld ( - ptf.internalField(), + ptf.primitiveField(), mesh.faceZones()[zoneId]().meshPoints() ); diff --git a/applications/utilities/preProcessing/boxTurb/boxTurb.C b/applications/utilities/preProcessing/boxTurb/boxTurb.C index 3eb161016..945a5a6d5 100644 --- a/applications/utilities/preProcessing/boxTurb/boxTurb.C +++ b/applications/utilities/preProcessing/boxTurb/boxTurb.C @@ -57,7 +57,7 @@ int main(int argc, char *argv[]) turbGen Ugen(K, Ea, k0); - U.internalFieldRef() = Ugen.U(); + U.primitiveFieldRef() = Ugen.U(); U.correctBoundaryConditions(); Info<< "k(" diff --git a/applications/utilities/preProcessing/setFields/setFields.C b/applications/utilities/preProcessing/setFields/setFields.C index 59eebecd4..ab009d837 100644 --- a/applications/utilities/preProcessing/setFields/setFields.C +++ b/applications/utilities/preProcessing/setFields/setFields.C @@ -88,7 +88,7 @@ bool setCellFieldType if (selectedCells.size() == field.size()) { - field.internalFieldRef() = value; + field.primitiveFieldRef() = value; } else { diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C index 6edd7cf42..aa454dcaf 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.C @@ -725,7 +725,7 @@ Foam::GeometricField::ref() template class PatchField, class GeoMesh> typename Foam::GeometricField::Internal::FieldType& -Foam::GeometricField::internalFieldRef() +Foam::GeometricField::primitiveFieldRef() { this->setUpToDate(); storeOldTimes(); @@ -1016,7 +1016,7 @@ Foam::GeometricField::T() const ) ); - Foam::T(result.ref().internalFieldRef(), internalField()); + Foam::T(result.ref().primitiveFieldRef(), primitiveField()); Foam::T(result.ref().boundaryFieldRef(), boundaryField()); return result; @@ -1053,7 +1053,7 @@ Foam::GeometricField::component ) ); - Foam::component(Component.ref().internalFieldRef(), internalField(), d); + Foam::component(Component.ref().primitiveFieldRef(), primitiveField(), d); Foam::component(Component.ref().boundaryFieldRef(), boundaryField(), d); return Component; @@ -1072,7 +1072,7 @@ void Foam::GeometricField::replace >& gcf ) { - internalFieldRef().replace(d, gcf.internalField()); + primitiveFieldRef().replace(d, gcf.primitiveField()); boundaryFieldRef().replace(d, gcf.boundaryField()); } @@ -1084,7 +1084,7 @@ void Foam::GeometricField::replace const dimensioned& ds ) { - internalFieldRef().replace(d, ds.value()); + primitiveFieldRef().replace(d, ds.value()); boundaryFieldRef().replace(d, ds.value()); } @@ -1095,7 +1095,7 @@ void Foam::GeometricField::max const dimensioned& dt ) { - Foam::max(internalFieldRef(), internalField(), dt.value()); + Foam::max(primitiveFieldRef(), primitiveField(), dt.value()); Foam::max(boundaryFieldRef(), boundaryField(), dt.value()); } @@ -1106,7 +1106,7 @@ void Foam::GeometricField::min const dimensioned& dt ) { - Foam::min(internalFieldRef(), internalField(), dt.value()); + Foam::min(primitiveFieldRef(), primitiveField(), dt.value()); Foam::min(boundaryFieldRef(), boundaryField(), dt.value()); } @@ -1114,7 +1114,7 @@ void Foam::GeometricField::min template class PatchField, class GeoMesh> void Foam::GeometricField::negate() { - internalFieldRef().negate(); + primitiveFieldRef().negate(); boundaryFieldRef().negate(); } @@ -1165,9 +1165,9 @@ void Foam::GeometricField::operator= this->dimensions() = gf.dimensions(); // Transfer the storage from the tmp - internalFieldRef().transfer + primitiveFieldRef().transfer ( - const_cast&>(gf.internalField()) + const_cast&>(gf.primitiveField()) ); boundaryFieldRef() = gf.boundaryField(); diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H index c9b83b458..43bd25c5f 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricField.H @@ -450,7 +450,7 @@ public: Internal& ref(); //- Return a const-reference to the dimensioned internal field - inline const Internal& dimensionedInternalField() const; + inline const Internal& internalField() const; //- Return a const-reference to the dimensioned internal field // of a "vol" field. Useful in the formulation of source-terms @@ -460,10 +460,10 @@ public: //- Return a reference to the internal field // Note: this increments the event counter and checks the // old-time fields; avoid in loops. - typename Internal::FieldType& internalFieldRef(); + typename Internal::FieldType& primitiveFieldRef(); //- Return a const-reference to the internal field - inline const typename Internal::FieldType& internalField() const; + inline const typename Internal::FieldType& primitiveField() const; //- Return a reference to the boundary field // Note: this increments the event counter and checks the diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C index 70e0e5f29..49a7ce2d6 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctions.C @@ -49,7 +49,7 @@ void component const direction d ) { - component(gcf.internalFieldRef(), gf.internalField(), d); + component(gcf.primitiveFieldRef(), gf.primitiveField(), d); component(gcf.boundaryFieldRef(), gf.boundaryField(), d); } @@ -61,7 +61,7 @@ void T const GeometricField& gf1 ) { - T(gf.internalFieldRef(), gf1.internalField()); + T(gf.primitiveFieldRef(), gf1.primitiveField()); T(gf.boundaryFieldRef(), gf1.boundaryField()); } @@ -79,7 +79,7 @@ void pow const GeometricField& gf1 ) { - pow(gf.internalFieldRef(), gf1.internalField(), r); + pow(gf.primitiveFieldRef(), gf1.primitiveField(), r); pow(gf.boundaryFieldRef(), gf1.boundaryField(), r); } @@ -173,7 +173,7 @@ void sqr const GeometricField& gf1 ) { - sqr(gf.internalFieldRef(), gf1.internalField()); + sqr(gf.primitiveFieldRef(), gf1.primitiveField()); sqr(gf.boundaryFieldRef(), gf1.boundaryField()); } @@ -261,7 +261,7 @@ void magSqr const GeometricField& gf ) { - magSqr(gsf.internalFieldRef(), gf.internalField()); + magSqr(gsf.primitiveFieldRef(), gf.primitiveField()); magSqr(gsf.boundaryFieldRef(), gf.boundaryField()); } @@ -333,7 +333,7 @@ void mag const GeometricField& gf ) { - mag(gsf.internalFieldRef(), gf.internalField()); + mag(gsf.primitiveFieldRef(), gf.primitiveField()); mag(gsf.boundaryFieldRef(), gf.boundaryField()); } @@ -410,7 +410,7 @@ void cmptAv const GeometricField& gf ) { - cmptAv(gcf.internalFieldRef(), gf.internalField()); + cmptAv(gcf.primitiveFieldRef(), gf.primitiveField()); cmptAv(gcf.boundaryFieldRef(), gf.boundaryField()); } @@ -505,7 +505,7 @@ dimensioned func \ ( \ #func "(" + gf.name() + ')', \ gf.dimensions(), \ - Foam::func(gFunc(gf.internalField()), gFunc(gf.boundaryField())) \ + Foam::func(gFunc(gf.primitiveField()), gFunc(gf.boundaryField())) \ ); \ } \ \ @@ -538,7 +538,7 @@ dimensioned func \ ( \ #func "(" + gf.name() + ')', \ gf.dimensions(), \ - gFunc(gf.internalField()) \ + gFunc(gf.primitiveField()) \ ); \ } \ \ @@ -601,9 +601,9 @@ void opFunc \ { \ Foam::opFunc \ ( \ - gf.internalFieldRef(), \ - gf1.internalField(), \ - gf2.internalField() \ + gf.primitiveFieldRef(), \ + gf1.primitiveField(), \ + gf2.primitiveField() \ ); \ Foam::opFunc \ ( \ @@ -755,7 +755,7 @@ void opFunc \ const dimensioned
& dvs \ ) \ { \ - Foam::opFunc(gf.internalFieldRef(), gf1.internalField(), dvs.value()); \ + Foam::opFunc(gf.primitiveFieldRef(), gf1.primitiveField(), dvs.value()); \ Foam::opFunc(gf.boundaryFieldRef(), gf1.boundaryField(), dvs.value()); \ } \ \ @@ -868,7 +868,7 @@ void opFunc \ const GeometricField& gf1 \ ) \ { \ - Foam::opFunc(gf.internalFieldRef(), dvs.value(), gf1.internalField()); \ + Foam::opFunc(gf.primitiveFieldRef(), dvs.value(), gf1.primitiveField()); \ Foam::opFunc(gf.boundaryFieldRef(), dvs.value(), gf1.boundaryField()); \ } \ \ diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C index 774b89c75..377339dae 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldFunctionsM.C @@ -41,7 +41,7 @@ void Func \ const GeometricField& gf1 \ ) \ { \ - Foam::Func(res.internalFieldRef(), gf1.internalField()); \ + Foam::Func(res.primitiveFieldRef(), gf1.primitiveField()); \ Foam::Func(res.boundaryFieldRef(), gf1.boundaryField()); \ } \ \ @@ -110,7 +110,7 @@ void OpFunc \ const GeometricField& gf1 \ ) \ { \ - Foam::OpFunc(res.internalFieldRef(), gf1.internalField()); \ + Foam::OpFunc(res.primitiveFieldRef(), gf1.primitiveField()); \ Foam::OpFunc(res.boundaryFieldRef(), gf1.boundaryField()); \ } \ \ @@ -182,9 +182,9 @@ void Func \ { \ Foam::Func \ ( \ - res.internalFieldRef(), \ - gf1.internalField(), \ - gf2.internalField() \ + res.primitiveFieldRef(), \ + gf1.primitiveField(), \ + gf2.primitiveField() \ ); \ Foam::Func \ ( \ @@ -318,7 +318,7 @@ void Func \ const GeometricField& gf2 \ ) \ { \ - Foam::Func(res.internalFieldRef(), dt1.value(), gf2.internalField()); \ + Foam::Func(res.primitiveFieldRef(), dt1.value(), gf2.primitiveField()); \ Foam::Func(res.boundaryFieldRef(), dt1.value(), gf2.boundaryField()); \ } \ \ @@ -409,7 +409,7 @@ void Func \ const dimensioned& dt2 \ ) \ { \ - Foam::Func(res.internalFieldRef(), gf1.internalField(), dt2.value()); \ + Foam::Func(res.primitiveFieldRef(), gf1.primitiveField(), dt2.value()); \ Foam::Func(res.boundaryFieldRef(), gf1.boundaryField(), dt2.value()); \ } \ \ @@ -508,7 +508,7 @@ void OpFunc \ ) \ { \ Foam::OpFunc \ - (res.internalFieldRef(), gf1.internalField(), gf2.internalField()); \ + (res.primitiveFieldRef(), gf1.primitiveField(), gf2.primitiveField()); \ Foam::OpFunc \ (res.boundaryFieldRef(), gf1.boundaryField(), gf2.boundaryField()); \ } \ @@ -637,7 +637,7 @@ void OpFunc \ const GeometricField& gf2 \ ) \ { \ - Foam::OpFunc(res.internalFieldRef(), dt1.value(), gf2.internalField()); \ + Foam::OpFunc(res.primitiveFieldRef(), dt1.value(), gf2.primitiveField()); \ Foam::OpFunc(res.boundaryFieldRef(), dt1.value(), gf2.boundaryField()); \ } \ \ @@ -728,7 +728,7 @@ void OpFunc \ const dimensioned& dt2 \ ) \ { \ - Foam::OpFunc(res.internalFieldRef(), gf1.internalField(), dt2.value()); \ + Foam::OpFunc(res.primitiveFieldRef(), gf1.primitiveField(), dt2.value()); \ Foam::OpFunc(res.boundaryFieldRef(), gf1.boundaryField(), dt2.value()); \ } \ \ diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H index 697da6e59..3339ffd13 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/GeometricFieldI.H @@ -38,7 +38,7 @@ inline const typename Foam::GeometricField::Internal& Foam::GeometricField:: -dimensionedInternalField() const +internalField() const { return *this; } @@ -48,7 +48,7 @@ template class PatchField, class GeoMesh> inline const typename Foam::GeometricField::Internal::FieldType& -Foam::GeometricField::internalField() const +Foam::GeometricField::primitiveField() const { return *this; } diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H b/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H index eac89f814..93a47eda9 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/MapGeometricFields.H @@ -126,7 +126,7 @@ void MapGeometricFields // Map the internal field MapInternalField() ( - field.internalFieldRef(), + field.primitiveFieldRef(), mapper ); diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C index cb3ec9aff..f05d3c5cb 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricScalarField/GeometricScalarField.C @@ -43,7 +43,7 @@ void stabilise const dimensioned& ds ) { - stabilise(result.internalFieldRef(), gsf.internalField(), ds.value()); + stabilise(result.primitiveFieldRef(), gsf.primitiveField(), ds.value()); stabilise(result.boundaryFieldRef(), gsf.boundaryField(), ds.value()); } @@ -126,7 +126,7 @@ void pow const GeometricField& gsf2 ) { - pow(Pow.internalFieldRef(), gsf1.internalField(), gsf2.internalField()); + pow(Pow.primitiveFieldRef(), gsf1.primitiveField(), gsf2.primitiveField()); pow(Pow.boundaryFieldRef(), gsf1.boundaryField(), gsf2.boundaryField()); } @@ -269,7 +269,7 @@ void pow const dimensioned& ds ) { - pow(tPow.internalFieldRef(), gsf.internalField(), ds.value()); + pow(tPow.primitiveFieldRef(), gsf.primitiveField(), ds.value()); pow(tPow.boundaryFieldRef(), gsf.boundaryField(), ds.value()); } @@ -358,7 +358,7 @@ void pow const GeometricField& gsf ) { - pow(tPow.internalFieldRef(), ds.value(), gsf.internalField()); + pow(tPow.primitiveFieldRef(), ds.value(), gsf.primitiveField()); pow(tPow.boundaryFieldRef(), ds.value(), gsf.boundaryField()); } @@ -450,8 +450,18 @@ void atan2 const GeometricField& gsf2 ) { - atan2(Atan2.internalFieldRef(), gsf1.internalField(), gsf2.internalField()); - atan2(Atan2.boundaryFieldRef(), gsf1.boundaryField(), gsf2.boundaryField()); + atan2 + ( + Atan2.primitiveFieldRef(), + gsf1.primitiveField(), + gsf2.primitiveField() + ); + atan2 + ( + Atan2.boundaryFieldRef(), + gsf1.boundaryField(), + gsf2.boundaryField() + ); } @@ -577,7 +587,7 @@ void atan2 const dimensioned& ds ) { - atan2(tAtan2.internalFieldRef(), gsf.internalField(), ds.value()); + atan2(tAtan2.primitiveFieldRef(), gsf.primitiveField(), ds.value()); atan2(tAtan2.boundaryFieldRef(), gsf.boundaryField(), ds.value()); } @@ -666,7 +676,7 @@ void atan2 const GeometricField& gsf ) { - atan2(tAtan2.internalFieldRef(), ds.value(), gsf.internalField()); + atan2(tAtan2.primitiveFieldRef(), ds.value(), gsf.primitiveField()); atan2(tAtan2.boundaryFieldRef(), ds.value(), gsf.boundaryField()); } @@ -799,7 +809,7 @@ void func \ const GeometricField& gsf1 \ ) \ { \ - func(gsf.internalFieldRef(), n, gsf1.internalField()); \ + func(gsf.primitiveFieldRef(), n, gsf1.primitiveField()); \ func(gsf.boundaryFieldRef(), n, gsf1.boundaryField()); \ } \ \ diff --git a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C index a3a42d71d..8bc8c195b 100644 --- a/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C +++ b/src/OpenFOAM/fields/GeometricFields/SlicedGeometricField/SlicedGeometricField.C @@ -305,7 +305,7 @@ SlicedGeometricField ) { // Set the internalField to the supplied internal field - UList::shallowCopy(gf.internalField()); + UList::shallowCopy(gf.primitiveField()); correctBoundaryConditions(); } @@ -334,7 +334,7 @@ SlicedGeometricField ) { // Set the internalField to the supplied internal field - UList::shallowCopy(gf.internalField()); + UList::shallowCopy(gf.primitiveField()); } diff --git a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H index b1d2530c2..7f7a352f7 100644 --- a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H +++ b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneField.H @@ -85,7 +85,7 @@ public: inline Internal v() const; - inline typename Internal::FieldType internalField() const; + inline typename Internal::FieldType primitiveField() const; inline Boundary boundaryField() const; }; diff --git a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H index 1608e0bf5..4364f2650 100644 --- a/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H +++ b/src/OpenFOAM/fields/GeometricFields/geometricOneField/geometricOneFieldI.H @@ -66,7 +66,7 @@ Foam::geometricOneField::v() const inline typename Foam::geometricOneField::Internal::FieldType -Foam::geometricOneField::internalField() const +Foam::geometricOneField::primitiveField() const { return typename Internal::FieldType(); } diff --git a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.C b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.C index 31c70df1c..4146644bf 100644 --- a/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.C +++ b/src/OpenFOAM/fields/GeometricFields/transformGeometricField/transformGeometricField.C @@ -45,8 +45,18 @@ void transform const GeometricField& tf ) { - transform(rtf.internalFieldRef(), trf.internalField(), tf.internalField()); - transform(rtf.boundaryFieldRef(), trf.boundaryField(), tf.boundaryField()); + transform + ( + rtf.primitiveFieldRef(), + trf.primitiveField(), + tf.primitiveField() + ); + transform + ( + rtf.boundaryFieldRef(), + trf.boundaryField(), + tf.boundaryField() + ); } @@ -131,7 +141,7 @@ void transform const GeometricField& tf ) { - transform(rtf.internalFieldRef(), t.value(), tf.internalField()); + transform(rtf.primitiveFieldRef(), t.value(), tf.primitiveField()); transform(rtf.boundaryFieldRef(), t.value(), tf.boundaryField()); } diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C index c4e7b18a0..2253f241a 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/basicSymmetry/basicSymmetryPointPatchField.C @@ -96,7 +96,7 @@ void Foam::basicSymmetryPointPatchField::evaluate ); // Get internal field to insert values into - Field& iF = const_cast&>(this->internalField()); + Field& iF = const_cast&>(this->primitiveField()); this->setInInternalField(iF, tvalues()); } diff --git a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C index e7c7dacb8..09927c049 100644 --- a/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/basic/value/valuePointPatchField.C @@ -155,7 +155,7 @@ void Foam::valuePointPatchField::updateCoeffs() } // Get internal field to insert values into - Field& iF = const_cast&>(this->internalField()); + Field& iF = const_cast&>(this->primitiveField()); this->setInInternalField(iF, *this); @@ -167,7 +167,7 @@ template void Foam::valuePointPatchField::evaluate(const Pstream::commsTypes) { // Get internal field to insert values into - Field& iF = const_cast&>(this->internalField()); + Field& iF = const_cast&>(this->primitiveField()); this->setInInternalField(iF, *this); diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C index ff745bf31..02e66ce22 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclic/cyclicPointPatchField.C @@ -123,7 +123,7 @@ void Foam::cyclicPointPatchField::swapAddSeparated const GeometricField& fld = refCast> ( - this->dimensionedInternalField() + this->internalField() ); const cyclicPointPatchField& nbr = diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C index 8bceca083..ae457ffbc 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/cyclicSlip/cyclicSlipPointPatchField.C @@ -93,7 +93,7 @@ void Foam::cyclicSlipPointPatchField::evaluate(const Pstream::commsTypes) ); // Get internal field to insert values into - Field& iF = const_cast&>(this->internalField()); + Field& iF = const_cast&>(this->primitiveField()); this->setInInternalField(iF, tvalues()); } diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C index f2d0ac7b2..83903ce32 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/nonuniformTransformCyclic/nonuniformTransformCyclicPointPatchField.C @@ -100,7 +100,7 @@ void Foam::nonuniformTransformCyclicPointPatchField::evaluate ); // Get internal field to insert values into - Field& iF = const_cast&>(this->internalField()); + Field& iF = const_cast&>(this->primitiveField()); this->setInInternalField(iF, tvalues()); } diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C index e90c1454f..9351dac4b 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/symmetryPlane/symmetryPlanePointPatchField.C @@ -117,7 +117,7 @@ void Foam::symmetryPlanePointPatchField::evaluate ); // Get internal field to insert values into - Field& iF = const_cast&>(this->internalField()); + Field& iF = const_cast&>(this->primitiveField()); this->setInInternalField(iF, tvalues()); } diff --git a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C index 8a5c7f2da..0c93ef590 100644 --- a/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/constraint/wedge/wedgePointPatchField.C @@ -109,7 +109,7 @@ void Foam::wedgePointPatchField::evaluate(const Pstream::commsTypes) transform(I - nHat*nHat, this->patchInternalField()); // Get internal field to insert values into - Field& iF = const_cast&>(this->internalField()); + Field& iF = const_cast&>(this->primitiveField()); this->setInInternalField(iF, tvalues()); } diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C index f56a8cf1e..2c6327fa1 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/derived/codedFixedValue/codedFixedValuePointPatchField.C @@ -161,7 +161,7 @@ Foam::string Foam::codedFixedValuePointPatchField::description() const "patch " + this->patch().name() + " on field " - + this->dimensionedInternalField().name(); + + this->internalField().name(); } @@ -276,7 +276,7 @@ Foam::codedFixedValuePointPatchField::redirectPatchField() const pointPatchField::New ( this->patch(), - this->dimensionedInternalField(), + this->internalField(), dict ).ptr() ); diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C index 00454c22d..cd99728ca 100644 --- a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C @@ -90,7 +90,7 @@ void Foam::fixedNormalSlipPointPatchField::evaluate transform(I - n_*n_, this->patchInternalField()); // Get internal field to insert values into - Field& iF = const_cast&>(this->internalField()); + Field& iF = const_cast&>(this->primitiveField()); this->setInInternalField(iF, tvalues()); } diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C index fdd069525..aef8c59c9 100644 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C +++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.C @@ -127,7 +127,7 @@ template Foam::tmp> Foam::pointPatchField::patchInternalField() const { - return patchInternalField(internalField()); + return patchInternalField(primitiveField()); } @@ -141,12 +141,12 @@ Foam::pointPatchField::patchInternalField ) const { // Check size - if (iF.size() != internalField().size()) + if (iF.size() != primitiveField().size()) { FatalErrorInFunction << "given internal field does not correspond to the mesh. " << "Field size: " << iF.size() - << " mesh size: " << internalField().size() + << " mesh size: " << primitiveField().size() << abort(FatalError); } @@ -175,12 +175,12 @@ void Foam::pointPatchField::addToInternalField ) const { // Check size - if (iF.size() != internalField().size()) + if (iF.size() != primitiveField().size()) { FatalErrorInFunction << "given internal field does not correspond to the mesh. " << "Field size: " << iF.size() - << " mesh size: " << internalField().size() + << " mesh size: " << primitiveField().size() << abort(FatalError); } @@ -213,12 +213,12 @@ void Foam::pointPatchField::addToInternalField ) const { // Check size - if (iF.size() != internalField().size()) + if (iF.size() != primitiveField().size()) { FatalErrorInFunction << "given internal field does not correspond to the mesh. " << "Field size: " << iF.size() - << " mesh size: " << internalField().size() + << " mesh size: " << primitiveField().size() << abort(FatalError); } @@ -252,12 +252,12 @@ void Foam::pointPatchField::setInInternalField ) const { // Check size - if (iF.size() != internalField().size()) + if (iF.size() != primitiveField().size()) { FatalErrorInFunction << "given internal field does not correspond to the mesh. " << "Field size: " << iF.size() - << " mesh size: " << internalField().size() + << " mesh size: " << primitiveField().size() << abort(FatalError); } diff --git a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H index d69b75f37..5db051b1d 100644 --- a/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H +++ b/src/OpenFOAM/fields/pointPatchFields/pointPatchField/pointPatchField.H @@ -279,13 +279,13 @@ public: //- Return dimensioned internal field reference const DimensionedField& - dimensionedInternalField() const + internalField() const { return internalField_; } //- Return internal field reference - const Field& internalField() const + const Field& primitiveField() const { return internalField_; } diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C index 2bf7bf969..2d372fca7 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C @@ -116,7 +116,7 @@ void convectiveHeatTransferFvPatchScalarField::updateCoeffs() IOobject::groupName ( compressible::turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C index 9ab7aba69..aa2367468 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C @@ -133,7 +133,7 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::transferData IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C index e0f2f2cba..7401f2746 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C @@ -147,8 +147,8 @@ externalWallHeatFluxTemperatureFvPatchScalarField << "\n patch type '" << p.type() << "' either q or h and Ta were not found '" << "\n for patch " << p.name() - << " of field " << dimensionedInternalField().name() - << " in file " << dimensionedInternalField().objectPath() + << " of field " << internalField().name() + << " in file " << internalField().objectPath() << exit(FatalError); } @@ -319,7 +319,7 @@ void Foam::externalWallHeatFluxTemperatureFvPatchScalarField::updateCoeffs() Info<< patch().boundaryMesh().mesh().name() << ':' << patch().name() << ':' - << this->dimensionedInternalField().name() << " :" + << this->internalField().name() << " :" << " heat transfer rate:" << Q << " walltemperature " << " min:" << gMin(*this) diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C index e2cdfdfc0..41d4fbfc9 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/thermalBaffle1D/thermalBaffle1DFvPatchScalarField.C @@ -403,9 +403,9 @@ void thermalBaffle1DFvPatchScalarField::updateCoeffs() scalar Q = gAverage(kappaw*snGrad()); Info<< patch().boundaryMesh().mesh().name() << ':' << patch().name() << ':' - << this->dimensionedInternalField().name() << " <- " + << this->internalField().name() << " <- " << nbrPatch.name() << ':' - << this->dimensionedInternalField().name() << " :" + << this->internalField().name() << " :" << " heat[W]:" << Q << " walltemperature " << " min:" << gMin(*this) diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C index 576793f6a..9a265c87a 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/totalFlowRateAdvectiveDiffusive/totalFlowRateAdvectiveDiffusiveFvPatchScalarField.C @@ -163,7 +163,7 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::updateCoeffs() IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); @@ -191,7 +191,7 @@ void Foam::totalFlowRateAdvectiveDiffusiveFvPatchScalarField::updateCoeffs() Info<< patch().boundaryMesh().mesh().name() << ':' << patch().name() << ':' - << this->dimensionedInternalField().name() << " :" + << this->internalField().name() << " :" << " mass flux[Kg/s]:" << phi << endl; } diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C index 2cf9ed03d..1548c37e6 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C @@ -96,8 +96,8 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField FatalErrorInFunction << "' not type '" << mappedPatchBase::typeName << "'" << "\n for patch " << p.name() - << " of field " << dimensionedInternalField().name() - << " in file " << dimensionedInternalField().objectPath() + << " of field " << internalField().name() + << " in file " << internalField().objectPath() << exit(FatalError); } @@ -237,10 +237,10 @@ void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs() Info<< patch().boundaryMesh().mesh().name() << ':' << patch().name() << ':' - << this->dimensionedInternalField().name() << " <- " + << this->internalField().name() << " <- " << nbrMesh.name() << ':' << nbrPatch.name() << ':' - << this->dimensionedInternalField().name() << " :" + << this->internalField().name() << " :" << " heat transfer rate:" << Q << " walltemperature " << " min:" << gMin(*this) diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C index 72605f8b9..d69c96ee2 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C @@ -102,8 +102,8 @@ turbulentTemperatureRadCoupledMixedFvPatchScalarField FatalErrorInFunction << "' not type '" << mappedPatchBase::typeName << "'" << "\n for patch " << p.name() - << " of field " << dimensionedInternalField().name() - << " in file " << dimensionedInternalField().objectPath() + << " of field " << internalField().name() + << " in file " << internalField().objectPath() << exit(FatalError); } @@ -237,10 +237,10 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs() Info<< patch().boundaryMesh().mesh().name() << ':' << patch().name() << ':' - << this->dimensionedInternalField().name() << " <- " + << this->internalField().name() << " <- " << nbrMesh.name() << ':' << nbrPatch.name() << ':' - << this->dimensionedInternalField().name() << " :" + << this->internalField().name() << " :" << " heat transfer rate:" << Q << " walltemperature " << " min:" << gMin(Tp) diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C index e91e4fde2..2ebd97528 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C @@ -203,7 +203,7 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs() IOobject::groupName ( compressible::turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C index ece3ac9e3..56e6c489a 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C @@ -113,7 +113,7 @@ void alphatWallFunctionFvPatchScalarField::updateCoeffs() IOobject::groupName ( compressibleTurbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C index bc5f23ced..19a9eafe6 100644 --- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C +++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C @@ -154,7 +154,7 @@ void Foam::wallHeatTransferFvPatchScalarField::updateCoeffs() IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); diff --git a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C index 4fc4a08fb..eece30460 100644 --- a/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/incompressible/turbulentTransportModels/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatJayatillekeWallFunction/alphatJayatillekeWallFunctionFvPatchScalarField.C @@ -206,7 +206,7 @@ void alphatJayatillekeWallFunctionFvPatchScalarField::updateCoeffs() IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C index 8526b5828..af812a6f4 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/IDDESDelta/IDDESDelta.C @@ -66,7 +66,7 @@ void Foam::LESModels::IDDESDelta::calcDelta() ) ); - scalarField& faceToFacenMax = tfaceToFacenMax.ref().internalFieldRef(); + scalarField& faceToFacenMax = tfaceToFacenMax.ref().primitiveFieldRef(); const cellList& cells = mesh.cells(); const vectorField& faceCentres = mesh.faceCentres(); @@ -113,7 +113,7 @@ void Foam::LESModels::IDDESDelta::calcDelta() << "Case must be either 2D or 3D" << exit(FatalError); } - delta_.internalFieldRef() = + delta_.primitiveFieldRef() = min ( max diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C index c322119d9..053c365a2 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C @@ -48,7 +48,7 @@ void Foam::LESModels::cubeRootVolDelta::calcDelta() if (nD == 3) { - delta_.internalFieldRef() = deltaCoeff_*pow(mesh.V(), 1.0/3.0); + delta_.primitiveFieldRef() = deltaCoeff_*pow(mesh.V(), 1.0/3.0); } else if (nD == 2) { @@ -68,7 +68,7 @@ void Foam::LESModels::cubeRootVolDelta::calcDelta() } } - delta_.internalFieldRef() = deltaCoeff_*sqrt(mesh.V()/thickness); + delta_.primitiveFieldRef() = deltaCoeff_*sqrt(mesh.V()/thickness); } else { diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C index 4b0b708a1..2163a3201 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESdeltas/maxDeltaxyz/maxDeltaxyz.C @@ -71,7 +71,7 @@ void Foam::LESModels::maxDeltaxyz::calcDelta() if (nD == 3) { - delta_.internalFieldRef() = hmax; + delta_.primitiveFieldRef() = hmax; } else if (nD == 2) { @@ -79,7 +79,7 @@ void Foam::LESModels::maxDeltaxyz::calcDelta() << "Case is 2D, LES is not strictly applicable\n" << endl; - delta_.internalFieldRef() = hmax; + delta_.primitiveFieldRef() = hmax; } else { diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C index 75dc5ef9e..a23cadce9 100644 --- a/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C +++ b/src/TurbulenceModels/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.C @@ -63,14 +63,14 @@ Foam::anisotropicFilter::anisotropicFilter { for (direction d=0; d(rhoName_); } diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C index b21e1de1b..8cd4cdb04 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C @@ -70,7 +70,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::setMaster() } const volScalarField& epsilon = - static_cast(this->dimensionedInternalField()); + static_cast(this->internalField()); const volScalarField::Boundary& bf = epsilon.boundaryField(); @@ -95,7 +95,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::setMaster() void Foam::epsilonWallFunctionFvPatchScalarField::createAveragingWeights() { const volScalarField& epsilon = - static_cast(this->dimensionedInternalField()); + static_cast(this->internalField()); const volScalarField::Boundary& bf = epsilon.boundaryField(); @@ -144,8 +144,8 @@ void Foam::epsilonWallFunctionFvPatchScalarField::createAveragingWeights() cornerWeights_[patchi] = 1.0/wf.patchInternalField(); } - G_.setSize(dimensionedInternalField().size(), 0.0); - epsilon_.setSize(dimensionedInternalField().size(), 0.0); + G_.setSize(internalField().size(), 0.0); + epsilon_.setSize(internalField().size(), 0.0); initialised_ = true; } @@ -155,7 +155,7 @@ Foam::epsilonWallFunctionFvPatchScalarField& Foam::epsilonWallFunctionFvPatchScalarField::epsilonPatch(const label patchi) { const volScalarField& epsilon = - static_cast(this->dimensionedInternalField()); + static_cast(this->internalField()); const volScalarField::Boundary& bf = epsilon.boundaryField(); @@ -408,7 +408,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::updateCoeffs() IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); @@ -431,7 +431,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::updateCoeffs() db().lookupObject(turbModel.GName()) ); - FieldType& epsilon = const_cast(dimensionedInternalField()); + FieldType& epsilon = const_cast(internalField()); forAll(*this, facei) { @@ -460,7 +460,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::updateCoeffs IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); @@ -483,7 +483,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::updateCoeffs db().lookupObject(turbModel.GName()) ); - FieldType& epsilon = const_cast(dimensionedInternalField()); + FieldType& epsilon = const_cast(internalField()); scalarField& epsilonf = *this; @@ -538,7 +538,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::manipulateMatrix const labelUList& faceCells = patch().faceCells(); const DimensionedField& epsilon - = dimensionedInternalField(); + = internalField(); label nConstrainedCells = 0; diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C index c5d141376..ca7f10a12 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/fWallFunctions/fWallFunction/fWallFunctionFvPatchScalarField.C @@ -178,7 +178,7 @@ void fWallFunctionFvPatchScalarField::updateCoeffs() IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); const v2fBase& v2fModel = refCast(turbModel); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C index 70236ec9e..9ec85dad3 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kLowReWallFunction/kLowReWallFunctionFvPatchScalarField.C @@ -175,7 +175,7 @@ void kLowReWallFunctionFvPatchScalarField::updateCoeffs() IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); const scalarField& y = turbModel.y()[patchi]; diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C index 36dde1c33..c4f8b24ee 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C @@ -106,7 +106,7 @@ tmp nutLowReWallFunctionFvPatchScalarField::yPlus() const IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); const scalarField& y = turbModel.y()[patchi]; diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C index 0f4bff28a..02844be1a 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutURoughWallFunction/nutURoughWallFunctionFvPatchScalarField.C @@ -45,7 +45,7 @@ tmp nutURoughWallFunctionFvPatchScalarField::calcNut() const IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); const scalarField& y = turbModel.y()[patchi]; @@ -87,7 +87,7 @@ tmp nutURoughWallFunctionFvPatchScalarField::calcYPlus IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); const scalarField& y = turbModel.y()[patchi]; @@ -280,7 +280,7 @@ tmp nutURoughWallFunctionFvPatchScalarField::yPlus() const IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi]; diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C index 8541b5f30..3b32e3fae 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUSpaldingWallFunction/nutUSpaldingWallFunctionFvPatchScalarField.C @@ -45,7 +45,7 @@ tmp nutUSpaldingWallFunctionFvPatchScalarField::calcNut() const IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi]; @@ -73,7 +73,7 @@ tmp nutUSpaldingWallFunctionFvPatchScalarField::calcUTau IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); const scalarField& y = turbModel.y()[patchi]; @@ -197,7 +197,7 @@ tmp nutUSpaldingWallFunctionFvPatchScalarField::yPlus() const IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); const scalarField& y = turbModel.y()[patchi]; diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C index 376cad151..ee322ce34 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C @@ -45,7 +45,7 @@ tmp nutUTabulatedWallFunctionFvPatchScalarField::calcNut() const IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); const scalarField& y = turbModel.y()[patchi]; @@ -187,7 +187,7 @@ tmp nutUTabulatedWallFunctionFvPatchScalarField::yPlus() const IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); const scalarField& y = turbModel.y()[patchi]; diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C index 8a85d7226..e281b04d6 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUWallFunction/nutUWallFunctionFvPatchScalarField.C @@ -45,7 +45,7 @@ tmp nutUWallFunctionFvPatchScalarField::calcNut() const IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi]; @@ -84,7 +84,7 @@ tmp nutUWallFunctionFvPatchScalarField::calcYPlus IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); const scalarField& y = turbModel.y()[patchi]; @@ -182,7 +182,7 @@ tmp nutUWallFunctionFvPatchScalarField::yPlus() const IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); const fvPatchVectorField& Uw = turbModel.U().boundaryField()[patchi]; diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C index a80208cd3..5762610fe 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkAtmRoughWallFunction/nutkAtmRoughWallFunctionFvPatchScalarField.C @@ -45,7 +45,7 @@ tmp nutkAtmRoughWallFunctionFvPatchScalarField::calcNut() const IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); const scalarField& y = turbModel.y()[patchi]; diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C index 34144857c..b1ac17bd5 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkRoughWallFunction/nutkRoughWallFunctionFvPatchScalarField.C @@ -68,7 +68,7 @@ tmp nutkRoughWallFunctionFvPatchScalarField::calcNut() const IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); const scalarField& y = turbModel.y()[patchi]; diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C index 264681538..08aea98d4 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C @@ -46,7 +46,7 @@ tmp nutkWallFunctionFvPatchScalarField::calcNut() const IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); @@ -142,7 +142,7 @@ tmp nutkWallFunctionFvPatchScalarField::yPlus() const IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C index e91ec4e7b..3c131a088 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C @@ -74,7 +74,7 @@ void omegaWallFunctionFvPatchScalarField::setMaster() } const volScalarField& omega = - static_cast(this->dimensionedInternalField()); + static_cast(this->internalField()); const volScalarField::Boundary& bf = omega.boundaryField(); @@ -99,7 +99,7 @@ void omegaWallFunctionFvPatchScalarField::setMaster() void omegaWallFunctionFvPatchScalarField::createAveragingWeights() { const volScalarField& omega = - static_cast(this->dimensionedInternalField()); + static_cast(this->internalField()); const volScalarField::Boundary& bf = omega.boundaryField(); @@ -149,8 +149,8 @@ void omegaWallFunctionFvPatchScalarField::createAveragingWeights() cornerWeights_[patchi] = 1.0/wf.patchInternalField(); } - G_.setSize(dimensionedInternalField().size(), 0.0); - omega_.setSize(dimensionedInternalField().size(), 0.0); + G_.setSize(internalField().size(), 0.0); + omega_.setSize(internalField().size(), 0.0); initialised_ = true; } @@ -160,7 +160,7 @@ omegaWallFunctionFvPatchScalarField& omegaWallFunctionFvPatchScalarField::omegaPatch(const label patchi) { const volScalarField& omega = - static_cast(this->dimensionedInternalField()); + static_cast(this->internalField()); const volScalarField::Boundary& bf = omega.boundaryField(); @@ -418,7 +418,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs() IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); @@ -441,7 +441,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs() db().lookupObject(turbModel.GName()) ); - FieldType& omega = const_cast(dimensionedInternalField()); + FieldType& omega = const_cast(internalField()); forAll(*this, facei) { @@ -470,7 +470,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); @@ -493,7 +493,7 @@ void omegaWallFunctionFvPatchScalarField::updateCoeffs db().lookupObject(turbModel.GName()) ); - FieldType& omega = const_cast(dimensionedInternalField()); + FieldType& omega = const_cast(internalField()); scalarField& omegaf = *this; @@ -548,7 +548,7 @@ void omegaWallFunctionFvPatchScalarField::manipulateMatrix const labelUList& faceCells = patch().faceCells(); const DimensionedField& omega - = dimensionedInternalField(); + = internalField(); label nConstrainedCells = 0; diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C index d91f84919..1d938c851 100644 --- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C +++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/v2WallFunctions/v2WallFunction/v2WallFunctionFvPatchScalarField.C @@ -178,7 +178,7 @@ void v2WallFunctionFvPatchScalarField::updateCoeffs() IOobject::groupName ( turbulenceModel::propertiesName, - dimensionedInternalField().group() + internalField().group() ) ); const scalarField& y = turbModel.y()[patchi]; diff --git a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C index 29b14966e..e647c93e8 100644 --- a/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C +++ b/src/dynamicFvMesh/dynamicRefineFvMesh/dynamicRefineFvMesh.C @@ -344,7 +344,7 @@ Foam::dynamicRefineFvMesh::refine surfaceScalarField& phi = *iter(); - sigFpe::fillNan(phi.internalFieldRef()); + sigFpe::fillNan(phi.primitiveFieldRef()); continue; } diff --git a/src/dynamicFvMesh/include/meshCourantNo.H b/src/dynamicFvMesh/include/meshCourantNo.H index c2567d95c..5ab57cdc6 100644 --- a/src/dynamicFvMesh/include/meshCourantNo.H +++ b/src/dynamicFvMesh/include/meshCourantNo.H @@ -36,7 +36,7 @@ if (mesh.nInternalFaces()) { scalarField sumPhi ( - fvc::surfaceSum(mag(mesh.phi()))().internalField() + fvc::surfaceSum(mag(mesh.phi()))().primitiveField() ); meshCoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); diff --git a/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C b/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C index 03a977953..fba219117 100644 --- a/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C +++ b/src/dynamicMesh/fvMeshAdder/fvMeshAdderTemplates.C @@ -46,15 +46,15 @@ void Foam::fvMeshAdder::MapVolField { // Store old internal field - Field oldInternalField(fld.internalField()); + Field oldInternalField(fld.primitiveField()); // Modify internal field - Field& intFld = fld.internalFieldRef(); + Field& intFld = fld.primitiveFieldRef(); intFld.setSize(mesh.nCells()); intFld.rmap(oldInternalField, meshMap.oldCellMap()); - intFld.rmap(fldToAdd.internalField(), meshMap.addedCellMap()); + intFld.rmap(fldToAdd.primitiveField(), meshMap.addedCellMap()); } @@ -340,7 +340,7 @@ void Foam::fvMeshAdder::MapSurfaceField Field oldField(fld); // Modify internal field - Field& intFld = fld.internalFieldRef(); + Field& intFld = fld.primitiveFieldRef(); intFld.setSize(mesh.nInternalFaces()); diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C index 978fc3e6b..a3f0d7a8e 100644 --- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C +++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C @@ -818,7 +818,7 @@ Foam::tmp Foam::motionSmootherAlgo::curPoints() const ); } - tmp tnewPoints(oldPoints_ + totalDisplacement.internalField()); + tmp tnewPoints(oldPoints_ + totalDisplacement.primitiveField()); // Correct for 2-D motion modifyMotionPoints(tnewPoints.ref()); @@ -886,8 +886,8 @@ bool Foam::motionSmootherAlgo::scaleMesh ); Info<< "Moving mesh using displacement scaling :" - << " min:" << gMin(scale_.internalField()) - << " max:" << gMax(scale_.internalField()) + << " min:" << gMin(scale_.primitiveField()) + << " max:" << gMax(scale_.primitiveField()) << endl; // Get points using current displacement and scale. Optionally 2D corrected. diff --git a/src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H b/src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H index 846c8ac9d..bf9d5db19 100644 --- a/src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H +++ b/src/finiteVolume/cfdTools/compressible/compressibleCourantNo.H @@ -36,8 +36,8 @@ if (mesh.nInternalFaces()) { scalarField sumPhi ( - fvc::surfaceSum(mag(phi))().internalField() - / rho.internalField() + fvc::surfaceSum(mag(phi))().primitiveField() + / rho.primitiveField() ); CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C index a92fac893..bcda09852 100644 --- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C +++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C @@ -319,7 +319,7 @@ void Foam::MRFZone::addCoriolis } const labelList& cells = mesh_.cellZones()[cellZoneID_]; - vectorField& ddtUc = ddtU.internalFieldRef(); + vectorField& ddtUc = ddtU.primitiveFieldRef(); const vectorField& Uc = U; const vector Omega = this->Omega(); diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C index b915f46ca..a5feb783d 100644 --- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C +++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C @@ -45,7 +45,7 @@ void Foam::MRFZone::makeRelativeRhoFlux const vectorField& Cfi = Cf; const vectorField& Sfi = Sf; - scalarField& phii = phi.internalFieldRef(); + scalarField& phii = phi.primitiveFieldRef(); // Internal faces forAll(internalFaces_, i) @@ -145,7 +145,7 @@ void Foam::MRFZone::makeAbsoluteRhoFlux const vectorField& Cfi = Cf; const vectorField& Sfi = Sf; - scalarField& phii = phi.internalFieldRef(); + scalarField& phii = phi.primitiveFieldRef(); // Internal faces forAll(internalFaces_, i) diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C index e8605ac57..d865fa8c2 100644 --- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C +++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C @@ -228,7 +228,7 @@ Foam::tmp Foam::SRF::SRFModel::Uabs() const volVectorField& Uabs = tUabs.ref(); // Add SRF contribution to internal field - Uabs.internalFieldRef() += Urel_.internalField(); + Uabs.primitiveFieldRef() += Urel_.primitiveField(); // Add Urel boundary contributions volVectorField::Boundary& Uabsbf = Uabs.boundaryFieldRef(); diff --git a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C index bfb1caf47..29fd691ef 100644 --- a/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C +++ b/src/finiteVolume/cfdTools/general/SRF/derivedFvPatchFields/SRFFreestreamVelocityFvPatchVectorField/SRFFreestreamVelocityFvPatchVectorField.C @@ -120,8 +120,8 @@ void Foam::SRFFreestreamVelocityFvPatchVectorField::updateCoeffs() word ddtScheme ( - this->dimensionedInternalField().mesh() - .ddtScheme(this->dimensionedInternalField().name()) + this->internalField().mesh() + .ddtScheme(this->internalField().name()) ); if (ddtScheme == fv::steadyStateDdtScheme::typeName) diff --git a/src/finiteVolume/cfdTools/general/bound/bound.C b/src/finiteVolume/cfdTools/general/bound/bound.C index 074a66f7a..a63891166 100644 --- a/src/finiteVolume/cfdTools/general/bound/bound.C +++ b/src/finiteVolume/cfdTools/general/bound/bound.C @@ -39,16 +39,16 @@ Foam::bound(volScalarField& vsf, const dimensionedScalar& lowerBound) Info<< "bounding " << vsf.name() << ", min: " << minVsf << " max: " << max(vsf).value() - << " average: " << gAverage(vsf.internalField()) + << " average: " << gAverage(vsf.primitiveField()) << endl; - vsf.internalFieldRef() = max + vsf.primitiveFieldRef() = max ( max ( - vsf.internalField(), - fvc::average(max(vsf, lowerBound))().internalField() - * pos(-vsf.internalField()) + vsf.primitiveField(), + fvc::average(max(vsf, lowerBound))().primitiveField() + * pos(-vsf.primitiveField()) ), lowerBound.value() ); diff --git a/src/finiteVolume/cfdTools/general/include/volContinuity.H b/src/finiteVolume/cfdTools/general/include/volContinuity.H index 4d53eeeba..6375e118a 100644 --- a/src/finiteVolume/cfdTools/general/include/volContinuity.H +++ b/src/finiteVolume/cfdTools/general/include/volContinuity.H @@ -3,7 +3,7 @@ // The ddt term constructed by hand because it would be wrong for // Backward Differencing in time. - conserve.internalFieldRef() += + conserve.primitiveFieldRef() += (1.0 - mesh.V0()/mesh.V())/runTime.deltaTValue(); scalar sumLocalContErr = runTime.deltaTValue()* diff --git a/src/finiteVolume/cfdTools/incompressible/CourantNo.H b/src/finiteVolume/cfdTools/incompressible/CourantNo.H index 4bfc58978..dce04fbdb 100644 --- a/src/finiteVolume/cfdTools/incompressible/CourantNo.H +++ b/src/finiteVolume/cfdTools/incompressible/CourantNo.H @@ -36,7 +36,7 @@ if (mesh.nInternalFaces()) { scalarField sumPhi ( - fvc::surfaceSum(mag(phi))().internalField() + fvc::surfaceSum(mag(phi))().primitiveField() ); CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); diff --git a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C index a7b003dd0..c3677cc0d 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/calculated/calculatedFvPatchField.C @@ -150,8 +150,8 @@ Foam::calculatedFvPatchField::valueInternalCoeffs FatalErrorInFunction << "cannot be called for a calculatedFvPatchField" << "\n on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << "\n You are probably trying to solve for a field with a " "default boundary condition." << abort(FatalError); @@ -170,8 +170,8 @@ Foam::calculatedFvPatchField::valueBoundaryCoeffs FatalErrorInFunction << "cannot be called for a calculatedFvPatchField" << "\n on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << "\n You are probably trying to solve for a field with a " "default boundary condition." << abort(FatalError); @@ -187,8 +187,8 @@ Foam::calculatedFvPatchField::gradientInternalCoeffs() const FatalErrorInFunction << "cannot be called for a calculatedFvPatchField" << "\n on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << "\n You are probably trying to solve for a field with a " "default boundary condition." << abort(FatalError); @@ -204,8 +204,8 @@ Foam::calculatedFvPatchField::gradientBoundaryCoeffs() const FatalErrorInFunction << "cannot be called for a calculatedFvPatchField" << "\n on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << "\n You are probably trying to solve for a field with a " "default boundary condition." << abort(FatalError); diff --git a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C index 5e489ae07..04e347791 100644 --- a/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/basic/sliced/slicedFvPatchField.C @@ -116,7 +116,7 @@ Foam::slicedFvPatchField::slicedFvPatchField fvPatchField ( ptf.patch(), - ptf.dimensionedInternalField(), + ptf.internalField(), Field() ) { diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C index a80f6c078..4513dc4da 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclic/cyclicFvPatchField.C @@ -59,8 +59,8 @@ Foam::cyclicFvPatchField::cyclicFvPatchField ) << " patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } @@ -85,8 +85,8 @@ Foam::cyclicFvPatchField::cyclicFvPatchField FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } } @@ -122,7 +122,7 @@ template Foam::tmp> Foam::cyclicFvPatchField::patchNeighbourField() const { - const Field& iField = this->internalField(); + const Field& iField = this->primitiveField(); const labelUList& nbrFaceCells = cyclicPatch().cyclicPatch().neighbPatch().faceCells(); @@ -159,7 +159,7 @@ Foam::cyclicFvPatchField::neighbourPatchField() const const GeometricField& fld = static_cast&> ( - this->internalField() + this->primitiveField() ); return refCast> diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C index 0ded42fdf..bb8608de1 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicACMI/cyclicACMIFvPatchField.C @@ -59,8 +59,8 @@ Foam::cyclicACMIFvPatchField::cyclicACMIFvPatchField FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } } @@ -86,8 +86,8 @@ Foam::cyclicACMIFvPatchField::cyclicACMIFvPatchField ) << " patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } @@ -136,7 +136,7 @@ template Foam::tmp> Foam::cyclicACMIFvPatchField::patchNeighbourField() const { - const Field& iField = this->internalField(); + const Field& iField = this->primitiveField(); const labelUList& nbrFaceCellsCoupled = cyclicACMIPatch_.cyclicACMIPatch().neighbPatch().faceCells(); const labelUList& faceCellsNonOverlap = @@ -173,7 +173,7 @@ Foam::cyclicACMIFvPatchField::neighbourPatchField() const const GeometricField& fld = static_cast&> ( - this->internalField() + this->primitiveField() ); return refCast> @@ -190,7 +190,7 @@ Foam::cyclicACMIFvPatchField::nonOverlapPatchField() const const GeometricField& fld = static_cast&> ( - this->internalField() + this->primitiveField() ); return fld.boundaryField()[cyclicACMIPatch_.nonOverlapPatchID()]; diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C index a241a8071..f97985b11 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/cyclicAMI/cyclicAMIFvPatchField.C @@ -56,8 +56,8 @@ Foam::cyclicAMIFvPatchField::cyclicAMIFvPatchField FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } } @@ -83,8 +83,8 @@ Foam::cyclicAMIFvPatchField::cyclicAMIFvPatchField ) << " patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } @@ -133,7 +133,7 @@ template Foam::tmp> Foam::cyclicAMIFvPatchField::patchNeighbourField() const { - const Field& iField = this->internalField(); + const Field& iField = this->primitiveField(); const labelUList& nbrFaceCells = cyclicAMIPatch_.cyclicAMIPatch().neighbPatch().faceCells(); @@ -165,7 +165,7 @@ Foam::cyclicAMIFvPatchField::neighbourPatchField() const const GeometricField& fld = static_cast&> ( - this->internalField() + this->primitiveField() ); return refCast> diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C index 49357e3bf..c8d4c3cd9 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/empty/emptyFvPatchField.C @@ -55,8 +55,8 @@ Foam::emptyFvPatchField::emptyFvPatchField FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } } @@ -80,8 +80,8 @@ Foam::emptyFvPatchField::emptyFvPatchField ) << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } } @@ -96,7 +96,7 @@ Foam::emptyFvPatchField::emptyFvPatchField fvPatchField ( ptf.patch(), - ptf.dimensionedInternalField(), + ptf.internalField(), Field(0) ) {} diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C index 07764053f..801d44662 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchField.C @@ -93,7 +93,7 @@ template Foam::tmp> Foam::jumpCyclicFvPatchField::patchNeighbourField() const { - const Field& iField = this->internalField(); + const Field& iField = this->primitiveField(); const labelUList& nbrFaceCells = this->cyclicPatch().neighbFvPatch().faceCells(); @@ -157,7 +157,7 @@ void Foam::jumpCyclicFvPatchField::updateInterfaceMatrix this->cyclicPatch().neighbFvPatch().faceCells(); // only apply jump to original field - if (&psiInternal == &this->internalField()) + if (&psiInternal == &this->primitiveField()) { Field jf(this->jump()); diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchFields.C index 2001e1e2f..15fca725a 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclic/jumpCyclicFvPatchFields.C @@ -52,7 +52,7 @@ void Foam::jumpCyclicFvPatchField::updateInterfaceMatrix this->cyclicPatch().neighbFvPatch().faceCells(); // only apply jump to original field - if (&psiInternal == &this->internalField()) + if (&psiInternal == &this->primitiveField()) { Field jf(this->jump()); diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C index 5f2495f4a..2947bb565 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchField.C @@ -94,7 +94,7 @@ template Foam::tmp> Foam::jumpCyclicAMIFvPatchField::patchNeighbourField() const { - const Field& iField = this->internalField(); + const Field& iField = this->primitiveField(); const labelUList& nbrFaceCells = this->cyclicAMIPatch().cyclicAMIPatch().neighbPatch().faceCells(); @@ -174,7 +174,7 @@ void Foam::jumpCyclicAMIFvPatchField::updateInterfaceMatrix } // only apply jump to original field - if (&psiInternal == &this->internalField()) + if (&psiInternal == &this->primitiveField()) { Field jf(this->jump()); if (!this->cyclicAMIPatch().owner()) diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchFields.C b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchFields.C index b7349812d..d7a9021ef 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchFields.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/jumpCyclicAMI/jumpCyclicAMIFvPatchFields.C @@ -56,7 +56,7 @@ void Foam::jumpCyclicAMIFvPatchField::updateInterfaceMatrix pnf = this->cyclicAMIPatch().interpolate(pnf); // only apply jump to original field - if (&psiInternal == &this->internalField()) + if (&psiInternal == &this->primitiveField()) { Field jf(this->jump()); diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C index 75d5e710c..acd103c21 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processor/processorFvPatchField.C @@ -90,8 +90,8 @@ Foam::processorFvPatchField::processorFvPatchField FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } if (debug && !ptf.ready()) @@ -128,8 +128,8 @@ Foam::processorFvPatchField::processorFvPatchField ) << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } } diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C index c3092af3e..4da794509 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/processorCyclic/processorCyclicFvPatchField.C @@ -72,8 +72,8 @@ Foam::processorCyclicFvPatchField::processorCyclicFvPatchField FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } } @@ -98,8 +98,8 @@ Foam::processorCyclicFvPatchField::processorCyclicFvPatchField ) << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C index 4f27422cc..5211988c0 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetry/symmetryFvPatchField.C @@ -56,8 +56,8 @@ Foam::symmetryFvPatchField::symmetryFvPatchField ) << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } } @@ -79,8 +79,8 @@ Foam::symmetryFvPatchField::symmetryFvPatchField FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } } diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C index 3515d3c06..57d21f8f9 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/symmetryPlane/symmetryPlaneFvPatchField.C @@ -57,8 +57,8 @@ Foam::symmetryPlaneFvPatchField::symmetryPlaneFvPatchField FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } } @@ -83,8 +83,8 @@ Foam::symmetryPlaneFvPatchField::symmetryPlaneFvPatchField ) << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } } diff --git a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C index 7fbdafde6..9a9700ff5 100644 --- a/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/constraint/wedge/wedgeFvPatchField.C @@ -59,8 +59,8 @@ Foam::wedgeFvPatchField::wedgeFvPatchField FatalErrorInFunction << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } } @@ -84,8 +84,8 @@ Foam::wedgeFvPatchField::wedgeFvPatchField ) << "\n patch type '" << p.type() << "' not constraint type '" << typeName << "'" << "\n for patch " << p.name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C index 6d17c7518..aa86f9936 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C @@ -112,8 +112,8 @@ Foam::advectiveFvPatchField::advectiveFvPatchField dict ) << "unphysical lInf specified (lInf < 0)" << nl << " on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } } @@ -190,11 +190,11 @@ void Foam::advectiveFvPatchField::updateCoeffs() return; } - const fvMesh& mesh = this->dimensionedInternalField().mesh(); + const fvMesh& mesh = this->internalField().mesh(); word ddtScheme ( - mesh.ddtScheme(this->dimensionedInternalField().name()) + mesh.ddtScheme(this->internalField().name()) ); scalar deltaT = this->db().time().deltaTValue(); @@ -202,7 +202,7 @@ void Foam::advectiveFvPatchField::updateCoeffs() this->db().objectRegistry::template lookupObject> ( - this->dimensionedInternalField().name() + this->internalField().name() ); // Calculate the advection speed of the field wave @@ -274,8 +274,8 @@ void Foam::advectiveFvPatchField::updateCoeffs() FatalErrorInFunction << ddtScheme << nl << " on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalError); } } @@ -324,8 +324,8 @@ void Foam::advectiveFvPatchField::updateCoeffs() FatalErrorInFunction << ddtScheme << "\n on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalError); } } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C index cfd694542..ed5c093d0 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/codedFixedValue/codedFixedValueFvPatchField.C @@ -160,7 +160,7 @@ Foam::string Foam::codedFixedValueFvPatchField::description() const "patch " + this->patch().name() + " on field " - + this->dimensionedInternalField().name(); + + this->internalField().name(); } @@ -274,7 +274,7 @@ Foam::codedFixedValueFvPatchField::redirectPatchField() const fvPatchField::New ( this->patch(), - this->dimensionedInternalField(), + this->internalField(), dict ).ptr() ); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C index d1b53e144..fe9036878 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.C @@ -160,7 +160,7 @@ Foam::string Foam::codedMixedFvPatchField::description() const "patch " + this->patch().name() + " on field " - + this->dimensionedInternalField().name(); + + this->internalField().name(); } @@ -280,7 +280,7 @@ Foam::codedMixedFvPatchField::redirectPatchField() const fvPatchField::New ( this->patch(), - this->dimensionedInternalField(), + this->internalField(), dict ).ptr() ) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C index bd4220b87..eab71dc17 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/externalCoupledMixed/externalCoupledMixedFvPatchField.C @@ -44,7 +44,7 @@ Foam::externalCoupledMixedFvPatchField::patchKey = "# Patch: "; template Foam::fileName Foam::externalCoupledMixedFvPatchField::baseDir() const { - word regionName(this->dimensionedInternalField().mesh().name()); + word regionName(this->internalField().mesh().name()); if (regionName == polyMesh::defaultRegion) { regionName = "."; @@ -64,7 +64,7 @@ void Foam::externalCoupledMixedFvPatchField::setMaster ) { const volFieldType& cvf = - static_cast(this->dimensionedInternalField()); + static_cast(this->internalField()); volFieldType& vf = const_cast(cvf); @@ -242,7 +242,7 @@ void Foam::externalCoupledMixedFvPatchField::startWait() const // only wait on master patch const volFieldType& cvf = - static_cast(this->dimensionedInternalField()); + static_cast(this->internalField()); const typename volFieldType::Boundary& bf = cvf.boundaryField(); @@ -406,7 +406,7 @@ void Foam::externalCoupledMixedFvPatchField::writeData writeHeader(os); const volFieldType& cvf = - static_cast(this->dimensionedInternalField()); + static_cast(this->internalField()); const typename volFieldType::Boundary& bf = cvf.boundaryField(); @@ -608,7 +608,7 @@ void Foam::externalCoupledMixedFvPatchField::initialise } const volFieldType& cvf = - static_cast(this->dimensionedInternalField()); + static_cast(this->internalField()); volFieldType& vf = const_cast(cvf); @@ -777,7 +777,7 @@ template void Foam::externalCoupledMixedFvPatchField::writeGeometry() const { const volFieldType& cvf = - static_cast(this->dimensionedInternalField()); + static_cast(this->internalField()); const typename volFieldType::Boundary& bf = cvf.boundaryField(); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C index dab997711..44bc914fd 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C @@ -151,8 +151,8 @@ void Foam::fanPressureFvPatchScalarField::updateCoeffs() FatalErrorInFunction << "dimensions of phi are not correct" << "\n on patch " << patch().name() - << " of field " << dimensionedInternalField().name() - << " in file " << dimensionedInternalField().objectPath() << nl + << " of field " << internalField().name() + << " in file " << internalField().objectPath() << nl << exit(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C index ac76973cb..a6ac71b62 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/fluxCorrectedVelocity/fluxCorrectedVelocityFvPatchVectorField.C @@ -127,8 +127,8 @@ void Foam::fluxCorrectedVelocityFvPatchVectorField::evaluate FatalErrorInFunction << "dimensions of phi are incorrect\n" << " on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalError); } } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C index a32d66770..5b045359e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/freestreamPressure/freestreamPressureFvPatchScalarField.C @@ -144,8 +144,8 @@ void Foam::freestreamPressureFvPatchScalarField::updateCoeffs() FatalErrorInFunction << "dimensions of phi are not correct" << "\n on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C index 06047dceb..9ad24063b 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedFieldFvPatchField.C @@ -150,7 +150,7 @@ void Foam::mappedFieldFvPatchField::updateCoeffs() if (debug) { - Info<< "operating on field:" << this->dimensionedInternalField().name() + Info<< "operating on field:" << this->internalField().name() << " patch:" << this->patch().name() << " avg:" << gAverage(*this) << " min:" << gMin(*this) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C index 020393e83..001fa4ab1 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C @@ -69,7 +69,7 @@ mappedPatchFieldBase::mappedPatchFieldBase dict.template lookupOrDefault ( "fieldName", - patchField_.dimensionedInternalField().name() + patchField_.internalField().name() ) ), setAverage_(readBool(dict.lookup("setAverage"))), @@ -92,7 +92,7 @@ mappedPatchFieldBase::mappedPatchFieldBase : mapper_(mapper), patchField_(patchField), - fieldName_(patchField_.dimensionedInternalField().name()), + fieldName_(patchField_.internalField().name()), setAverage_(false), average_(Zero), interpolationScheme_(interpolationCell::typeName) @@ -143,13 +143,13 @@ mappedPatchFieldBase::sampleField() const if (mapper_.sameRegion()) { - if (fieldName_ == patchField_.dimensionedInternalField().name()) + if (fieldName_ == patchField_.internalField().name()) { // Optimisation: bypass field lookup return dynamic_cast ( - patchField_.dimensionedInternalField() + patchField_.internalField() ); } else diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C index c0afd6b15..d0ddaaeb4 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedInternalValue/mappedFixedInternalValueFvPatchField.C @@ -179,7 +179,7 @@ void Foam::mappedFixedInternalValueFvPatchField::updateCoeffs() UPstream::msgType() = oldTag; // Assign to (this) patch internal field its neighbour values - Field& intFld = const_cast&>(this->internalField()); + Field& intFld = const_cast&>(this->primitiveField()); UIndirectList(intFld, this->patch().faceCells()) = nbrIntFld; } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.C index 3550e414c..964d85cfc 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedPushedInternalValue/mappedFixedPushedInternalValueFvPatchField.C @@ -104,7 +104,7 @@ void Foam::mappedFixedPushedInternalValueFvPatchField::updateCoeffs() mappedFixedValueFvPatchField::updateCoeffs(); // Assign the patch internal field to its boundary value - Field& intFld = const_cast&>(this->internalField()); + Field& intFld = const_cast&>(this->primitiveField()); UIndirectList(intFld, this->patch().faceCells()) = *this; } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C index a1a80c734..82a7d2672 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFixedValue/mappedFixedValueFvPatchField.C @@ -126,7 +126,7 @@ void Foam::mappedFixedValueFvPatchField::updateCoeffs() if (debug) { Info<< "mapped on field:" - << this->dimensionedInternalField().name() + << this->internalField().name() << " patch:" << this->patch().name() << " avg:" << gAverage(*this) << " min:" << gMin(*this) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C index ecd04b5e7..37ad1d7d0 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedFlowRate/mappedFlowRateFvPatchVectorField.C @@ -155,10 +155,10 @@ void Foam::mappedFlowRateFvPatchVectorField::updateCoeffs() scalar phi = gSum(rhop*(*this) & patch().Sf()); Info<< patch().boundaryMesh().mesh().name() << ':' << patch().name() << ':' - << this->dimensionedInternalField().name() << " <- " + << this->internalField().name() << " <- " << nbrMesh.name() << ':' << nbrPatch.name() << ':' - << this->dimensionedInternalField().name() << " :" + << this->internalField().name() << " :" << " mass flux[Kg/s]:" << -phi << endl; } @@ -168,8 +168,8 @@ void Foam::mappedFlowRateFvPatchVectorField::updateCoeffs() FatalErrorInFunction << "dimensions of " << phiName_ << " are incorrect" << nl << " on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << nl << exit(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C index c6ce22d44..89c0c11bf 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/mappedVelocityFluxFixedValue/mappedVelocityFluxFixedValueFvPatchField.C @@ -63,8 +63,8 @@ mappedVelocityFluxFixedValueFvPatchField << "Patch type '" << p.type() << "' not type '" << mappedPatchBase::typeName << "'" << " for patch " << p.name() - << " of field " << dimensionedInternalField().name() - << " in file " << dimensionedInternalField().objectPath() + << " of field " << internalField().name() + << " in file " << internalField().objectPath() << exit(FatalError); } } @@ -87,8 +87,8 @@ mappedVelocityFluxFixedValueFvPatchField << "Patch type '" << p.type() << "' not type '" << mappedPatchBase::typeName << "'" << " for patch " << p.name() - << " of field " << dimensionedInternalField().name() - << " in file " << dimensionedInternalField().objectPath() + << " of field " << internalField().name() + << " in file " << internalField().objectPath() << exit(FatalError); } @@ -102,8 +102,8 @@ mappedVelocityFluxFixedValueFvPatchField << "Patch " << p.name() << " of type '" << p.type() << "' can not be used in 'nearestCell' mode" - << " of field " << dimensionedInternalField().name() - << " in file " << dimensionedInternalField().objectPath() + << " of field " << internalField().name() + << " in file " << internalField().objectPath() << exit(FatalError); } } @@ -152,7 +152,7 @@ void Foam::mappedVelocityFluxFixedValueFvPatchField::updateCoeffs() mappedVelocityFluxFixedValueFvPatchField::patch().patch() ); const fvMesh& nbrMesh = refCast(mpp.sampleMesh()); - const word& fieldName = dimensionedInternalField().name(); + const word& fieldName = internalField().name(); const volVectorField& UField = nbrMesh.lookupObject(fieldName); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C index 46a7c7a90..6c0bba626 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/movingWallVelocity/movingWallVelocityFvPatchVectorField.C @@ -99,7 +99,7 @@ void Foam::movingWallVelocityFvPatchVectorField::updateCoeffs() return; } - const fvMesh& mesh = dimensionedInternalField().mesh(); + const fvMesh& mesh = internalField().mesh(); if (mesh.moving()) { @@ -119,7 +119,7 @@ void Foam::movingWallVelocityFvPatchVectorField::updateCoeffs() const vectorField Up((pp.faceCentres() - oldFc)/deltaT); const volVectorField& U = - static_cast(dimensionedInternalField()); + static_cast(internalField()); scalarField phip ( diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C index 7804ed43f..296690a96 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/outletMappedUniformInlet/outletMappedUniformInletFvPatchField.C @@ -116,7 +116,7 @@ void Foam::outletMappedUniformInletFvPatchField::updateCoeffs() ( dynamic_cast&> ( - this->dimensionedInternalField() + this->internalField() ) ); diff --git a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C index 13c9af6a5..19476f5e7 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/plenumPressure/plenumPressureFvPatchScalarField.C @@ -184,7 +184,7 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs() const fvPatchField& p_old = db().lookupObject ( - dimensionedInternalField().name() + internalField().name() ).oldTime().boundaryField()[patch().index()]; const fvPatchField& U = patch().lookupPatchField(UName_); @@ -205,7 +205,7 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs() // Calculate the current mass flow rate scalar massFlowRate(1.0); - if (phi.dimensionedInternalField().dimensions() == dimVelocity*dimArea) + if (phi.internalField().dimensions() == dimVelocity*dimArea) { if (hasRho_) { @@ -220,7 +220,7 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs() } else if ( - phi.dimensionedInternalField().dimensions() + phi.internalField().dimensions() == dimDensity*dimVelocity*dimArea ) { @@ -240,8 +240,8 @@ void Foam::plenumPressureFvPatchScalarField::updateCoeffs() FatalErrorInFunction << "dimensions of phi are not correct" << "\n on patch " << patch().name() - << " of field " << dimensionedInternalField().name() - << " in file " << dimensionedInternalField().objectPath() << nl + << " of field " << internalField().name() + << " in file " << internalField().objectPath() << nl << exit(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C index a8b69d004..377408a86 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletOutletVelocity/pressureDirectedInletOutletVelocityFvPatchVectorField.C @@ -172,8 +172,8 @@ void Foam::pressureDirectedInletOutletVelocityFvPatchVectorField::updateCoeffs() FatalErrorInFunction << "dimensions of phi are not correct" << "\n on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C index d5a74f7a9..ee934fe9a 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.C @@ -165,8 +165,8 @@ void Foam::pressureDirectedInletVelocityFvPatchVectorField::updateCoeffs() FatalErrorInFunction << "dimensions of phi are not correct" << "\n on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C index e691e374b..0bfeff65a 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletParSlipVelocity/pressureInletOutletParSlipVelocityFvPatchVectorField.C @@ -146,8 +146,8 @@ void Foam::pressureInletOutletParSlipVelocityFvPatchVectorField::updateCoeffs() FatalErrorInFunction << "dimensions of phi are not correct" << nl << " on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C index 08a6334ec..64ee8d8d0 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletVelocity/pressureInletVelocityFvPatchVectorField.C @@ -133,8 +133,8 @@ void Foam::pressureInletVelocityFvPatchVectorField::updateCoeffs() FatalErrorInFunction << "dimensions of phi are not correct" << "\n on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C index 79dd6a8c9..13ab7e6e1 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureNormalInletOutletVelocity/pressureNormalInletOutletVelocityFvPatchVectorField.C @@ -142,8 +142,8 @@ void Foam::pressureNormalInletOutletVelocityFvPatchVectorField::updateCoeffs() FatalErrorInFunction << "dimensions of phi are not correct" << "\n on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C index d2cf3bff2..3f3215638 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/supersonicFreestream/supersonicFreestreamFvPatchVectorField.C @@ -92,8 +92,8 @@ supersonicFreestreamFvPatchVectorField dict ) << " unphysical pInf specified (pInf <= 0.0)" << "\n on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalIOError); } } @@ -182,8 +182,8 @@ void Foam::supersonicFreestreamFvPatchVectorField::updateCoeffs() { FatalErrorInFunction << "\n on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalError); } @@ -280,9 +280,9 @@ void Foam::supersonicFreestreamFvPatchVectorField::updateCoeffs() FatalErrorInFunction << "unphysical subsonic inflow has been generated" << "\n on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() + << " of field " << this->internalField().name() << " in file " - << this->dimensionedInternalField().objectPath() + << this->internalField().objectPath() << exit(FatalError); } } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C index 7acfaf45e..2576d5ef0 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C @@ -158,8 +158,8 @@ void Foam::swirlFlowRateInletVelocityFvPatchVectorField::updateCoeffs() FatalErrorInFunction << "dimensions of " << phiName_ << " are incorrect" << nl << " on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << nl << exit(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C index 3407e259a..43e6259c1 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/syringePressure/syringePressureFvPatchScalarField.C @@ -216,8 +216,8 @@ void Foam::syringePressureFvPatchScalarField::updateCoeffs() FatalErrorInFunction << "dimensions of phi are not correct" << "\n on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C index 94c090296..bf9bf5739 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C @@ -563,7 +563,7 @@ void Foam::timeVaryingMappedFixedValueFvPatchField::write os.writeKeyword("perturb") << perturb_ << token::END_STATEMENT << nl; } - if (fieldTableName_ != this->dimensionedInternalField().name()) + if (fieldTableName_ != this->internalField().name()) { os.writeKeyword("fieldTableName") << fieldTableName_ << token::END_STATEMENT << nl; diff --git a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C index b7b46003c..fb0f32612 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/totalPressure/totalPressureFvPatchScalarField.C @@ -211,8 +211,8 @@ void Foam::totalPressureFvPatchScalarField::updateCoeffs "definition of total pressure." << nl << " Set the unused variable(s) to 'none'.\n" << " on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C index 432d1e908..e44ebdc88 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C @@ -82,8 +82,8 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField "of the mean velocity\n" " value given is " << intensity_ << nl << " on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C index 29841b693..d812a80a3 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C @@ -199,8 +199,8 @@ void Foam::uniformTotalPressureFvPatchScalarField::updateCoeffs "definition of total pressure.\n" << " Set the unused variables to 'none'.\n" << " on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << exit(FatalError); } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C index 551d544b1..f156caf7e 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C @@ -213,8 +213,8 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs() FatalErrorInFunction << ddtSchemeName << nl << " on patch " << this->patch().name() - << " of field " << this->dimensionedInternalField().name() - << " in file " << this->dimensionedInternalField().objectPath() + << " of field " << this->internalField().name() + << " in file " << this->internalField().objectPath() << abort(FatalError); } } diff --git a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H index f91107ab1..cf462267f 100644 --- a/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/fvPatchField/fvPatchField.H @@ -344,13 +344,13 @@ public: //- Return dimensioned internal field reference const DimensionedField& - dimensionedInternalField() const + internalField() const { return internalField_; } //- Return internal field reference - const Field& internalField() const + const Field& primitiveField() const { return internalField_; } diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C index 34750c979..ef3246303 100644 --- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C @@ -116,7 +116,7 @@ Foam::slicedFvsPatchField::slicedFvsPatchField fvsPatchField ( ptf.patch(), - ptf.dimensionedInternalField(), + ptf.internalField(), Field() ) { diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C index 160d3e936..f8df70e3d 100644 --- a/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C +++ b/src/finiteVolume/fields/fvsPatchFields/constraint/empty/emptyFvsPatchField.C @@ -94,7 +94,7 @@ Foam::emptyFvsPatchField::emptyFvsPatchField fvsPatchField ( ptf.patch(), - ptf.dimensionedInternalField(), + ptf.internalField(), Field(0) ) {} diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H index 6bfd32ec0..6c2f12a43 100644 --- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H +++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.H @@ -287,13 +287,13 @@ public: //- Return dimensioned internal field reference const DimensionedField& - dimensionedInternalField() const + internalField() const { return internalField_; } //- Return internal field reference - const Field& internalField() const + const Field& primitiveField() const { return internalField_; } diff --git a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C index 5b5d1fdf9..0e876daa4 100644 --- a/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C +++ b/src/finiteVolume/finiteVolume/convectionSchemes/gaussConvectionScheme/gaussConvectionScheme.C @@ -92,8 +92,8 @@ gaussConvectionScheme::fvmDiv ); fvMatrix& fvm = tfvm.ref(); - fvm.lower() = -weights.internalField()*faceFlux.internalField(); - fvm.upper() = fvm.lower() + faceFlux.internalField(); + fvm.lower() = -weights.primitiveField()*faceFlux.primitiveField(); + fvm.upper() = fvm.lower() + faceFlux.primitiveField(); fvm.negSumDiag(); forAll(vf.boundaryField(), patchi) diff --git a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C index 44ee36496..c400227ad 100644 --- a/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C +++ b/src/finiteVolume/finiteVolume/d2dt2Schemes/EulerD2dt2Scheme/EulerD2dt2Scheme.C @@ -81,12 +81,12 @@ EulerD2dt2Scheme::fvcD2dt2 rDeltaT2.dimensions()*vf.dimensions(), halfRdeltaT2* ( - coefft*VV0*vf.internalField() + coefft*VV0*vf.primitiveField() - (coefft*VV0 + coefft00*V0V00) - *vf.oldTime().internalField() + *vf.oldTime().primitiveField() - + (coefft00*V0V00)*vf.oldTime().oldTime().internalField() + + (coefft00*V0V00)*vf.oldTime().oldTime().primitiveField() )/mesh().V(), rDeltaT2.value()* ( @@ -150,15 +150,15 @@ EulerD2dt2Scheme::fvcD2dt2 const scalarField VV0rhoRho0 ( (mesh().V() + mesh().V0()) - * (rho.internalField() + rho.oldTime().internalField()) + * (rho.primitiveField() + rho.oldTime().primitiveField()) ); const scalarField V0V00rho0Rho00 ( (mesh().V0() + mesh().V00()) * ( - rho.oldTime().internalField() - + rho.oldTime().oldTime().internalField() + rho.oldTime().primitiveField() + + rho.oldTime().oldTime().primitiveField() ) ); @@ -171,13 +171,13 @@ EulerD2dt2Scheme::fvcD2dt2 rDeltaT2.dimensions()*rho.dimensions()*vf.dimensions(), quarterRdeltaT2* ( - coefft*VV0rhoRho0*vf.internalField() + coefft*VV0rhoRho0*vf.primitiveField() - (coefft*VV0rhoRho0 + coefft00*V0V00rho0Rho00) - *vf.oldTime().internalField() + *vf.oldTime().primitiveField() + (coefft00*V0V00rho0Rho00) - *vf.oldTime().oldTime().internalField() + *vf.oldTime().oldTime().primitiveField() )/mesh().V(), halfRdeltaT2* ( @@ -270,9 +270,9 @@ EulerD2dt2Scheme::fvmD2dt2 fvm.source() = halfRdeltaT2* ( (coefft*VV0 + coefft00*V0V00) - *vf.oldTime().internalField() + *vf.oldTime().primitiveField() - - (coefft00*V0V00)*vf.oldTime().oldTime().internalField() + - (coefft00*V0V00)*vf.oldTime().oldTime().primitiveField() ); } else @@ -281,8 +281,8 @@ EulerD2dt2Scheme::fvmD2dt2 fvm.source() = rDeltaT2*mesh().V()* ( - coefft0*vf.oldTime().internalField() - - coefft00*vf.oldTime().oldTime().internalField() + coefft0*vf.oldTime().primitiveField() + - coefft00*vf.oldTime().oldTime().primitiveField() ); } @@ -330,9 +330,9 @@ EulerD2dt2Scheme::fvmD2dt2 fvm.source() = halfRdeltaT2*rho.value()* ( (coefft*VV0 + coefft00*V0V00) - *vf.oldTime().internalField() + *vf.oldTime().primitiveField() - - (coefft00*V0V00)*vf.oldTime().oldTime().internalField() + - (coefft00*V0V00)*vf.oldTime().oldTime().primitiveField() ); } else @@ -341,8 +341,8 @@ EulerD2dt2Scheme::fvmD2dt2 fvm.source() = rDeltaT2*mesh().V()*rho.value()* ( - (coefft + coefft00)*vf.oldTime().internalField() - - coefft00*vf.oldTime().oldTime().internalField() + (coefft + coefft00)*vf.oldTime().primitiveField() + - coefft00*vf.oldTime().oldTime().primitiveField() ); } @@ -385,15 +385,15 @@ EulerD2dt2Scheme::fvmD2dt2 const scalarField VV0rhoRho0 ( (mesh().V() + mesh().V0()) - *(rho.internalField() + rho.oldTime().internalField()) + *(rho.primitiveField() + rho.oldTime().primitiveField()) ); const scalarField V0V00rho0Rho00 ( (mesh().V0() + mesh().V00()) *( - rho.oldTime().internalField() - + rho.oldTime().oldTime().internalField() + rho.oldTime().primitiveField() + + rho.oldTime().oldTime().primitiveField() ) ); @@ -402,10 +402,10 @@ EulerD2dt2Scheme::fvmD2dt2 fvm.source() = quarterRdeltaT2* ( (coefft*VV0rhoRho0 + coefft00*V0V00rho0Rho00) - *vf.oldTime().internalField() + *vf.oldTime().primitiveField() - (coefft00*V0V00rho0Rho00) - *vf.oldTime().oldTime().internalField() + *vf.oldTime().oldTime().primitiveField() ); } else @@ -414,14 +414,14 @@ EulerD2dt2Scheme::fvmD2dt2 const scalarField rhoRho0 ( - rho.internalField() - + rho.oldTime().internalField() + rho.primitiveField() + + rho.oldTime().primitiveField() ); const scalarField rho0Rho00 ( - rho.oldTime().internalField() - + rho.oldTime().oldTime().internalField() + rho.oldTime().primitiveField() + + rho.oldTime().oldTime().primitiveField() ); fvm.diag() = (coefft*halfRdeltaT2)*mesh().V()*rhoRho0; @@ -429,10 +429,10 @@ EulerD2dt2Scheme::fvmD2dt2 fvm.source() = halfRdeltaT2*mesh().V()* ( (coefft*rhoRho0 + coefft00*rho0Rho00) - *vf.oldTime().internalField() + *vf.oldTime().primitiveField() - (coefft00*rho0Rho00) - *vf.oldTime().oldTime().internalField() + *vf.oldTime().oldTime().primitiveField() ); } diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C index baedf3de3..53004b478 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CoEulerDdtScheme/CoEulerDdtScheme.C @@ -179,8 +179,8 @@ CoEulerDdtScheme::fvcDdt ) ); - tdtdt.ref().internalFieldRef() = - rDeltaT.internalField()*dt.value() + tdtdt.ref().primitiveFieldRef() = + rDeltaT.primitiveField()*dt.value() *(1.0 - mesh().Vsc0()/mesh().Vsc()); return tdtdt; @@ -231,10 +231,10 @@ CoEulerDdtScheme::fvcDdt ddtIOobject, mesh(), rDeltaT.dimensions()*vf.dimensions(), - rDeltaT.internalField()* + rDeltaT.primitiveField()* ( - vf.internalField() - - vf.oldTime().internalField()*mesh().Vsc0()/mesh().Vsc() + vf.primitiveField() + - vf.oldTime().primitiveField()*mesh().Vsc0()/mesh().Vsc() ), rDeltaT.boundaryField()* ( @@ -283,10 +283,10 @@ CoEulerDdtScheme::fvcDdt ddtIOobject, mesh(), rDeltaT.dimensions()*rho.dimensions()*vf.dimensions(), - rDeltaT.internalField()*rho.value()* + rDeltaT.primitiveField()*rho.value()* ( - vf.internalField() - - vf.oldTime().internalField()*mesh().Vsc0()/mesh().Vsc() + vf.primitiveField() + - vf.oldTime().primitiveField()*mesh().Vsc0()/mesh().Vsc() ), rDeltaT.boundaryField()*rho.value()* ( @@ -335,11 +335,11 @@ CoEulerDdtScheme::fvcDdt ddtIOobject, mesh(), rDeltaT.dimensions()*rho.dimensions()*vf.dimensions(), - rDeltaT.internalField()* + rDeltaT.primitiveField()* ( - rho.internalField()*vf.internalField() - - rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc0()/mesh().Vsc() + rho.primitiveField()*vf.primitiveField() + - rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc0()/mesh().Vsc() ), rDeltaT.boundaryField()* ( @@ -392,15 +392,15 @@ CoEulerDdtScheme::fvcDdt mesh(), rDeltaT.dimensions() *alpha.dimensions()*rho.dimensions()*vf.dimensions(), - rDeltaT.internalField()* + rDeltaT.primitiveField()* ( - alpha.internalField() - *rho.internalField() - *vf.internalField() + alpha.primitiveField() + *rho.primitiveField() + *vf.primitiveField() - - alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc0()/mesh().Vsc() + - alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc0()/mesh().Vsc() ), rDeltaT.boundaryField()* ( @@ -451,17 +451,17 @@ CoEulerDdtScheme::fvmDdt fvMatrix& fvm = tfvm.ref(); - scalarField rDeltaT(CorDeltaT()().internalField()); + scalarField rDeltaT(CorDeltaT()().primitiveField()); fvm.diag() = rDeltaT*mesh().Vsc(); if (mesh().moving()) { - fvm.source() = rDeltaT*vf.oldTime().internalField()*mesh().Vsc0(); + fvm.source() = rDeltaT*vf.oldTime().primitiveField()*mesh().Vsc0(); } else { - fvm.source() = rDeltaT*vf.oldTime().internalField()*mesh().Vsc(); + fvm.source() = rDeltaT*vf.oldTime().primitiveField()*mesh().Vsc(); } return tfvm; @@ -486,19 +486,19 @@ CoEulerDdtScheme::fvmDdt ); fvMatrix& fvm = tfvm.ref(); - scalarField rDeltaT(CorDeltaT()().internalField()); + scalarField rDeltaT(CorDeltaT()().primitiveField()); fvm.diag() = rDeltaT*rho.value()*mesh().Vsc(); if (mesh().moving()) { fvm.source() = rDeltaT - *rho.value()*vf.oldTime().internalField()*mesh().Vsc0(); + *rho.value()*vf.oldTime().primitiveField()*mesh().Vsc0(); } else { fvm.source() = rDeltaT - *rho.value()*vf.oldTime().internalField()*mesh().Vsc(); + *rho.value()*vf.oldTime().primitiveField()*mesh().Vsc(); } return tfvm; @@ -523,21 +523,21 @@ CoEulerDdtScheme::fvmDdt ); fvMatrix& fvm = tfvm.ref(); - scalarField rDeltaT(CorDeltaT()().internalField()); + scalarField rDeltaT(CorDeltaT()().primitiveField()); - fvm.diag() = rDeltaT*rho.internalField()*mesh().Vsc(); + fvm.diag() = rDeltaT*rho.primitiveField()*mesh().Vsc(); if (mesh().moving()) { fvm.source() = rDeltaT - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc0(); + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc0(); } else { fvm.source() = rDeltaT - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc(); + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc(); } return tfvm; @@ -563,23 +563,24 @@ CoEulerDdtScheme::fvmDdt ); fvMatrix& fvm = tfvm.ref(); - scalarField rDeltaT(CorDeltaT()().internalField()); + scalarField rDeltaT(CorDeltaT()().primitiveField()); - fvm.diag() = rDeltaT*alpha.internalField()*rho.internalField()*mesh().Vsc(); + fvm.diag() = + rDeltaT*alpha.primitiveField()*rho.primitiveField()*mesh().Vsc(); if (mesh().moving()) { fvm.source() = rDeltaT - *alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc0(); + *alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc0(); } else { fvm.source() = rDeltaT - *alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc(); + *alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc(); } return tfvm; diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C index 6461c0dfe..20aa8cd91 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C @@ -326,14 +326,14 @@ CrankNicolsonDdtScheme::fvcDdt ddt0.ref() = ( (rDtCoef0*dt)*(mesh().V0() - mesh().V00()) - - mesh().V00()*offCentre_(ddt0.dimensionedInternalField()) + - mesh().V00()*offCentre_(ddt0.internalField()) )/mesh().V0(); } tdtdt.ref().ref() = ( (rDtCoef*dt)*(mesh().V() - mesh().V0()) - - mesh().V0()*offCentre_(ddt0.dimensionedInternalField()) + - mesh().V0()*offCentre_(ddt0.internalField()) )/mesh().V(); } @@ -373,13 +373,13 @@ CrankNicolsonDdtScheme::fvcDdt { scalar rDtCoef0 = rDtCoef0_(ddt0).value(); - ddt0.internalFieldRef() = + ddt0.primitiveFieldRef() = ( rDtCoef0* ( - mesh().V0()*vf.oldTime().internalField() - - mesh().V00()*vf.oldTime().oldTime().internalField() - ) - mesh().V00()*offCentre_(ddt0.internalField()) + mesh().V0()*vf.oldTime().primitiveField() + - mesh().V00()*vf.oldTime().oldTime().primitiveField() + ) - mesh().V00()*offCentre_(ddt0.primitiveField()) )/mesh().V0(); ddt0bf = @@ -464,13 +464,13 @@ CrankNicolsonDdtScheme::fvcDdt { scalar rDtCoef0 = rDtCoef0_(ddt0).value(); - ddt0.internalFieldRef() = + ddt0.primitiveFieldRef() = ( rDtCoef0*rho.value()* ( - mesh().V0()*vf.oldTime().internalField() - - mesh().V00()*vf.oldTime().oldTime().internalField() - ) - mesh().V00()*offCentre_(ddt0.internalField()) + mesh().V0()*vf.oldTime().primitiveField() + - mesh().V00()*vf.oldTime().oldTime().primitiveField() + ) - mesh().V00()*offCentre_(ddt0.primitiveField()) )/mesh().V0(); ddt0bf = @@ -493,9 +493,9 @@ CrankNicolsonDdtScheme::fvcDdt ( rDtCoef.value()*rho.value()* ( - mesh().V()*vf.internalField() - - mesh().V0()*vf.oldTime().internalField() - ) - mesh().V0()*offCentre_(ddt0.internalField()) + mesh().V()*vf.primitiveField() + - mesh().V0()*vf.oldTime().primitiveField() + ) - mesh().V0()*offCentre_(ddt0.primitiveField()) )/mesh().V(), rDtCoef.value()*rho.value()* ( @@ -557,15 +557,15 @@ CrankNicolsonDdtScheme::fvcDdt { scalar rDtCoef0 = rDtCoef0_(ddt0).value(); - ddt0.internalFieldRef() = + ddt0.primitiveFieldRef() = ( rDtCoef0* ( - mesh().V0()*rho.oldTime().internalField() - *vf.oldTime().internalField() - - mesh().V00()*rho.oldTime().oldTime().internalField() - *vf.oldTime().oldTime().internalField() - ) - mesh().V00()*offCentre_(ddt0.internalField()) + mesh().V0()*rho.oldTime().primitiveField() + *vf.oldTime().primitiveField() + - mesh().V00()*rho.oldTime().oldTime().primitiveField() + *vf.oldTime().oldTime().primitiveField() + ) - mesh().V00()*offCentre_(ddt0.primitiveField()) )/mesh().V0(); ddt0bf = @@ -590,10 +590,10 @@ CrankNicolsonDdtScheme::fvcDdt ( rDtCoef.value()* ( - mesh().V()*rho.internalField()*vf.internalField() - - mesh().V0()*rho.oldTime().internalField() - *vf.oldTime().internalField() - ) - mesh().V00()*offCentre_(ddt0.internalField()) + mesh().V()*rho.primitiveField()*vf.primitiveField() + - mesh().V0()*rho.oldTime().primitiveField() + *vf.oldTime().primitiveField() + ) - mesh().V00()*offCentre_(ddt0.primitiveField()) )/mesh().V(), rDtCoef.value()* ( @@ -661,20 +661,20 @@ CrankNicolsonDdtScheme::fvcDdt { scalar rDtCoef0 = rDtCoef0_(ddt0).value(); - ddt0.internalFieldRef() = + ddt0.primitiveFieldRef() = ( rDtCoef0* ( mesh().V0() - *alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField() + *alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField() - mesh().V00() - *alpha.oldTime().oldTime().internalField() - *rho.oldTime().oldTime().internalField() - *vf.oldTime().oldTime().internalField() - ) - mesh().V00()*offCentre_(ddt0.internalField()) + *alpha.oldTime().oldTime().primitiveField() + *rho.oldTime().oldTime().primitiveField() + *vf.oldTime().oldTime().primitiveField() + ) - mesh().V00()*offCentre_(ddt0.primitiveField()) )/mesh().V0(); ddt0bf = @@ -704,15 +704,15 @@ CrankNicolsonDdtScheme::fvcDdt rDtCoef.value()* ( mesh().V() - *alpha.internalField() - *rho.internalField() - *vf.internalField() + *alpha.primitiveField() + *rho.primitiveField() + *vf.primitiveField() - mesh().V0() - *alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField() - ) - mesh().V00()*offCentre_(ddt0.internalField()) + *alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField() + ) - mesh().V00()*offCentre_(ddt0.primitiveField()) )/mesh().V(), rDtCoef.value()* ( @@ -799,14 +799,14 @@ CrankNicolsonDdtScheme::fvmDdt { scalar rDtCoef0 = rDtCoef0_(ddt0).value(); - ddt0.internalFieldRef() = + ddt0.primitiveFieldRef() = ( rDtCoef0* ( - mesh().V0()*vf.oldTime().internalField() - - mesh().V00()*vf.oldTime().oldTime().internalField() + mesh().V0()*vf.oldTime().primitiveField() + - mesh().V00()*vf.oldTime().oldTime().primitiveField() ) - - mesh().V00()*offCentre_(ddt0.internalField()) + - mesh().V00()*offCentre_(ddt0.primitiveField()) )/mesh().V0(); ddt0bf = @@ -822,8 +822,8 @@ CrankNicolsonDdtScheme::fvmDdt fvm.source() = ( - rDtCoef*vf.oldTime().internalField() - + offCentre_(ddt0.internalField()) + rDtCoef*vf.oldTime().primitiveField() + + offCentre_(ddt0.primitiveField()) )*mesh().V0(); } else @@ -836,8 +836,8 @@ CrankNicolsonDdtScheme::fvmDdt fvm.source() = ( - rDtCoef*vf.oldTime().internalField() - + offCentre_(ddt0.internalField()) + rDtCoef*vf.oldTime().primitiveField() + + offCentre_(ddt0.primitiveField()) )*mesh().V(); } @@ -884,14 +884,14 @@ CrankNicolsonDdtScheme::fvmDdt { scalar rDtCoef0 = rDtCoef0_(ddt0).value(); - ddt0.internalFieldRef() = + ddt0.primitiveFieldRef() = ( rDtCoef0*rho.value()* ( - mesh().V0()*vf.oldTime().internalField() - - mesh().V00()*vf.oldTime().oldTime().internalField() + mesh().V0()*vf.oldTime().primitiveField() + - mesh().V00()*vf.oldTime().oldTime().primitiveField() ) - - mesh().V00()*offCentre_(ddt0.internalField()) + - mesh().V00()*offCentre_(ddt0.primitiveField()) )/mesh().V0(); ddt0bf = @@ -907,8 +907,8 @@ CrankNicolsonDdtScheme::fvmDdt fvm.source() = ( - rDtCoef*rho.value()*vf.oldTime().internalField() - + offCentre_(ddt0.internalField()) + rDtCoef*rho.value()*vf.oldTime().primitiveField() + + offCentre_(ddt0.primitiveField()) )*mesh().V0(); } else @@ -921,8 +921,8 @@ CrankNicolsonDdtScheme::fvmDdt fvm.source() = ( - rDtCoef*rho.value()*vf.oldTime().internalField() - + offCentre_(ddt0.internalField()) + rDtCoef*rho.value()*vf.oldTime().primitiveField() + + offCentre_(ddt0.primitiveField()) )*mesh().V(); } @@ -956,7 +956,7 @@ CrankNicolsonDdtScheme::fvmDdt fvMatrix& fvm = tfvm.ref(); scalar rDtCoef = rDtCoef_(ddt0).value(); - fvm.diag() = rDtCoef*rho.internalField()*mesh().V(); + fvm.diag() = rDtCoef*rho.primitiveField()*mesh().V(); vf.oldTime().oldTime(); rho.oldTime().oldTime(); @@ -970,16 +970,16 @@ CrankNicolsonDdtScheme::fvmDdt { scalar rDtCoef0 = rDtCoef0_(ddt0).value(); - ddt0.internalFieldRef() = + ddt0.primitiveFieldRef() = ( rDtCoef0* ( - mesh().V0()*rho.oldTime().internalField() - *vf.oldTime().internalField() - - mesh().V00()*rho.oldTime().oldTime().internalField() - *vf.oldTime().oldTime().internalField() + mesh().V0()*rho.oldTime().primitiveField() + *vf.oldTime().primitiveField() + - mesh().V00()*rho.oldTime().oldTime().primitiveField() + *vf.oldTime().oldTime().primitiveField() ) - - mesh().V00()*offCentre_(ddt0.internalField()) + - mesh().V00()*offCentre_(ddt0.primitiveField()) )/mesh().V0(); ddt0bf = @@ -997,8 +997,8 @@ CrankNicolsonDdtScheme::fvmDdt fvm.source() = ( - rDtCoef*rho.oldTime().internalField()*vf.oldTime().internalField() - + offCentre_(ddt0.internalField()) + rDtCoef*rho.oldTime().primitiveField()*vf.oldTime().primitiveField() + + offCentre_(ddt0.primitiveField()) )*mesh().V0(); } else @@ -1014,8 +1014,8 @@ CrankNicolsonDdtScheme::fvmDdt fvm.source() = ( - rDtCoef*rho.oldTime().internalField()*vf.oldTime().internalField() - + offCentre_(ddt0.internalField()) + rDtCoef*rho.oldTime().primitiveField()*vf.oldTime().primitiveField() + + offCentre_(ddt0.primitiveField()) )*mesh().V(); } @@ -1050,7 +1050,7 @@ CrankNicolsonDdtScheme::fvmDdt fvMatrix& fvm = tfvm.ref(); scalar rDtCoef = rDtCoef_(ddt0).value(); - fvm.diag() = rDtCoef*alpha.internalField()*rho.internalField()*mesh().V(); + fvm.diag() = rDtCoef*alpha.primitiveField()*rho.primitiveField()*mesh().V(); vf.oldTime().oldTime(); alpha.oldTime().oldTime(); @@ -1065,21 +1065,21 @@ CrankNicolsonDdtScheme::fvmDdt { scalar rDtCoef0 = rDtCoef0_(ddt0).value(); - ddt0.internalFieldRef() = + ddt0.primitiveFieldRef() = ( rDtCoef0* ( mesh().V0() - *alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField() + *alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField() - mesh().V00() - *alpha.oldTime().oldTime().internalField() - *rho.oldTime().oldTime().internalField() - *vf.oldTime().oldTime().internalField() + *alpha.oldTime().oldTime().primitiveField() + *rho.oldTime().oldTime().primitiveField() + *vf.oldTime().oldTime().primitiveField() ) - - mesh().V00()*offCentre_(ddt0.internalField()) + - mesh().V00()*offCentre_(ddt0.primitiveField()) )/mesh().V0(); ddt0bf = @@ -1101,10 +1101,10 @@ CrankNicolsonDdtScheme::fvmDdt fvm.source() = ( rDtCoef - *alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField() - + offCentre_(ddt0.internalField()) + *alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField() + + offCentre_(ddt0.primitiveField()) )*mesh().V0(); } else @@ -1126,10 +1126,10 @@ CrankNicolsonDdtScheme::fvmDdt fvm.source() = ( rDtCoef - *alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField() - + offCentre_(ddt0.internalField()) + *alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField() + + offCentre_(ddt0.primitiveField()) )*mesh().V(); } diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C index 3e0805777..ffef9994d 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/EulerDdtScheme/EulerDdtScheme.C @@ -73,7 +73,7 @@ EulerDdtScheme::fvcDdt ) ); - tdtdt.ref().internalFieldRef() = + tdtdt.ref().primitiveFieldRef() = rDeltaT.value()*dt.value()*(1.0 - mesh().Vsc0()/mesh().Vsc()); return tdtdt; @@ -126,8 +126,8 @@ EulerDdtScheme::fvcDdt rDeltaT.dimensions()*vf.dimensions(), rDeltaT.value()* ( - vf.internalField() - - vf.oldTime().internalField()*mesh().Vsc0()/mesh().Vsc() + vf.primitiveField() + - vf.oldTime().primitiveField()*mesh().Vsc0()/mesh().Vsc() ), rDeltaT.value()* ( @@ -178,8 +178,8 @@ EulerDdtScheme::fvcDdt rDeltaT.dimensions()*rho.dimensions()*vf.dimensions(), rDeltaT.value()*rho.value()* ( - vf.internalField() - - vf.oldTime().internalField()*mesh().Vsc0()/mesh().Vsc() + vf.primitiveField() + - vf.oldTime().primitiveField()*mesh().Vsc0()/mesh().Vsc() ), rDeltaT.value()*rho.value()* ( @@ -230,9 +230,9 @@ EulerDdtScheme::fvcDdt rDeltaT.dimensions()*rho.dimensions()*vf.dimensions(), rDeltaT.value()* ( - rho.internalField()*vf.internalField() - - rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc0()/mesh().Vsc() + rho.primitiveField()*vf.primitiveField() + - rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc0()/mesh().Vsc() ), rDeltaT.value()* ( @@ -287,13 +287,13 @@ EulerDdtScheme::fvcDdt *alpha.dimensions()*rho.dimensions()*vf.dimensions(), rDeltaT.value()* ( - alpha.internalField() - *rho.internalField() - *vf.internalField() + alpha.primitiveField() + *rho.primitiveField() + *vf.primitiveField() - - alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc0()/mesh().Vsc() + - alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc0()/mesh().Vsc() ), rDeltaT.value()* ( @@ -350,11 +350,11 @@ EulerDdtScheme::fvmDdt if (mesh().moving()) { - fvm.source() = rDeltaT*vf.oldTime().internalField()*mesh().Vsc0(); + fvm.source() = rDeltaT*vf.oldTime().primitiveField()*mesh().Vsc0(); } else { - fvm.source() = rDeltaT*vf.oldTime().internalField()*mesh().Vsc(); + fvm.source() = rDeltaT*vf.oldTime().primitiveField()*mesh().Vsc(); } return tfvm; @@ -386,12 +386,12 @@ EulerDdtScheme::fvmDdt if (mesh().moving()) { fvm.source() = rDeltaT - *rho.value()*vf.oldTime().internalField()*mesh().Vsc0(); + *rho.value()*vf.oldTime().primitiveField()*mesh().Vsc0(); } else { fvm.source() = rDeltaT - *rho.value()*vf.oldTime().internalField()*mesh().Vsc(); + *rho.value()*vf.oldTime().primitiveField()*mesh().Vsc(); } return tfvm; @@ -418,19 +418,19 @@ EulerDdtScheme::fvmDdt scalar rDeltaT = 1.0/mesh().time().deltaTValue(); - fvm.diag() = rDeltaT*rho.internalField()*mesh().Vsc(); + fvm.diag() = rDeltaT*rho.primitiveField()*mesh().Vsc(); if (mesh().moving()) { fvm.source() = rDeltaT - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc0(); + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc0(); } else { fvm.source() = rDeltaT - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc(); + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc(); } return tfvm; @@ -458,21 +458,22 @@ EulerDdtScheme::fvmDdt scalar rDeltaT = 1.0/mesh().time().deltaTValue(); - fvm.diag() = rDeltaT*alpha.internalField()*rho.internalField()*mesh().Vsc(); + fvm.diag() = + rDeltaT*alpha.primitiveField()*rho.primitiveField()*mesh().Vsc(); if (mesh().moving()) { fvm.source() = rDeltaT - *alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc0(); + *alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc0(); } else { fvm.source() = rDeltaT - *alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc(); + *alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc(); } return tfvm; diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C index dbe8ccb9d..9aba9f0f6 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/SLTSDdtScheme/SLTSDdtScheme.C @@ -117,9 +117,9 @@ tmp SLTSDdtScheme::SLrDeltaT() const if (phi.dimensions() == dimensionSet(0, 3, -1, 0, 0)) { - rDeltaT.internalFieldRef() = max + rDeltaT.primitiveFieldRef() = max ( - rDeltaT.internalField()/mesh().V(), + rDeltaT.primitiveField()/mesh().V(), scalar(1)/deltaT.value() ); } @@ -131,9 +131,9 @@ tmp SLTSDdtScheme::SLrDeltaT() const rhoName_ ).oldTime(); - rDeltaT.internalFieldRef() = max + rDeltaT.primitiveFieldRef() = max ( - rDeltaT.internalField()/(rho.internalField()*mesh().V()), + rDeltaT.primitiveField()/(rho.primitiveField()*mesh().V()), scalar(1)/deltaT.value() ); } @@ -183,8 +183,8 @@ SLTSDdtScheme::fvcDdt ) ); - tdtdt.ref().internalFieldRef() = - rDeltaT.internalField()*dt.value()*(1.0 - mesh().V0()/mesh().V()); + tdtdt.ref().primitiveFieldRef() = + rDeltaT.primitiveField()*dt.value()*(1.0 - mesh().V0()/mesh().V()); return tdtdt; } @@ -234,10 +234,10 @@ SLTSDdtScheme::fvcDdt ddtIOobject, mesh(), rDeltaT.dimensions()*vf.dimensions(), - rDeltaT.internalField()* + rDeltaT.primitiveField()* ( - vf.internalField() - - vf.oldTime().internalField()*mesh().V0()/mesh().V() + vf.primitiveField() + - vf.oldTime().primitiveField()*mesh().V0()/mesh().V() ), rDeltaT.boundaryField()* ( @@ -286,10 +286,10 @@ SLTSDdtScheme::fvcDdt ddtIOobject, mesh(), rDeltaT.dimensions()*rho.dimensions()*vf.dimensions(), - rDeltaT.internalField()*rho.value()* + rDeltaT.primitiveField()*rho.value()* ( - vf.internalField() - - vf.oldTime().internalField()*mesh().V0()/mesh().V() + vf.primitiveField() + - vf.oldTime().primitiveField()*mesh().V0()/mesh().V() ), rDeltaT.boundaryField()*rho.value()* ( @@ -338,11 +338,11 @@ SLTSDdtScheme::fvcDdt ddtIOobject, mesh(), rDeltaT.dimensions()*rho.dimensions()*vf.dimensions(), - rDeltaT.internalField()* + rDeltaT.primitiveField()* ( - rho.internalField()*vf.internalField() - - rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().V0()/mesh().V() + rho.primitiveField()*vf.primitiveField() + - rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().V0()/mesh().V() ), rDeltaT.boundaryField()* ( @@ -395,15 +395,15 @@ SLTSDdtScheme::fvcDdt mesh(), rDeltaT.dimensions() *alpha.dimensions()*rho.dimensions()*vf.dimensions(), - rDeltaT.internalField()* + rDeltaT.primitiveField()* ( - alpha.internalField() - *rho.internalField() - *vf.internalField() + alpha.primitiveField() + *rho.primitiveField() + *vf.primitiveField() - - alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc0()/mesh().Vsc() + - alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc0()/mesh().Vsc() ), rDeltaT.boundaryField()* ( @@ -454,17 +454,17 @@ SLTSDdtScheme::fvmDdt fvMatrix& fvm = tfvm.ref(); - scalarField rDeltaT(SLrDeltaT()().internalField()); + scalarField rDeltaT(SLrDeltaT()().primitiveField()); fvm.diag() = rDeltaT*mesh().V(); if (mesh().moving()) { - fvm.source() = rDeltaT*vf.oldTime().internalField()*mesh().V0(); + fvm.source() = rDeltaT*vf.oldTime().primitiveField()*mesh().V0(); } else { - fvm.source() = rDeltaT*vf.oldTime().internalField()*mesh().V(); + fvm.source() = rDeltaT*vf.oldTime().primitiveField()*mesh().V(); } return tfvm; @@ -489,19 +489,19 @@ SLTSDdtScheme::fvmDdt ); fvMatrix& fvm = tfvm.ref(); - scalarField rDeltaT(SLrDeltaT()().internalField()); + scalarField rDeltaT(SLrDeltaT()().primitiveField()); fvm.diag() = rDeltaT*rho.value()*mesh().V(); if (mesh().moving()) { fvm.source() = rDeltaT - *rho.value()*vf.oldTime().internalField()*mesh().V0(); + *rho.value()*vf.oldTime().primitiveField()*mesh().V0(); } else { fvm.source() = rDeltaT - *rho.value()*vf.oldTime().internalField()*mesh().V(); + *rho.value()*vf.oldTime().primitiveField()*mesh().V(); } return tfvm; @@ -526,21 +526,21 @@ SLTSDdtScheme::fvmDdt ); fvMatrix& fvm = tfvm.ref(); - scalarField rDeltaT(SLrDeltaT()().internalField()); + scalarField rDeltaT(SLrDeltaT()().primitiveField()); - fvm.diag() = rDeltaT*rho.internalField()*mesh().V(); + fvm.diag() = rDeltaT*rho.primitiveField()*mesh().V(); if (mesh().moving()) { fvm.source() = rDeltaT - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().V0(); + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().V0(); } else { fvm.source() = rDeltaT - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().V(); + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().V(); } return tfvm; @@ -566,23 +566,24 @@ SLTSDdtScheme::fvmDdt ); fvMatrix& fvm = tfvm.ref(); - scalarField rDeltaT(SLrDeltaT()().internalField()); + scalarField rDeltaT(SLrDeltaT()().primitiveField()); - fvm.diag() = rDeltaT*alpha.internalField()*rho.internalField()*mesh().Vsc(); + fvm.diag() = + rDeltaT*alpha.primitiveField()*rho.primitiveField()*mesh().Vsc(); if (mesh().moving()) { fvm.source() = rDeltaT - *alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc0(); + *alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc0(); } else { fvm.source() = rDeltaT - *alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc(); + *alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc(); } return tfvm; diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C index 14279eea0..641a64513 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/backwardDdtScheme/backwardDdtScheme.C @@ -111,7 +111,7 @@ backwardDdtScheme::fvcDdt ) ); - tdtdt.ref().internalFieldRef() = rDeltaT.value()*dt.value()* + tdtdt.ref().primitiveFieldRef() = rDeltaT.value()*dt.value()* ( coefft - (coefft0*mesh().V0() - coefft00*mesh().V00())/mesh().V() ); @@ -173,10 +173,10 @@ backwardDdtScheme::fvcDdt rDeltaT.dimensions()*vf.dimensions(), rDeltaT.value()* ( - coefft*vf.internalField() - + coefft*vf.primitiveField() - ( - coefft0*vf.oldTime().internalField()*mesh().V0() - - coefft00*vf.oldTime().oldTime().internalField() + coefft0*vf.oldTime().primitiveField()*mesh().V0() + - coefft00*vf.oldTime().oldTime().primitiveField() *mesh().V00() )/mesh().V() ), @@ -245,10 +245,10 @@ backwardDdtScheme::fvcDdt rDeltaT.dimensions()*rho.dimensions()*vf.dimensions(), rDeltaT.value()*rho.value()* ( - coefft*vf.internalField() - + coefft*vf.primitiveField() - ( - coefft0*vf.oldTime().internalField()*mesh().V0() - - coefft00*vf.oldTime().oldTime().internalField() + coefft0*vf.oldTime().primitiveField()*mesh().V0() + - coefft00*vf.oldTime().oldTime().primitiveField() *mesh().V00() )/mesh().V() ), @@ -317,12 +317,12 @@ backwardDdtScheme::fvcDdt rDeltaT.dimensions()*rho.dimensions()*vf.dimensions(), rDeltaT.value()* ( - coefft*rho.internalField()*vf.internalField() - + coefft*rho.primitiveField()*vf.primitiveField() - ( - coefft0*rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().V0() - - coefft00*rho.oldTime().oldTime().internalField() - *vf.oldTime().oldTime().internalField()*mesh().V00() + coefft0*rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().V0() + - coefft00*rho.oldTime().oldTime().primitiveField() + *vf.oldTime().oldTime().primitiveField()*mesh().V00() )/mesh().V() ), rDeltaT.value()* @@ -395,19 +395,19 @@ backwardDdtScheme::fvcDdt rDeltaT.value()* ( coefft - *alpha.internalField() - *rho.internalField() - *vf.internalField() - + *alpha.primitiveField() + *rho.primitiveField() + *vf.primitiveField() - ( coefft0 - *alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().V0() + *alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().V0() - coefft00 - *alpha.oldTime().oldTime().internalField() - *rho.oldTime().oldTime().internalField() - *vf.oldTime().oldTime().internalField()*mesh().V00() + *alpha.oldTime().oldTime().primitiveField() + *rho.oldTime().oldTime().primitiveField() + *vf.oldTime().oldTime().primitiveField()*mesh().V00() )/mesh().V() ), rDeltaT.value()* @@ -484,8 +484,8 @@ backwardDdtScheme::fvmDdt { fvm.source() = rDeltaT* ( - coefft0*vf.oldTime().internalField()*mesh().V0() - - coefft00*vf.oldTime().oldTime().internalField() + coefft0*vf.oldTime().primitiveField()*mesh().V0() + - coefft00*vf.oldTime().oldTime().primitiveField() *mesh().V00() ); } @@ -493,8 +493,8 @@ backwardDdtScheme::fvmDdt { fvm.source() = rDeltaT*mesh().V()* ( - coefft0*vf.oldTime().internalField() - - coefft00*vf.oldTime().oldTime().internalField() + coefft0*vf.oldTime().primitiveField() + - coefft00*vf.oldTime().oldTime().primitiveField() ); } @@ -535,8 +535,8 @@ backwardDdtScheme::fvmDdt { fvm.source() = rDeltaT*rho.value()* ( - coefft0*vf.oldTime().internalField()*mesh().V0() - - coefft00*vf.oldTime().oldTime().internalField() + coefft0*vf.oldTime().primitiveField()*mesh().V0() + - coefft00*vf.oldTime().oldTime().primitiveField() *mesh().V00() ); } @@ -544,8 +544,8 @@ backwardDdtScheme::fvmDdt { fvm.source() = rDeltaT*mesh().V()*rho.value()* ( - coefft0*vf.oldTime().internalField() - - coefft00*vf.oldTime().oldTime().internalField() + coefft0*vf.oldTime().primitiveField() + - coefft00*vf.oldTime().oldTime().primitiveField() ); } @@ -580,26 +580,26 @@ backwardDdtScheme::fvmDdt scalar coefft00 = deltaT*deltaT/(deltaT0*(deltaT + deltaT0)); scalar coefft0 = coefft + coefft00; - fvm.diag() = (coefft*rDeltaT)*rho.internalField()*mesh().V(); + fvm.diag() = (coefft*rDeltaT)*rho.primitiveField()*mesh().V(); if (mesh().moving()) { fvm.source() = rDeltaT* ( - coefft0*rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().V0() - - coefft00*rho.oldTime().oldTime().internalField() - *vf.oldTime().oldTime().internalField()*mesh().V00() + coefft0*rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().V0() + - coefft00*rho.oldTime().oldTime().primitiveField() + *vf.oldTime().oldTime().primitiveField()*mesh().V00() ); } else { fvm.source() = rDeltaT*mesh().V()* ( - coefft0*rho.oldTime().internalField() - *vf.oldTime().internalField() - - coefft00*rho.oldTime().oldTime().internalField() - *vf.oldTime().oldTime().internalField() + coefft0*rho.oldTime().primitiveField() + *vf.oldTime().primitiveField() + - coefft00*rho.oldTime().oldTime().primitiveField() + *vf.oldTime().oldTime().primitiveField() ); } @@ -636,21 +636,21 @@ backwardDdtScheme::fvmDdt scalar coefft0 = coefft + coefft00; fvm.diag() = - (coefft*rDeltaT)*alpha.internalField()*rho.internalField()*mesh().V(); + (coefft*rDeltaT)*alpha.primitiveField()*rho.primitiveField()*mesh().V(); if (mesh().moving()) { fvm.source() = rDeltaT* ( coefft0 - *alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().V0() + *alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().V0() - coefft00 - *alpha.oldTime().oldTime().internalField() - *rho.oldTime().oldTime().internalField() - *vf.oldTime().oldTime().internalField()*mesh().V00() + *alpha.oldTime().oldTime().primitiveField() + *rho.oldTime().oldTime().primitiveField() + *vf.oldTime().oldTime().primitiveField()*mesh().V00() ); } else @@ -658,14 +658,14 @@ backwardDdtScheme::fvmDdt fvm.source() = rDeltaT*mesh().V()* ( coefft0 - *alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField() + *alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField() - coefft00 - *alpha.oldTime().oldTime().internalField() - *rho.oldTime().oldTime().internalField() - *vf.oldTime().oldTime().internalField() + *alpha.oldTime().oldTime().primitiveField() + *rho.oldTime().oldTime().primitiveField() + *vf.oldTime().oldTime().primitiveField() ); } diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C index 499f16756..41024f831 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/ddtScheme/ddtScheme.C @@ -169,9 +169,9 @@ tmp ddtScheme::fvcDdtPhiCoeff { InfoInFunction << "ddtCouplingCoeff mean max min = " - << gAverage(ddtCouplingCoeff.internalField()) - << " " << gMax(ddtCouplingCoeff.internalField()) - << " " << gMin(ddtCouplingCoeff.internalField()) + << gAverage(ddtCouplingCoeff.primitiveField()) + << " " << gMax(ddtCouplingCoeff.primitiveField()) + << " " << gMin(ddtCouplingCoeff.primitiveField()) << endl; } diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C index 4a4d59827..2dcdb83bb 100644 --- a/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C +++ b/src/finiteVolume/finiteVolume/ddtSchemes/localEulerDdtScheme/localEulerDdtScheme.C @@ -79,8 +79,8 @@ localEulerDdtScheme::fvcDdt ) ); - tdtdt.ref().internalFieldRef() = - rDeltaT.internalField()*dt.value() + tdtdt.ref().primitiveFieldRef() = + rDeltaT.primitiveField()*dt.value() *(1.0 - mesh().Vsc0()/mesh().Vsc()); return tdtdt; @@ -131,10 +131,10 @@ localEulerDdtScheme::fvcDdt ddtIOobject, mesh(), rDeltaT.dimensions()*vf.dimensions(), - rDeltaT.internalField()* + rDeltaT.primitiveField()* ( - vf.internalField() - - vf.oldTime().internalField()*mesh().Vsc0()/mesh().Vsc() + vf.primitiveField() + - vf.oldTime().primitiveField()*mesh().Vsc0()/mesh().Vsc() ), rDeltaT.boundaryField()* ( @@ -183,10 +183,10 @@ localEulerDdtScheme::fvcDdt ddtIOobject, mesh(), rDeltaT.dimensions()*rho.dimensions()*vf.dimensions(), - rDeltaT.internalField()*rho.value()* + rDeltaT.primitiveField()*rho.value()* ( - vf.internalField() - - vf.oldTime().internalField()*mesh().Vsc0()/mesh().Vsc() + vf.primitiveField() + - vf.oldTime().primitiveField()*mesh().Vsc0()/mesh().Vsc() ), rDeltaT.boundaryField()*rho.value()* ( @@ -235,11 +235,11 @@ localEulerDdtScheme::fvcDdt ddtIOobject, mesh(), rDeltaT.dimensions()*rho.dimensions()*vf.dimensions(), - rDeltaT.internalField()* + rDeltaT.primitiveField()* ( - rho.internalField()*vf.internalField() - - rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc0()/mesh().Vsc() + rho.primitiveField()*vf.primitiveField() + - rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc0()/mesh().Vsc() ), rDeltaT.boundaryField()* ( @@ -292,15 +292,15 @@ localEulerDdtScheme::fvcDdt mesh(), rDeltaT.dimensions() *alpha.dimensions()*rho.dimensions()*vf.dimensions(), - rDeltaT.internalField()* + rDeltaT.primitiveField()* ( - alpha.internalField() - *rho.internalField() - *vf.internalField() + alpha.primitiveField() + *rho.primitiveField() + *vf.primitiveField() - - alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc0()/mesh().Vsc() + - alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc0()/mesh().Vsc() ), rDeltaT.boundaryField()* ( @@ -357,11 +357,11 @@ localEulerDdtScheme::fvmDdt if (mesh().moving()) { - fvm.source() = rDeltaT*vf.oldTime().internalField()*mesh().Vsc0(); + fvm.source() = rDeltaT*vf.oldTime().primitiveField()*mesh().Vsc0(); } else { - fvm.source() = rDeltaT*vf.oldTime().internalField()*mesh().Vsc(); + fvm.source() = rDeltaT*vf.oldTime().primitiveField()*mesh().Vsc(); } return tfvm; @@ -393,12 +393,12 @@ localEulerDdtScheme::fvmDdt if (mesh().moving()) { fvm.source() = rDeltaT - *rho.value()*vf.oldTime().internalField()*mesh().Vsc0(); + *rho.value()*vf.oldTime().primitiveField()*mesh().Vsc0(); } else { fvm.source() = rDeltaT - *rho.value()*vf.oldTime().internalField()*mesh().Vsc(); + *rho.value()*vf.oldTime().primitiveField()*mesh().Vsc(); } return tfvm; @@ -425,19 +425,19 @@ localEulerDdtScheme::fvmDdt const scalarField& rDeltaT = localRDeltaT(); - fvm.diag() = rDeltaT*rho.internalField()*mesh().Vsc(); + fvm.diag() = rDeltaT*rho.primitiveField()*mesh().Vsc(); if (mesh().moving()) { fvm.source() = rDeltaT - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc0(); + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc0(); } else { fvm.source() = rDeltaT - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc(); + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc(); } return tfvm; @@ -465,21 +465,22 @@ localEulerDdtScheme::fvmDdt const scalarField& rDeltaT = localRDeltaT(); - fvm.diag() = rDeltaT*alpha.internalField()*rho.internalField()*mesh().Vsc(); + fvm.diag() = + rDeltaT*alpha.primitiveField()*rho.primitiveField()*mesh().Vsc(); if (mesh().moving()) { fvm.source() = rDeltaT - *alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc0(); + *alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc0(); } else { fvm.source() = rDeltaT - *alpha.oldTime().internalField() - *rho.oldTime().internalField() - *vf.oldTime().internalField()*mesh().Vsc(); + *alpha.oldTime().primitiveField() + *rho.oldTime().primitiveField() + *vf.oldTime().primitiveField()*mesh().Vsc(); } return tfvm; diff --git a/src/finiteVolume/finiteVolume/fvc/fvcAverage.C b/src/finiteVolume/finiteVolume/fvc/fvcAverage.C index 0fcc4b2fd..2df82a88e 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcAverage.C +++ b/src/finiteVolume/finiteVolume/fvc/fvcAverage.C @@ -67,10 +67,10 @@ average ); GeometricField& av = taverage.ref(); - av.internalFieldRef() = + av.primitiveFieldRef() = ( - surfaceSum(mesh.magSf()*ssf)().internalField() - /surfaceSum(mesh.magSf())().internalField() + surfaceSum(mesh.magSf()*ssf)().primitiveField() + /surfaceSum(mesh.magSf())().primitiveField() ); typename GeometricField:: diff --git a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C index 34e5b37d1..bb38614e0 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C +++ b/src/finiteVolume/finiteVolume/fvc/fvcSurfaceIntegrate.C @@ -109,7 +109,7 @@ surfaceIntegrate ); GeometricField& vf = tvf.ref(); - surfaceIntegrate(vf.internalFieldRef(), ssf); + surfaceIntegrate(vf.primitiveFieldRef(), ssf); vf.correctBoundaryConditions(); return tvf; diff --git a/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C b/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C index 77dc81490..e56b0a693 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C +++ b/src/finiteVolume/finiteVolume/fvc/fvcVolumeIntegrate.C @@ -46,7 +46,7 @@ volumeIntegrate const GeometricField& vf ) { - return vf.mesh().V()*vf.internalField(); + return vf.mesh().V()*vf.primitiveField(); } @@ -57,7 +57,7 @@ volumeIntegrate const tmp>& tvf ) { - tmp> tvivf = tvf().mesh().V()*tvf().internalField(); + tmp> tvivf = tvf().mesh().V()*tvf().primitiveField(); tvf.clear(); return tvivf; } diff --git a/src/finiteVolume/finiteVolume/fvm/fvmSup.C b/src/finiteVolume/finiteVolume/fvm/fvmSup.C index 97d33bd60..eba28b2b4 100644 --- a/src/finiteVolume/finiteVolume/fvm/fvmSup.C +++ b/src/finiteVolume/finiteVolume/fvm/fvmSup.C @@ -210,7 +210,7 @@ Foam::fvm::SuSp fvm.diag() += mesh.V()*max(susp.field(), scalar(0)); fvm.source() -= mesh.V()*min(susp.field(), scalar(0)) - *vf.internalField(); + *vf.primitiveField(); return tfvm; } diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C index e35327363..7a13f9807 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C +++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellLimitedGrad/cellLimitedGrads.C @@ -62,8 +62,8 @@ Foam::fv::cellLimitedGrad::calcGrad const volVectorField& C = mesh.C(); const surfaceVectorField& Cf = mesh.Cf(); - scalarField maxVsf(vsf.internalField()); - scalarField minVsf(vsf.internalField()); + scalarField maxVsf(vsf.primitiveField()); + scalarField minVsf(vsf.primitiveField()); forAll(owner, facei) { @@ -130,7 +130,7 @@ Foam::fv::cellLimitedGrad::calcGrad // create limiter - scalarField limiter(vsf.internalField().size(), 1.0); + scalarField limiter(vsf.primitiveField().size(), 1.0); forAll(owner, facei) { @@ -183,7 +183,7 @@ Foam::fv::cellLimitedGrad::calcGrad << " average: " << gAverage(limiter) << endl; } - g.internalFieldRef() *= limiter; + g.primitiveFieldRef() *= limiter; g.correctBoundaryConditions(); gaussGrad::correctBoundaryConditions(vsf, g); @@ -216,8 +216,8 @@ Foam::fv::cellLimitedGrad::calcGrad const volVectorField& C = mesh.C(); const surfaceVectorField& Cf = mesh.Cf(); - vectorField maxVsf(vsf.internalField()); - vectorField minVsf(vsf.internalField()); + vectorField maxVsf(vsf.primitiveField()); + vectorField minVsf(vsf.primitiveField()); forAll(owner, facei) { @@ -283,7 +283,7 @@ Foam::fv::cellLimitedGrad::calcGrad // create limiter - vectorField limiter(vsf.internalField().size(), vector::one); + vectorField limiter(vsf.primitiveField().size(), vector::one); forAll(owner, facei) { @@ -336,7 +336,7 @@ Foam::fv::cellLimitedGrad::calcGrad << " average: " << gAverage(limiter) << endl; } - tensorField& gIf = g.internalFieldRef(); + tensorField& gIf = g.primitiveFieldRef(); forAll(gIf, celli) { diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C index 3ed5113ee..a9c230b75 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C +++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/cellMDLimitedGrad/cellMDLimitedGrads.C @@ -62,8 +62,8 @@ Foam::fv::cellMDLimitedGrad::calcGrad const volVectorField& C = mesh.C(); const surfaceVectorField& Cf = mesh.Cf(); - scalarField maxVsf(vsf.internalField()); - scalarField minVsf(vsf.internalField()); + scalarField maxVsf(vsf.primitiveField()); + scalarField minVsf(vsf.primitiveField()); forAll(owner, facei) { @@ -205,8 +205,8 @@ Foam::fv::cellMDLimitedGrad::calcGrad const volVectorField& C = mesh.C(); const surfaceVectorField& Cf = mesh.Cf(); - vectorField maxVsf(vsf.internalField()); - vectorField minVsf(vsf.internalField()); + vectorField maxVsf(vsf.primitiveField()); + vectorField minVsf(vsf.primitiveField()); forAll(owner, facei) { diff --git a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C index 070987701..99afce878 100644 --- a/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C +++ b/src/finiteVolume/finiteVolume/gradSchemes/limitedGradSchemes/faceLimitedGrad/faceLimitedGrads.C @@ -63,7 +63,7 @@ Foam::fv::faceLimitedGrad::calcGrad const surfaceVectorField& Cf = mesh.Cf(); // create limiter - scalarField limiter(vsf.internalField().size(), 1.0); + scalarField limiter(vsf.primitiveField().size(), 1.0); scalar rk = (1.0/k_ - 1.0); @@ -165,7 +165,7 @@ Foam::fv::faceLimitedGrad::calcGrad << " average: " << gAverage(limiter) << endl; } - g.internalFieldRef() *= limiter; + g.primitiveFieldRef() *= limiter; g.correctBoundaryConditions(); gaussGrad::correctBoundaryConditions(vsf, g); @@ -199,7 +199,7 @@ Foam::fv::faceLimitedGrad::calcGrad const surfaceVectorField& Cf = mesh.Cf(); // create limiter - scalarField limiter(vvf.internalField().size(), 1.0); + scalarField limiter(vvf.primitiveField().size(), 1.0); scalar rk = (1.0/k_ - 1.0); @@ -326,7 +326,7 @@ Foam::fv::faceLimitedGrad::calcGrad << " average: " << gAverage(limiter) << endl; } - g.internalFieldRef() *= limiter; + g.primitiveFieldRef() *= limiter; g.correctBoundaryConditions(); gaussGrad::correctBoundaryConditions(vvf, g); diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C index 937a359d8..795fbff97 100644 --- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C +++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianScheme.C @@ -60,7 +60,7 @@ gaussLaplacianScheme::fvmLaplacianUncorrected ); fvMatrix& fvm = tfvm.ref(); - fvm.upper() = deltaCoeffs.internalField()*gammaMagSf.internalField(); + fvm.upper() = deltaCoeffs.primitiveField()*gammaMagSf.primitiveField(); fvm.negSumDiag(); forAll(vf.boundaryField(), patchi) @@ -187,7 +187,7 @@ gaussLaplacianScheme::fvmLaplacian SfGammaSn*this->tsnGradScheme_().correction(vf); } - fvm.source() -= mesh.V()*fvc::div(tfaceFluxCorrection())().internalField(); + fvm.source() -= mesh.V()*fvc::div(tfaceFluxCorrection())().primitiveField(); if (mesh.fluxRequired(vf.name())) { diff --git a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C index 8afa4447d..c102de28c 100644 --- a/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C +++ b/src/finiteVolume/finiteVolume/laplacianSchemes/gaussLaplacianScheme/gaussLaplacianSchemes.C @@ -70,7 +70,7 @@ Foam::fv::gaussLaplacianScheme::fvmLaplacian \ fvc::div \ ( \ *fvm.faceFluxCorrectionPtr() \ - )().internalField(); \ + )().primitiveField(); \ } \ else \ { \ @@ -79,7 +79,7 @@ Foam::fv::gaussLaplacianScheme::fvmLaplacian \ fvc::div \ ( \ gammaMagSf*this->tsnGradScheme_().correction(vf) \ - )().internalField(); \ + )().primitiveField(); \ } \ } \ \ @@ -88,7 +88,7 @@ Foam::fv::gaussLaplacianScheme::fvmLaplacian \ \ \ template<> \ -Foam::tmp>\ +Foam::tmp> \ Foam::fv::gaussLaplacianScheme::fvcLaplacian \ ( \ const GeometricField& gamma, \ diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C index a621a62a4..5ef44cedc 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C +++ b/src/finiteVolume/finiteVolume/snGradSchemes/faceCorrectedSnGrad/faceCorrectedSnGrad.C @@ -68,7 +68,7 @@ Foam::fv::faceCorrectedSnGrad::fullGradCorrection ) ); - Field& sfCorr = tsfCorr.ref().internalFieldRef(); + Field& sfCorr = tsfCorr.ref().primitiveFieldRef(); const pointField& points = mesh.points(); const faceList& faces = mesh.faces(); diff --git a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C index 308ad6cad..93f12751a 100644 --- a/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C +++ b/src/finiteVolume/finiteVolume/snGradSchemes/limitedSnGrad/limitedSnGrad.C @@ -77,9 +77,9 @@ limitedSnGrad::correction if (fv::debug) { InfoInFunction - << "limiter min: " << min(limiter.internalField()) - << " max: "<< max(limiter.internalField()) - << " avg: " << average(limiter.internalField()) << endl; + << "limiter min: " << min(limiter.primitiveField()) + << " max: "<< max(limiter.primitiveField()) + << " avg: " << average(limiter.primitiveField()) << endl; } return limiter*corr; diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C index 2c54f9bac..91ec6420f 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C @@ -191,7 +191,7 @@ void Foam::fvMatrix::setValuesFromList const_cast < GeometricField& - >(psi_).internalFieldRef(); + >(psi_).primitiveFieldRef(); forAll(cellLabels, i) { @@ -654,7 +654,7 @@ void Foam::fvMatrix::relax(const scalar alpha) } // Finally add the relaxation contribution to the source. - S += (D - D0)*psi_.internalField(); + S += (D - D0)*psi_.primitiveField(); } @@ -742,7 +742,7 @@ Foam::tmp Foam::fvMatrix::A() const ) ); - tAphi.ref().internalFieldRef() = D()/psi_.mesh().V(); + tAphi.ref().primitiveFieldRef() = D()/psi_.mesh().V(); tAphi.ref().correctBoundaryConditions(); return tAphi; @@ -775,20 +775,20 @@ Foam::fvMatrix::H() const // Loop over field components for (direction cmpt=0; cmpt Foam::fvMatrix::H1() const ); volScalarField& H1_ = tH1.ref(); - H1_.internalFieldRef() = lduMatrix::H1(); + H1_.primitiveFieldRef() = lduMatrix::H1(); forAll(psi_.boundaryField(), patchi) { @@ -851,7 +851,7 @@ Foam::tmp Foam::fvMatrix::H1() const } } - H1_.internalFieldRef() /= psi_.mesh().V(); + H1_.primitiveFieldRef() /= psi_.mesh().V(); H1_.correctBoundaryConditions(); return tH1; @@ -894,10 +894,10 @@ flux() const for (direction cmpt=0; cmpt::nComponents; cmpt++) { - fieldFlux.internalFieldRef().replace + fieldFlux.primitiveFieldRef().replace ( cmpt, - lduMatrix::faceH(psi_.internalField().component(cmpt)) + lduMatrix::faceH(psi_.primitiveField().component(cmpt)) ); } @@ -1491,7 +1491,7 @@ Foam::tmp> Foam::operator== { checkMethod(A, tsu(), "=="); tmp> tC(new fvMatrix(A)); - tC.ref().source() += tsu().mesh().V()*tsu().internalField(); + tC.ref().source() += tsu().mesh().V()*tsu().primitiveField(); tsu.clear(); return tC; } @@ -1532,7 +1532,7 @@ Foam::tmp> Foam::operator== { checkMethod(tA(), tsu(), "=="); tmp> tC(tA.ptr()); - tC.ref().source() += tsu().mesh().V()*tsu().internalField(); + tC.ref().source() += tsu().mesh().V()*tsu().primitiveField(); tsu.clear(); return tC; } @@ -1697,7 +1697,7 @@ Foam::tmp> Foam::operator+ { checkMethod(A, tsu(), "+"); tmp> tC(new fvMatrix(A)); - tC.ref().source() -= tsu().mesh().V()*tsu().internalField(); + tC.ref().source() -= tsu().mesh().V()*tsu().primitiveField(); tsu.clear(); return tC; } @@ -1738,7 +1738,7 @@ Foam::tmp> Foam::operator+ { checkMethod(tA(), tsu(), "+"); tmp> tC(tA.ptr()); - tC.ref().source() -= tsu().mesh().V()*tsu().internalField(); + tC.ref().source() -= tsu().mesh().V()*tsu().primitiveField(); tsu.clear(); return tC; } @@ -1779,7 +1779,7 @@ Foam::tmp> Foam::operator+ { checkMethod(A, tsu(), "+"); tmp> tC(new fvMatrix(A)); - tC.ref().source() -= tsu().mesh().V()*tsu().internalField(); + tC.ref().source() -= tsu().mesh().V()*tsu().primitiveField(); tsu.clear(); return tC; } @@ -1820,7 +1820,7 @@ Foam::tmp> Foam::operator+ { checkMethod(tA(), tsu(), "+"); tmp> tC(tA.ptr()); - tC.ref().source() -= tsu().mesh().V()*tsu().internalField(); + tC.ref().source() -= tsu().mesh().V()*tsu().primitiveField(); tsu.clear(); return tC; } @@ -1916,7 +1916,7 @@ Foam::tmp> Foam::operator- { checkMethod(A, tsu(), "-"); tmp> tC(new fvMatrix(A)); - tC.ref().source() += tsu().mesh().V()*tsu().internalField(); + tC.ref().source() += tsu().mesh().V()*tsu().primitiveField(); tsu.clear(); return tC; } @@ -1957,7 +1957,7 @@ Foam::tmp> Foam::operator- { checkMethod(tA(), tsu(), "-"); tmp> tC(tA.ptr()); - tC.ref().source() += tsu().mesh().V()*tsu().internalField(); + tC.ref().source() += tsu().mesh().V()*tsu().primitiveField(); tsu.clear(); return tC; } @@ -2001,7 +2001,7 @@ Foam::tmp> Foam::operator- checkMethod(A, tsu(), "-"); tmp> tC(new fvMatrix(A)); tC.ref().negate(); - tC.ref().source() -= tsu().mesh().V()*tsu().internalField(); + tC.ref().source() -= tsu().mesh().V()*tsu().primitiveField(); tsu.clear(); return tC; } @@ -2045,7 +2045,7 @@ Foam::tmp> Foam::operator- checkMethod(tA(), tsu(), "-"); tmp> tC(tA.ptr()); tC.ref().negate(); - tC.ref().source() -= tsu().mesh().V()*tsu().internalField(); + tC.ref().source() -= tsu().mesh().V()*tsu().primitiveField(); tsu.clear(); return tC; } @@ -2289,18 +2289,18 @@ Foam::operator& scalarField psiCmpt(psi.field().component(cmpt)); scalarField boundaryDiagCmpt(M.diag()); M.addBoundaryDiag(boundaryDiagCmpt, cmpt); - Mphi.internalFieldRef().replace(cmpt, -boundaryDiagCmpt*psiCmpt); + Mphi.primitiveFieldRef().replace(cmpt, -boundaryDiagCmpt*psiCmpt); } } else { - Mphi.internalFieldRef() = Zero; + Mphi.primitiveFieldRef() = Zero; } - Mphi.internalFieldRef() += M.lduMatrix::H(psi.field()) + M.source(); - M.addBoundarySource(Mphi.internalFieldRef()); + Mphi.primitiveFieldRef() += M.lduMatrix::H(psi.field()) + M.source(); + M.addBoundarySource(Mphi.primitiveFieldRef()); - Mphi.internalFieldRef() /= -psi.mesh().V(); + Mphi.primitiveFieldRef() /= -psi.mesh().V(); Mphi.correctBoundaryConditions(); return tMphi; diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C index 60b29fb78..9b0c3c73c 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C @@ -143,7 +143,7 @@ Foam::SolverPerformance Foam::fvMatrix::solveSegregated // copy field and source - scalarField psiCmpt(psi.internalField().component(cmpt)); + scalarField psiCmpt(psi.primitiveField().component(cmpt)); addBoundaryDiag(diag(), cmpt); scalarField sourceCmpt(source.component(cmpt)); @@ -202,7 +202,7 @@ Foam::SolverPerformance Foam::fvMatrix::solveSegregated solverPerfVec.replace(cmpt, solverPerf); - psi.internalFieldRef().replace(cmpt, psiCmpt); + psi.primitiveFieldRef().replace(cmpt, psiCmpt); diag() = saveDiag; } @@ -337,7 +337,7 @@ Foam::tmp> Foam::fvMatrix::residual() const // Loop over field components for (direction cmpt=0; cmpt::fvSolver::solve solverPerformance solverPerf = solver_->solve ( - psi.internalFieldRef(), + psi.primitiveFieldRef(), totalSource ); @@ -166,7 +166,7 @@ Foam::solverPerformance Foam::fvMatrix::solveSegregated internalCoeffs_, psi_.boundaryField().scalarInterfaces(), solverControls - )->solve(psi.internalFieldRef(), totalSource); + )->solve(psi.primitiveFieldRef(), totalSource); if (solverPerformance::debug) { @@ -193,8 +193,8 @@ Foam::tmp Foam::fvMatrix::residual() const ( lduMatrix::residual ( - psi_.internalField(), - source_ - boundaryDiag*psi_.internalField(), + psi_.primitiveField(), + source_ - boundaryDiag*psi_.primitiveField(), boundaryCoeffs_, psi_.boundaryField().scalarInterfaces(), 0 @@ -229,10 +229,10 @@ Foam::tmp Foam::fvMatrix::H() const ); volScalarField& Hphi = tHphi.ref(); - Hphi.internalFieldRef() = (lduMatrix::H(psi_.internalField()) + source_); - addBoundarySource(Hphi.internalFieldRef()); + Hphi.primitiveFieldRef() = (lduMatrix::H(psi_.primitiveField()) + source_); + addBoundarySource(Hphi.primitiveFieldRef()); - Hphi.internalFieldRef() /= psi_.mesh().V(); + Hphi.primitiveFieldRef() /= psi_.mesh().V(); Hphi.correctBoundaryConditions(); return tHphi; @@ -261,10 +261,10 @@ Foam::tmp Foam::fvMatrix::H1() const ); volScalarField& H1_ = tH1.ref(); - H1_.internalFieldRef() = lduMatrix::H1(); - //addBoundarySource(Hphi.internalField()); + H1_.primitiveFieldRef() = lduMatrix::H1(); + //addBoundarySource(Hphi.primitiveField()); - H1_.internalFieldRef() /= psi_.mesh().V(); + H1_.primitiveFieldRef() /= psi_.mesh().V(); H1_.correctBoundaryConditions(); return tH1; diff --git a/src/finiteVolume/fvMatrices/solvers/GAMGSymSolver/GAMGAgglomerations/faceAreaPairGAMGAgglomeration/faceAreaPairGAMGAgglomeration.C b/src/finiteVolume/fvMatrices/solvers/GAMGSymSolver/GAMGAgglomerations/faceAreaPairGAMGAgglomeration/faceAreaPairGAMGAgglomeration.C index 42a35f5c1..03072be0f 100644 --- a/src/finiteVolume/fvMatrices/solvers/GAMGSymSolver/GAMGAgglomerations/faceAreaPairGAMGAgglomeration/faceAreaPairGAMGAgglomeration.C +++ b/src/finiteVolume/fvMatrices/solvers/GAMGSymSolver/GAMGAgglomerations/faceAreaPairGAMGAgglomeration/faceAreaPairGAMGAgglomeration.C @@ -62,7 +62,7 @@ Foam::faceAreaPairGAMGAgglomeration::faceAreaPairGAMGAgglomeration { const fvMesh& fvmesh = refCast(mesh); - //agglomerate(mesh, sqrt(fvmesh.magSf().internalField())); + //agglomerate(mesh, sqrt(fvmesh.magSf().primitiveField())); agglomerate ( mesh, @@ -70,8 +70,8 @@ Foam::faceAreaPairGAMGAgglomeration::faceAreaPairGAMGAgglomeration ( cmptMultiply ( - fvmesh.Sf().internalField() - /sqrt(fvmesh.magSf().internalField()), + fvmesh.Sf().primitiveField() + /sqrt(fvmesh.magSf().primitiveField()), vector(1, 1.01, 1.02) //vector::one ) diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C index 38d71faf5..41fc3b119 100644 --- a/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C +++ b/src/finiteVolume/fvMatrices/solvers/MULES/CMULESTemplates.C @@ -53,18 +53,18 @@ void Foam::MULES::correct if (mesh.moving()) { - psi.internalFieldRef() = + psi.primitiveFieldRef() = ( - rho.field()*psi.internalField()*rDeltaT + rho.field()*psi.primitiveField()*rDeltaT + Su.field() - psiIf )/(rho.field()*rDeltaT - Sp.field()); } else { - psi.internalFieldRef() = + psi.primitiveFieldRef() = ( - rho.field()*psi.internalField()*rDeltaT + rho.field()*psi.primitiveField()*rDeltaT + Su.field() - psiIf )/(rho.field()*rDeltaT - Sp.field()); @@ -293,7 +293,7 @@ void Foam::MULES::limiterCorr *( (rho.field()*rDeltaT - Sp.field())*psiMaxn - Su.field() - - rho.field()*psi.internalField()*rDeltaT + - rho.field()*psi.primitiveField()*rDeltaT ); psiMinn = @@ -301,7 +301,7 @@ void Foam::MULES::limiterCorr *( Su.field() - (rho.field()*rDeltaT - Sp.field())*psiMinn - + rho.field()*psi.internalField()*rDeltaT + + rho.field()*psi.primitiveField()*rDeltaT ); scalarField sumlPhip(psiIf.size()); diff --git a/src/finiteVolume/fvMatrices/solvers/MULES/IMULESTemplates.C b/src/finiteVolume/fvMatrices/solvers/MULES/IMULESTemplates.C index 4cc8cd128..ec7d3448a 100644 --- a/src/finiteVolume/fvMatrices/solvers/MULES/IMULESTemplates.C +++ b/src/finiteVolume/fvMatrices/solvers/MULES/IMULESTemplates.C @@ -188,8 +188,8 @@ void Foam::MULES::implicitSolve MULEScontrols ); - scalar maxPsiM1 = gMax(psi.internalField()) - 1.0; - scalar minPsi = gMin(psi.internalField()); + scalar maxPsiM1 = gMax(psi.primitiveField()) - 1.0; + scalar minPsi = gMin(psi.primitiveField()); scalar unboundedness = max(max(maxPsiM1, 0.0), -min(minPsi, 0.0)); diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C index 31e5852cd..0ba93d1f1 100644 --- a/src/finiteVolume/fvMesh/fvMesh.C +++ b/src/finiteVolume/fvMesh/fvMesh.C @@ -763,8 +763,9 @@ Foam::tmp Foam::fvMesh::movePoints(const pointField& p) tmp tsweptVols = polyMesh::movePoints(p); scalarField& sweptVols = tsweptVols.ref(); - phi.internalFieldRef() = scalarField::subField(sweptVols, nInternalFaces()); - phi.internalFieldRef() *= rDeltaT; + phi.primitiveFieldRef() = + scalarField::subField(sweptVols, nInternalFaces()); + phi.primitiveFieldRef() *= rDeltaT; const fvPatchList& patches = boundary(); diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C index a9c42ed4e..2dc96d4ad 100644 --- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C +++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C @@ -96,7 +96,7 @@ tmp> fvMeshSubset::interpolate ), sMesh, vf.dimensions(), - Field(vf.internalField(), cellMap), + Field(vf.primitiveField(), cellMap), patchFields ) ); @@ -233,7 +233,7 @@ tmp> fvMeshSubset::interpolate vf.dimensions(), Field ( - vf.internalField(), + vf.primitiveField(), SubList