diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
index 5614578429eeb521768fb9ce6c8e27dc78a7d268..0d94768b236e41975a434c58b1dd94222c2f19e1 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletPressure/adjointOutletPressureFvPatchScalarField.C
@@ -121,7 +121,7 @@ void Foam::adjointOutletPressureFvPatchScalarField::write(Ostream& os) const
namespace Foam
{
- makePatchTypeField
+ makeNonTemplatedPatchTypeField
(
fvPatchScalarField,
adjointOutletPressureFvPatchScalarField
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
index 0a00076eafcdb34c0a337d60e712797d342c4686..dbde31a88a6b4164344469e5d2953a0e8eafe050 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointOutletVelocity/adjointOutletVelocityFvPatchVectorField.C
@@ -96,10 +96,10 @@ void Foam::adjointOutletVelocityFvPatchVectorField::updateCoeffs()
const fvPatchField<vector>& Up =
patch().lookupPatchField<volVectorField, vector>("U");
- scalarField Un = mag(patch().nf() & Up);
- vectorField UtHat = (Up - patch().nf()*Un)/(Un + SMALL);
+ scalarField Un(mag(patch().nf() & Up));
+ vectorField UtHat((Up - patch().nf()*Un)/(Un + SMALL));
- vectorField Uan = patch().nf()*(patch().nf() & patchInternalField());
+ vectorField Uan(patch().nf()*(patch().nf() & patchInternalField()));
vectorField::operator=(phiap*patch().Sf()/sqr(patch().magSf()) + UtHat);
//vectorField::operator=(Uan + UtHat);
@@ -119,7 +119,7 @@ void Foam::adjointOutletVelocityFvPatchVectorField::write(Ostream& os) const
namespace Foam
{
- makePatchTypeField
+ makeNonTemplatedPatchTypeField
(
fvPatchVectorField,
adjointOutletVelocityFvPatchVectorField
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
index a18298f826760c2ea1b2a626829b458e2a35f613..de7a9276ae6087ad5cbf797383e3b79924966737 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
solve(UEqn() == -fvc::grad(p));
p.boundaryField().updateCoeffs();
- volScalarField rAU = 1.0/UEqn().A();
+ volScalarField rAU(1.0/UEqn().A());
U = rAU*UEqn().H();
UEqn.clear();
phi = fvc::interpolate(U) & mesh.Sf();
@@ -153,10 +153,13 @@ int main(int argc, char *argv[])
{
// Adjoint Momentum predictor
- volVectorField adjointTransposeConvection = (fvc::grad(Ua) & U);
- //volVectorField adjointTransposeConvection = fvc::reconstruct
+ volVectorField adjointTransposeConvection((fvc::grad(Ua) & U));
+ //volVectorField adjointTransposeConvection
//(
- // mesh.magSf()*(fvc::snGrad(Ua) & fvc::interpolate(U))
+ // fvc::reconstruct
+ // (
+ // mesh.magSf()*(fvc::snGrad(Ua) & fvc::interpolate(U))
+ // )
//);
zeroCells(adjointTransposeConvection, inletCells);
@@ -174,7 +177,7 @@ int main(int argc, char *argv[])
solve(UaEqn() == -fvc::grad(pa));
pa.boundaryField().updateCoeffs();
- volScalarField rAUa = 1.0/UaEqn().A();
+ volScalarField rAUa(1.0/UaEqn().A());
Ua = rAUa*UaEqn().H();
UaEqn.clear();
phia = fvc::interpolate(Ua) & mesh.Sf();
diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
index af2798cc3286798d3116960d7fbdfa08b52d314e..4bfdd66f4666bcd3c03be8ef4cc354e7c2f7c338 100644
--- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
+++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
@@ -60,7 +60,7 @@ int main(int argc, char *argv[])
{
Info<< "Time = " << runTime.timeName() << nl << endl;
- fvVectorMatrix divR = turbulence->divDevReff(U);
+ fvVectorMatrix divR(turbulence->divDevReff(U));
divR.source() = flowMask & divR.source();
fvVectorMatrix UEqn
diff --git a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
index 6fa3a0892cfdfeda4b81bd9399ff2551d81db624..7fd01f0e9ebbe9268f4270e12b4eb967bd30a4e5 100644
--- a/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
+++ b/applications/solvers/incompressible/boundaryFoam/interrogateWallPatches.H
@@ -13,7 +13,7 @@ forAll(patches, patchi)
if (isA<wallFvPatch>(currPatch))
{
- const vectorField nf = currPatch.nf();
+ const vectorField nf(currPatch.nf());
forAll(nf, facei)
{
@@ -67,8 +67,10 @@ else
label cellId = patches[patchId].faceCells()[faceId];
// create position array for graph generation
-scalarField y =
+scalarField y
+(
wallNormal
- & (mesh.C().internalField() - mesh.C().boundaryField()[patchId][faceId]);
+ & (mesh.C().internalField() - mesh.C().boundaryField()[patchId][faceId])
+);
Info<< " Height to first cell centre y0 = " << y[cellId] << endl;
diff --git a/applications/solvers/incompressible/channelFoam/channelFoam.C b/applications/solvers/incompressible/channelFoam/channelFoam.C
index 8918a4d8ebfafafa7763d3ec83f3fa555e41f147..6f19b96168839f388e7b17a1f792269bf7f0aaa2 100644
--- a/applications/solvers/incompressible/channelFoam/channelFoam.C
+++ b/applications/solvers/incompressible/channelFoam/channelFoam.C
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
// --- PISO loop
- volScalarField rAU = 1.0/UEqn.A();
+ volScalarField rAU(1.0/UEqn.A());
for (int corr=0; corr<nCorr; corr++)
{
diff --git a/applications/solvers/incompressible/icoFoam/icoFoam.C b/applications/solvers/incompressible/icoFoam/icoFoam.C
index 98a4c4324bc08e8d1108c117a3c32b2a81e83bc2..27bffab99a7629f94ee5e4e627603d26001b34d1 100644
--- a/applications/solvers/incompressible/icoFoam/icoFoam.C
+++ b/applications/solvers/incompressible/icoFoam/icoFoam.C
@@ -66,7 +66,7 @@ int main(int argc, char *argv[])
for (int corr=0; corr<nCorr; corr++)
{
- volScalarField rAU = 1.0/UEqn.A();
+ volScalarField rAU(1.0/UEqn.A());
U = rAU*UEqn.H();
phi = (fvc::interpolate(U) & mesh.Sf())
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
index dc62df435c671ce89446a826c141157635520066..467a625d6b202018b4ac5395a995e95dba910c9e 100644
--- a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
for (int corr=0; corr<nCorr; corr++)
{
- volScalarField rAU = 1.0/UEqn.A();
+ volScalarField rAU(1.0/UEqn.A());
U = rAU*UEqn.H();
phi = (fvc::interpolate(U) & mesh.Sf())
diff --git a/applications/solvers/incompressible/pimpleFoam/UEqn.H b/applications/solvers/incompressible/pimpleFoam/UEqn.H
index 3655677979ca0e81a0dea53b8e019a667c304d02..b897eec4b59b9018ccb2876fe1036bd52034e86f 100644
--- a/applications/solvers/incompressible/pimpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/pimpleFoam/UEqn.H
@@ -9,7 +9,7 @@ tmp<fvVectorMatrix> UEqn
UEqn().relax();
-volScalarField rAU = 1.0/UEqn().A();
+volScalarField rAU(1.0/UEqn().A());
if (momentumPredictor)
{
diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
index 47414bf1732dc83f6ee95de05ee833e229950425..59c76c9e93cc1fef6d4acb91696e0df32ea4c0d4 100644
--- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C
+++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
@@ -79,7 +79,7 @@ int main(int argc, char *argv[])
for (int corr=0; corr<nCorr; corr++)
{
- volScalarField rAU = 1.0/UEqn.A();
+ volScalarField rAU(1.0/UEqn.A());
U = rAU*UEqn.H();
phi = (fvc::interpolate(U) & mesh.Sf())
diff --git a/applications/solvers/incompressible/porousSimpleFoam/UEqn.H b/applications/solvers/incompressible/porousSimpleFoam/UEqn.H
index 9cbcd61291fd3e617e21743cf2b8a115b456fc2b..a76c6db0fdbcbc27c162515eafab5089b86a0df9 100644
--- a/applications/solvers/incompressible/porousSimpleFoam/UEqn.H
+++ b/applications/solvers/incompressible/porousSimpleFoam/UEqn.H
@@ -22,7 +22,7 @@
trTU = inv(tTU());
trTU().rename("rAU");
- volVectorField gradp = fvc::grad(p);
+ volVectorField gradp(fvc::grad(p));
for (int UCorr=0; UCorr<nUCorr; UCorr++)
{
diff --git a/applications/solvers/incompressible/shallowWaterFoam/CourantNo.H b/applications/solvers/incompressible/shallowWaterFoam/CourantNo.H
index 0dfa24316f288c59ce421092e857991b6e9140f2..c3f03b4868de702e848c04437edd33ae999c9e89 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/CourantNo.H
+++ b/applications/solvers/incompressible/shallowWaterFoam/CourantNo.H
@@ -36,9 +36,11 @@ scalar waveCoNum = 0.0;
if (mesh.nInternalFaces())
{
- scalarField sumPhi =
+ scalarField sumPhi
+ (
fvc::surfaceSum(mag(phi))().internalField()
- /h.internalField();
+ / h.internalField()
+ );
CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue();
diff --git a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
index 274c8d1a63e7a487098cba99c025545b3c063b18..8d1d19073d0f23f1a86b86deb4a9411436ff78e4 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
+++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
@@ -89,10 +89,10 @@ int main(int argc, char *argv[])
// --- PISO loop
for (int corr=0; corr<nCorr; corr++)
{
- volScalarField rAU = 1.0/hUEqn.A();
- surfaceScalarField ghrAUf = magg*fvc::interpolate(h*rAU);
+ volScalarField rAU(1.0/hUEqn.A());
+ surfaceScalarField ghrAUf(magg*fvc::interpolate(h*rAU));
- surfaceScalarField phih0 = ghrAUf*mesh.magSf()*fvc::snGrad(h0);
+ surfaceScalarField phih0(ghrAUf*mesh.magSf()*fvc::snGrad(h0));
if (rotating)
{
diff --git a/applications/solvers/incompressible/simpleFoam/pEqn.H b/applications/solvers/incompressible/simpleFoam/pEqn.H
index 313f20cbb40cbd88725f9e9298d5ed74f8572f06..c5b9748c5d867e327462cc93f5787a4409c0cba3 100644
--- a/applications/solvers/incompressible/simpleFoam/pEqn.H
+++ b/applications/solvers/incompressible/simpleFoam/pEqn.H
@@ -1,6 +1,6 @@
p.boundaryField().updateCoeffs();
- volScalarField AU = UEqn().A();
+ volScalarField AU(UEqn().A());
U = UEqn().H()/AU;
UEqn.clear();
phi = fvc::interpolate(U) & mesh.Sf();
diff --git a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
index 433b7707a93712f49c8b094ee65666e978346a34..b92cc165c317867772eee4c768a96e57fc084424 100644
--- a/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
+++ b/tutorials/incompressible/MRFSimpleFoam/MRFSimpleFoam/MRFSimpleFoam.C
@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
solve(UEqn() == -fvc::grad(p));
p.boundaryField().updateCoeffs();
- volScalarField rAU = 1.0/UEqn().A();
+ volScalarField rAU(1.0/UEqn().A());
U = rAU*UEqn().H();
UEqn.clear();