From 9ac1fa417bf926afb3f73a778400e68b362b4e31 Mon Sep 17 00:00:00 2001 From: Andrew Heather <> Date: Mon, 6 Nov 2017 11:54:20 +0000 Subject: [PATCH] BUG: finiteArea: corrected reference access to tmps --- src/finiteArea/finiteArea/fac/facDdt.C | 8 ++++---- src/finiteArea/finiteArea/fac/facDiv.C | 8 ++++---- src/finiteArea/finiteArea/fac/facGrad.C | 4 ++-- src/finiteArea/finiteArea/fac/facLnGrad.C | 2 +- src/finiteArea/finiteArea/fac/facNDiv.C | 12 +++++++----- src/finiteArea/finiteArea/fac/facNGrad.C | 8 ++++---- src/finiteArea/finiteArea/fam/famNDiv.C | 4 +++- src/finiteArea/finiteArea/fam/vectorFamDiv.C | 2 +- .../volSurfaceMapping/volSurfaceMapping.C | 2 +- 9 files changed, 27 insertions(+), 23 deletions(-) diff --git a/src/finiteArea/finiteArea/fac/facDdt.C b/src/finiteArea/finiteArea/fac/facDdt.C index a47ba8e81c..fb5ea4cfb7 100644 --- a/src/finiteArea/finiteArea/fac/facDdt.C +++ b/src/finiteArea/finiteArea/fac/facDdt.C @@ -53,7 +53,7 @@ ddt ( mesh, mesh.schemesDict().ddtScheme("ddt(" + dt.name() + ')') - )().facDdt(dt); + ).ref().facDdt(dt); } @@ -68,7 +68,7 @@ ddt ( vf.mesh(), vf.mesh().schemesDict().ddtScheme("ddt(" + vf.name() + ')') - )().facDdt(vf); + ).ref().facDdt(vf); } @@ -87,7 +87,7 @@ ddt ( "ddt(" + rho.name() + ',' + vf.name() + ')' ) - )().facDdt(rho, vf); + ).ref().facDdt(rho, vf); } @@ -106,7 +106,7 @@ ddt ( "ddt(" + rho.name() + ',' + vf.name() + ')' ) - )().facDdt(rho, vf); + ).ref().facDdt(rho, vf); } diff --git a/src/finiteArea/finiteArea/fac/facDiv.C b/src/finiteArea/finiteArea/fac/facDiv.C index 93dea4dca0..6d3a2530c8 100644 --- a/src/finiteArea/finiteArea/fac/facDiv.C +++ b/src/finiteArea/finiteArea/fac/facDiv.C @@ -108,14 +108,14 @@ div fa::divScheme::New ( vf.mesh(), vf.mesh().schemesDict().divScheme(name) - )().facDiv(vf) + ).ref().facDiv(vf) ); GeometricField < typename innerProduct::type, faPatchField, areaMesh - >& Div = tDiv(); + >& Div = tDiv.ref(); Div.primitiveFieldRef() = transform(tensor::I - sqr(n), Div.internalField()); @@ -208,9 +208,9 @@ div vf.mesh(), flux, vf.mesh().schemesDict().divScheme(name) - )().facDiv(flux, vf) + ).ref().facDiv(flux, vf) ); - GeometricField& Div = tDiv(); + GeometricField& Div = tDiv.ref(); Div.internalField() = transform(tensor::I - sqr(n), Div.internalField()); Div.correctBoundaryConditions(); diff --git a/src/finiteArea/finiteArea/fac/facGrad.C b/src/finiteArea/finiteArea/fac/facGrad.C index ba9fdf5ec1..46133df0a8 100644 --- a/src/finiteArea/finiteArea/fac/facGrad.C +++ b/src/finiteArea/finiteArea/fac/facGrad.C @@ -63,7 +63,7 @@ grad tmp> tgGrad = fac::edgeIntegrate(ssf.mesh().Sf()*ssf); - GeometricField& gGrad = tgGrad(); + GeometricField& gGrad = tgGrad.ref(); gGrad -= n*(n & gGrad); gGrad.correctBoundaryConditions(); @@ -116,7 +116,7 @@ grad ( vf.mesh(), vf.mesh().schemesDict().gradScheme(name) - )().grad(vf); + ).ref().grad(vf); GeometricField& gGrad = tgGrad.ref(); diff --git a/src/finiteArea/finiteArea/fac/facLnGrad.C b/src/finiteArea/finiteArea/fac/facLnGrad.C index 80f8e5580e..857c82e41d 100644 --- a/src/finiteArea/finiteArea/fac/facLnGrad.C +++ b/src/finiteArea/finiteArea/fac/facLnGrad.C @@ -53,7 +53,7 @@ lnGrad ( vf.mesh(), vf.mesh().schemesDict().lnGradScheme(name) - )().lnGrad(vf); + ).ref().lnGrad(vf); } diff --git a/src/finiteArea/finiteArea/fac/facNDiv.C b/src/finiteArea/finiteArea/fac/facNDiv.C index b12b2539be..b1861fe125 100644 --- a/src/finiteArea/finiteArea/fac/facNDiv.C +++ b/src/finiteArea/finiteArea/fac/facNDiv.C @@ -53,9 +53,11 @@ ndiv { const areaVectorField& n = ssf.mesh().faceAreaNormals(); - tmp> v = + tmp> tv = fac::edgeIntegrate(ssf); + GeometricField& v = tv.ref(); + v.internalField() = n*(n & v.internalField()); v.correctBoundaryConditions(); @@ -97,9 +99,9 @@ ndiv fa::divScheme::New ( vf.mesh(), vf.mesh().schemesDict().divScheme(name) - )().facDiv(vf) + ).ref().facDiv(vf) ); - GeometricField& Div = tDiv(); + GeometricField& Div = tDiv.ref(); Div.internalField() = n*(n & Div.internalField()); Div.correctBoundaryConditions(); @@ -191,10 +193,10 @@ ndiv vf.mesh(), flux, vf.mesh().schemesDict().divScheme(name) - )().facDiv(flux, vf) + ).ref().facDiv(flux, vf) ); - GeometricField& Div = tDiv(); + GeometricField& Div = tDiv.ref(); Div.internalField() = n*(n &Div.internalField()); Div.correctBoundaryConditions(); diff --git a/src/finiteArea/finiteArea/fac/facNGrad.C b/src/finiteArea/finiteArea/fac/facNGrad.C index c8d16f9742..17a5f9f9cb 100644 --- a/src/finiteArea/finiteArea/fac/facNGrad.C +++ b/src/finiteArea/finiteArea/fac/facNGrad.C @@ -62,9 +62,9 @@ ngrad typedef typename outerProduct::type GradType; tmp> tgGrad = - fac::edgeIntegrate(ssf.mesh().Sf() * ssf); + fac::edgeIntegrate(ssf.mesh().Sf()*ssf); - GeometricField& gGrad = tgGrad(); + GeometricField& gGrad = tgGrad.ref(); gGrad = n*(n & gGrad); gGrad.correctBoundaryConditions(); @@ -119,9 +119,9 @@ ngrad ( vf.mesh(), vf.mesh().schemesDict().gradScheme(name) - )().grad(vf); + ).ref().grad(vf); - GeometricField& gGrad = tgGrad(); + GeometricField& gGrad = tgGrad.ref(); gGrad = n*(n & gGrad); gGrad.correctBoundaryConditions(); diff --git a/src/finiteArea/finiteArea/fam/famNDiv.C b/src/finiteArea/finiteArea/fam/famNDiv.C index f902fb1961..4665df8d9d 100644 --- a/src/finiteArea/finiteArea/fam/famNDiv.C +++ b/src/finiteArea/finiteArea/fam/famNDiv.C @@ -56,9 +56,10 @@ ndiv vf.mesh(), flux, vf.mesh().schemesDict().divScheme(name) - )().famDiv(flux, vf);//TODO calculate normal + ).ref().famDiv(flux, vf);//TODO calculate normal } + template tmp> ndiv @@ -86,6 +87,7 @@ ndiv return fam::ndiv(flux, vf, "div("+flux.name()+','+vf.name()+')'); } + template tmp> ndiv diff --git a/src/finiteArea/finiteArea/fam/vectorFamDiv.C b/src/finiteArea/finiteArea/fam/vectorFamDiv.C index 5d0693b444..601af28f60 100644 --- a/src/finiteArea/finiteArea/fam/vectorFamDiv.C +++ b/src/finiteArea/finiteArea/fam/vectorFamDiv.C @@ -56,7 +56,7 @@ div vf.mesh(), flux, vf.mesh().schemesDict().divScheme(name) - )().famDiv(flux, vf); + ).ref().famDiv(flux, vf); } diff --git a/src/finiteArea/interpolation/volSurfaceMapping/volSurfaceMapping.C b/src/finiteArea/interpolation/volSurfaceMapping/volSurfaceMapping.C index 86b4c6f186..6157d9cca1 100644 --- a/src/finiteArea/interpolation/volSurfaceMapping/volSurfaceMapping.C +++ b/src/finiteArea/interpolation/volSurfaceMapping/volSurfaceMapping.C @@ -46,7 +46,7 @@ Foam::tmp> Foam::volSurfaceMapping::mapToSurface pTraits::zero ) ); - Field& result = tresult(); + Field& result = tresult.ref(); // Get reference to volume mesh const polyMesh& pMesh = mesh_();