diff --git a/applications/test/fieldMapping/Test-fieldMapping.C b/applications/test/fieldMapping/Test-fieldMapping.C index 38a4b110f9..41af9c7923 100644 --- a/applications/test/fieldMapping/Test-fieldMapping.C +++ b/applications/test/fieldMapping/Test-fieldMapping.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -39,6 +39,7 @@ Description #include "mapPolyMesh.H" #include "polyTopoChange.H" #include "fvcDiv.H" +#include "zeroGradientFvPatchFields.H" #include "Random.H" using namespace Foam; diff --git a/src/OpenFOAM/fields/Fields/Field/Field.C b/src/OpenFOAM/fields/Fields/Field/Field.C index 596f74f1c3..e7e7479c15 100644 --- a/src/OpenFOAM/fields/Fields/Field/Field.C +++ b/src/OpenFOAM/fields/Fields/Field/Field.C @@ -609,7 +609,7 @@ template Foam::tmp> Foam::Field::T() const { tmp> transpose(new Field(this->size())); - ::Foam::T(transpose(), *this); + ::Foam::T(transpose.ref(), *this); return transpose; } diff --git a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C index e53fdf778a..a70abece0f 100644 --- a/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C +++ b/src/OpenFOAM/fields/GeometricFields/GeometricField/uniformInterpolate.C @@ -92,7 +92,7 @@ Foam::tmp Foam::uniformInterpolate // Interpolate tmp tfld(new GeoField(fieldIO, weights[0]*field0)); - GeoField& fld = tfld(); + GeoField& fld = tfld.ref(); for (label i = 1; i < times.size(); ++i) { diff --git a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C index fd77c9a677..e9253134ef 100644 --- a/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C +++ b/src/OpenFOAM/interpolations/primitivePatchInterpolation/PrimitivePatchInterpolation.C @@ -192,7 +192,7 @@ tmp> PrimitivePatchInterpolation::faceToPointInterpolate ) ); - Field& result = tresult(); + Field& result = tresult.ref(); const labelListList& pointFaces = patch_.pointFaces(); const scalarListList& weights = faceToPointWeights(); @@ -249,7 +249,7 @@ tmp> PrimitivePatchInterpolation::pointToFaceInterpolate ) ); - Field& result = tresult(); + Field& result = tresult.ref(); const List& localFaces = patch_.localFaces(); @@ -303,7 +303,7 @@ tmp> PrimitivePatchInterpolation::faceToEdgeInterpolate new Field(patch_.nEdges(), pTraits::zero) ); - Field& result = tresult(); + Field& result = tresult.ref(); const edgeList& edges = patch_.edges(); const labelListList& edgeFaces = patch_.edgeFaces(); diff --git a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C index 82f5851f33..34be2afdca 100644 --- a/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C +++ b/src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsNormals.C @@ -159,7 +159,7 @@ Foam::PatchTools::pointNormals // to avoid them being stored) tmp textrudeN(new pointField(p.nPoints(), vector::zero)); - pointField& extrudeN = textrudeN(); + pointField& extrudeN = textrudeN.ref(); { const faceList& localFaces = p.localFaces(); const vectorField& faceNormals = p.faceNormals(); @@ -213,7 +213,7 @@ Foam::PatchTools::edgeNormals // 1. Start off with local normals tmp tedgeNormals(new pointField(p.nEdges(), vector::zero)); - pointField& edgeNormals = tedgeNormals(); + pointField& edgeNormals = tedgeNormals.ref(); { const labelListList& edgeFaces = p.edgeFaces(); const vectorField& faceNormals = p.faceNormals(); diff --git a/src/combustionModels/FSD/FSD.C b/src/combustionModels/FSD/FSD.C index 6d846b3d95..8f10a8940c 100644 --- a/src/combustionModels/FSD/FSD.C +++ b/src/combustionModels/FSD/FSD.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -161,7 +161,7 @@ void FSD::calculateSourceNorm() ) ); - volScalarField& pc = tPc(); + volScalarField& pc = tPc.ref(); tmp tomegaFuel ( @@ -185,7 +185,7 @@ void FSD::calculateSourceNorm() ) ); - volScalarField& omegaFuelBar = tomegaFuel(); + volScalarField& omegaFuelBar = tomegaFuel.ref(); // Calculation of the mixture fraction variance (ftVar) const compressible::LESModel& lesModel = @@ -311,7 +311,7 @@ void FSD::calculateSourceNorm() ) ); - volScalarField& products = tproducts(); + volScalarField& products = tproducts.ref(); forAll(productsIndex, j) { diff --git a/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C b/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C index 2a5cbbd7da..1aa0e0ae83 100644 --- a/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C +++ b/src/combustionModels/FSD/reactionRateFlameAreaModels/consumptionSpeed/consumptionSpeed.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -102,7 +102,7 @@ Foam::tmp Foam::consumptionSpeed::omega0Sigma ) ); - volScalarField& omega0 = tomega0(); + volScalarField& omega0 = tomega0.ref(); volScalarField::InternalField& iomega0 = omega0.internalField(); diff --git a/src/combustionModels/Make/options b/src/combustionModels/Make/options index e660ccd9f6..d1ee86bab4 100644 --- a/src/combustionModels/Make/options +++ b/src/combustionModels/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ diff --git a/src/combustionModels/laminar/laminar.C b/src/combustionModels/laminar/laminar.C index d53a859a73..155c8bf01e 100644 --- a/src/combustionModels/laminar/laminar.C +++ b/src/combustionModels/laminar/laminar.C @@ -119,7 +119,7 @@ Foam::combustionModels::laminar::R(volScalarField& Y) const { tmp tSu(new fvScalarMatrix(Y, dimMass/dimTime)); - fvScalarMatrix& Su = tSu(); + fvScalarMatrix& Su = tSu.ref(); if (this->active()) { @@ -157,7 +157,7 @@ Foam::combustionModels::laminar::dQ() const if (this->active()) { - tdQ() = this->chemistryPtr_->dQ(); + tdQ.ref() = this->chemistryPtr_->dQ(); } return tdQ; @@ -188,7 +188,7 @@ Foam::combustionModels::laminar::Sh() const if (this->active()) { - tSh() = this->chemistryPtr_->Sh(); + tSh.ref() = this->chemistryPtr_->Sh(); } return tSh; diff --git a/src/combustionModels/singleStepCombustion/singleStepCombustion.C b/src/combustionModels/singleStepCombustion/singleStepCombustion.C index ba586bc1cd..d8bc1cfac3 100644 --- a/src/combustionModels/singleStepCombustion/singleStepCombustion.C +++ b/src/combustionModels/singleStepCombustion/singleStepCombustion.C @@ -160,7 +160,7 @@ singleStepCombustion::dQ() const if (this->active()) { - volScalarField& dQ = tdQ(); + volScalarField& dQ = tdQ.ref(); dQ.dimensionedInternalField() = this->mesh().V()*Sh()(); } return tdQ; diff --git a/src/conversion/Make/options b/src/conversion/Make/options index 4ff461186c..ace5a3133b 100644 --- a/src/conversion/Make/options +++ b/src/conversion/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/fileFormats/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude diff --git a/src/dynamicFvMesh/Make/options b/src/dynamicFvMesh/Make/options index 966b56964d..3cee7d2a3c 100644 --- a/src/dynamicFvMesh/Make/options +++ b/src/dynamicFvMesh/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ diff --git a/src/dynamicMesh/Make/options b/src/dynamicMesh/Make/options index 0757c29678..5725e0f867 100644 --- a/src/dynamicMesh/Make/options +++ b/src/dynamicMesh/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude \ diff --git a/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C b/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C index 572b8b7d79..085cc99079 100644 --- a/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C +++ b/src/dynamicMesh/layerAdditionRemoval/addCellLayer.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,7 +45,7 @@ Foam::tmp Foam::layerAdditionRemoval::extrusionDir() const const labelList& mp = masterFaceLayer.meshPoints(); tmp textrusionDir(new vectorField(mp.size())); - vectorField& extrusionDir = textrusionDir(); + vectorField& extrusionDir = textrusionDir.ref(); if (setLayerPairing()) { diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C index bebb9ea3aa..384663939e 100644 --- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C +++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C @@ -119,7 +119,7 @@ Foam::tmp Foam::motionSmootherAlgo::calcEdgeWeights const edgeList& edges = mesh_.edges(); tmp twght(new scalarField(edges.size())); - scalarField& wght = twght(); + scalarField& wght = twght.ref(); forAll(edges, edgeI) { @@ -815,7 +815,7 @@ Foam::tmp Foam::motionSmootherAlgo::curPoints() const tmp tnewPoints(oldPoints_ + totalDisplacement.internalField()); // Correct for 2-D motion - modifyMotionPoints(tnewPoints()); + modifyMotionPoints(tnewPoints.ref()); return tnewPoints; } diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C index f59703c56f..f7a9174d8e 100644 --- a/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C +++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgoTemplates.C @@ -159,7 +159,7 @@ Foam::motionSmootherAlgo::avg dimensioned("zero", fld.dimensions(), pTraits::zero) ) ); - GeometricField& res = tres(); + GeometricField& res = tres.ref(); const polyMesh& mesh = fld.mesh()(); diff --git a/src/engine/Make/options b/src/engine/Make/options index 0929e2bc8f..f16d25abf1 100644 --- a/src/engine/Make/options +++ b/src/engine/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C index 3ec972fc2a..c078bd365d 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C +++ b/src/finiteVolume/finiteVolume/fvc/fvcCellReduce.C @@ -70,7 +70,7 @@ tmp> cellReduce ) ); - volFieldType& result = tresult(); + volFieldType& result = tresult.ref(); const labelUList& own = mesh.owner(); const labelUList& nbr = mesh.neighbour(); @@ -102,7 +102,8 @@ tmp> cellReduce tmp> tvf(cellReduce(cop, tssf)); - tssf.clear(); + tssf.clear(); + return tvf; } diff --git a/src/finiteVolume/finiteVolume/fvc/fvcCurl.C b/src/finiteVolume/finiteVolume/fvc/fvcCurl.C index 38dee36681..1ec6024fb9 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcCurl.C +++ b/src/finiteVolume/finiteVolume/fvc/fvcCurl.C @@ -56,7 +56,7 @@ curl tmp> tcurlVf = 2.0*(*skew(fvc::grad(vf, nameCurlVf))); - tcurlVf().rename(nameCurlVf); + tcurlVf.ref().rename(nameCurlVf); return tcurlVf; } diff --git a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C index 9b2f375b08..32c8a51dda 100644 --- a/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C +++ b/src/finiteVolume/finiteVolume/fvc/fvcReconstruct.C @@ -78,7 +78,7 @@ reconstruct ) ); - treconField().correctBoundaryConditions(); + treconField.ref().correctBoundaryConditions(); return treconField; } diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C index 6d4b18f371..91d7384f55 100644 --- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C +++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrix.C @@ -693,7 +693,7 @@ template Foam::tmp Foam::fvMatrix::D() const { tmp tdiag(new scalarField(diag())); - addCmptAvBoundaryDiag(tdiag()); + addCmptAvBoundaryDiag(tdiag.ref()); return tdiag; } @@ -713,7 +713,7 @@ Foam::tmp> Foam::fvMatrix::DD() const ( lduAddr().patchAddr(patchI), internalCoeffs_[patchI], - tdiag() + tdiag.ref() ); } } diff --git a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C index dbf2c09d77..33255e5c14 100644 --- a/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C +++ b/src/finiteVolume/fvMesh/fvMeshSubset/fvMeshSubsetInterpolate.C @@ -100,7 +100,7 @@ tmp> fvMeshSubset::interpolate patchFields ) ); - GeometricField& resF = tresF(); + GeometricField& resF = tresF.ref(); // 2. Change the fvPatchFields to the correct type using a mapper @@ -243,7 +243,7 @@ tmp> fvMeshSubset::interpolate patchFields ) ); - GeometricField& resF = tresF(); + GeometricField& resF = tresF.ref(); // 2. Change the fvsPatchFields to the correct type using a mapper diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options b/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options index 93a7e01542..63d132ca50 100644 --- a/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options +++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/OpenFOAM/lnInclude diff --git a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C index ab49334a5d..32bf9efa12 100644 --- a/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C +++ b/src/fvAgglomerationMethods/pairPatchAgglomeration/pairPatchAgglomeration.C @@ -440,7 +440,7 @@ Foam::tmp Foam::pairPatchAgglomeration::agglomerateOneLevel const label nFineFaces = patch.size(); tmp tcoarseCellMap(new labelField(nFineFaces, -1)); - labelField& coarseCellMap = tcoarseCellMap(); + labelField& coarseCellMap = tcoarseCellMap.ref(); const labelListList& faceFaces = patch.faceFaces(); diff --git a/src/fvMotionSolver/Make/options b/src/fvMotionSolver/Make/options index 29e4469610..e0b34247ad 100644 --- a/src/fvMotionSolver/Make/options +++ b/src/fvMotionSolver/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ diff --git a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C index 8f90cb8444..fe9ac195c7 100644 --- a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -188,8 +188,9 @@ Foam::displacementComponentLaplacianFvMotionSolver::curPoints() const else { tmp tcurPoints(new pointField(fvMesh_.points())); + pointField& curPoints = tcurPoints.ref(); - tcurPoints().replace + curPoints.replace ( cmpt_, points0_ + pointDisplacement_.internalField() @@ -204,11 +205,11 @@ Foam::displacementComponentLaplacianFvMotionSolver::curPoints() const { label pointI = pz[i]; - tcurPoints()[pointI][cmpt_] = points0_[pointI]; + curPoints[pointI][cmpt_] = points0_[pointI]; } } - twoDCorrectPoints(tcurPoints()); + twoDCorrectPoints(curPoints); return tcurPoints; } diff --git a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C index 124a679e15..bb40c74881 100644 --- a/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -101,14 +101,14 @@ Foam::velocityComponentLaplacianFvMotionSolver::curPoints() const tmp tcurPoints(new pointField(fvMesh_.points())); - tcurPoints().replace + tcurPoints.ref().replace ( cmpt_, tcurPoints().component(cmpt_) + fvMesh_.time().deltaTValue()*pointMotionU_.internalField() ); - twoDCorrectPoints(tcurPoints()); + twoDCorrectPoints(tcurPoints.ref()); return tcurPoints; } diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C index 7aafefc0c5..ba28c423c9 100644 --- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -108,7 +108,7 @@ Foam::displacementSBRStressFvMotionSolver::curPoints() const points0() + pointDisplacement().internalField() ); - twoDCorrectPoints(tcurPoints()); + twoDCorrectPoints(tcurPoints.ref()); return tcurPoints; } diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C index f3286af26a..b1a72eb6f8 100644 --- a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C @@ -313,7 +313,7 @@ Foam::displacementInterpolationMotionSolver::curPoints() const } tmp tcurPoints(new pointField(points0())); - pointField& curPoints = tcurPoints(); + pointField& curPoints = tcurPoints.ref(); // Interpolate the displacement of the face zones. vectorField zoneDisp(displacements_.size(), vector::zero); diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C index d4a3ca5a0a..863f800d19 100644 --- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -200,6 +200,7 @@ Foam::displacementLaplacianFvMotionSolver::curPoints() const ( points0() + pointDisplacement_.internalField() ); + pointField& curPoints = tcurPoints.ref(); // Implement frozen points if (frozenPointsZone_ != -1) @@ -208,11 +209,11 @@ Foam::displacementLaplacianFvMotionSolver::curPoints() const forAll(pz, i) { - tcurPoints()[pz[i]] = points0()[pz[i]]; + curPoints[pz[i]] = points0()[pz[i]]; } } - twoDCorrectPoints(tcurPoints()); + twoDCorrectPoints(curPoints); return tcurPoints; } diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C index 832f249e20..0900344564 100644 --- a/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -223,7 +223,7 @@ Foam::displacementLayeredMotionMotionSolver::faceZoneEvaluate ) const { tmp tfld(new vectorField(meshPoints.size())); - vectorField& fld = tfld(); + vectorField& fld = tfld.ref(); const word type(dict.lookup("type")); diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C index ce63274ed9..ba05811ba6 100644 --- a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C +++ b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -103,7 +103,7 @@ Foam::velocityLaplacianFvMotionSolver::curPoints() const + fvMesh_.time().deltaTValue()*pointMotionU_.internalField() ); - twoDCorrectPoints(tcurPoints()); + twoDCorrectPoints(tcurPoints.ref()); return tcurPoints; } diff --git a/src/fvOptions/Make/options b/src/fvOptions/Make/options index 124084c057..5598b4ef20 100644 --- a/src/fvOptions/Make/options +++ b/src/fvOptions/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/sampling/lnInclude \ diff --git a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C index 181db2575e..3ca231a5c1 100644 --- a/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C +++ b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -186,7 +186,7 @@ void Foam::fv::rotorDiskSource::writeField ) ); - Field& field = tfield().internalField(); + Field& field = tfield.ref().internalField(); if (cells_.size() != values.size()) { diff --git a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C index 7ac47f1b2b..1f9905b94b 100644 --- a/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C +++ b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -260,7 +260,7 @@ Foam::tmp Foam::targetCoeffTrim::thetag() const const List& x = rotor_.x(); tmp ttheta(new scalarField(x.size())); - scalarField& t = ttheta(); + scalarField& t = ttheta.ref(); forAll(t, i) { diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C index 170f72517b..ee213ae246 100644 --- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C +++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -194,7 +194,7 @@ void Foam::fv::interRegionHeatTransferModel::addSup ) ); - volScalarField& Tmapped = tTmapped(); + volScalarField& Tmapped = tTmapped.ref(); const fvMesh& nbrMesh = mesh_.time().lookupObject(nbrRegionName_); diff --git a/src/genericPatchFields/Make/options b/src/genericPatchFields/Make/options index 71b7873964..287318da1f 100644 --- a/src/genericPatchFields/Make/options +++ b/src/genericPatchFields/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ diff --git a/src/lagrangian/DSMC/Make/options b/src/lagrangian/DSMC/Make/options index 55865dfabc..4f10470b16 100644 --- a/src/lagrangian/DSMC/Make/options +++ b/src/lagrangian/DSMC/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude diff --git a/src/lagrangian/basic/Make/options b/src/lagrangian/basic/Make/options index f7d9a36f3b..4670e80487 100644 --- a/src/lagrangian/basic/Make/options +++ b/src/lagrangian/basic/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options index 04b133ba05..9c78fa29f7 100644 --- a/src/lagrangian/coalCombustion/Make/options +++ b/src/lagrangian/coalCombustion/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ diff --git a/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H b/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H index 16152ff9dc..a249a875d1 100644 --- a/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H +++ b/src/lagrangian/coalCombustion/coalCloudList/coalCloudListI.H @@ -47,7 +47,7 @@ Foam::coalCloudList::UTrans() const ) ); - DimensionedField& fld = tfld(); + DimensionedField& fld = tfld.ref(); forAll(*this, i) { @@ -64,7 +64,7 @@ Foam::tmp Foam::coalCloudList::SU ) const { tmp tfvm(new fvVectorMatrix(U, dimForce)); - fvVectorMatrix& fvm = tfvm(); + fvVectorMatrix& fvm = tfvm.ref(); forAll(*this, i) { @@ -95,7 +95,7 @@ Foam::coalCloudList::hsTrans() const ) ); - DimensionedField& fld = tfld(); + DimensionedField& fld = tfld.ref(); forAll(*this, i) { @@ -112,7 +112,7 @@ Foam::tmp Foam::coalCloudList::Sh ) const { tmp tfvm(new fvScalarMatrix(hs, dimEnergy/dimTime)); - fvScalarMatrix& fvm = tfvm(); + fvScalarMatrix& fvm = tfvm.ref(); forAll(*this, i) { @@ -130,7 +130,7 @@ Foam::tmp Foam::coalCloudList::SYi ) const { tmp tfvm(new fvScalarMatrix(Yi, dimMass/dimTime)); - fvScalarMatrix& fvm = tfvm(); + fvScalarMatrix& fvm = tfvm.ref(); forAll(*this, i) { @@ -161,7 +161,7 @@ Foam::coalCloudList::rhoTrans() const ) ); - DimensionedField& fld = tfld(); + DimensionedField& fld = tfld.ref(); forAll(*this, i) { @@ -197,7 +197,7 @@ Foam::coalCloudList::Srho() const ) ); - DimensionedField& fld = tfld(); + DimensionedField& fld = tfld.ref(); forAll(*this, i) { @@ -231,7 +231,7 @@ Foam::coalCloudList::Srho ) ); - DimensionedField& fld = tfld(); + DimensionedField& fld = tfld.ref(); forAll(*this, j) { @@ -248,7 +248,7 @@ Foam::tmp Foam::coalCloudList::Srho ) const { tmp tfvm(new fvScalarMatrix(rho, dimMass/dimTime)); - fvScalarMatrix& fvm = tfvm(); + fvScalarMatrix& fvm = tfvm.ref(); forAll(*this, i) { diff --git a/src/lagrangian/distributionModels/Make/options b/src/lagrangian/distributionModels/Make/options index e69de29bb2..ccd5450e02 100644 --- a/src/lagrangian/distributionModels/Make/options +++ b/src/lagrangian/distributionModels/Make/options @@ -0,0 +1 @@ +EXE_INC = -DCONST_TMP diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options index a5a3b3c8eb..18eeb81970 100644 --- a/src/lagrangian/intermediate/Make/options +++ b/src/lagrangian/intermediate/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H index 3ed9040875..69b0eb60af 100644 --- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H @@ -439,7 +439,7 @@ Foam::KinematicCloud::SU(volVectorField& U) const else { tmp tfvm(new fvVectorMatrix(U, dimForce)); - fvVectorMatrix& fvm = tfvm(); + fvVectorMatrix& fvm = tfvm.ref(); fvm.source() = -UTrans()/(this->db().time().deltaT()); @@ -474,7 +474,7 @@ Foam::KinematicCloud::vDotSweep() const ) ); - volScalarField& vDotSweep = tvDotSweep(); + volScalarField& vDotSweep = tvDotSweep.ref(); forAllConstIter(typename KinematicCloud, *this, iter) { const parcelType& p = iter(); @@ -513,7 +513,7 @@ Foam::KinematicCloud::theta() const ) ); - volScalarField& theta = ttheta(); + volScalarField& theta = ttheta.ref(); forAllConstIter(typename KinematicCloud, *this, iter) { const parcelType& p = iter(); @@ -551,7 +551,7 @@ Foam::KinematicCloud::alpha() const ) ); - scalarField& alpha = talpha().internalField(); + scalarField& alpha = talpha.ref().internalField(); forAllConstIter(typename KinematicCloud, *this, iter) { const parcelType& p = iter(); @@ -588,7 +588,7 @@ Foam::KinematicCloud::rhoEff() const ) ); - scalarField& rhoEff = trhoEff().internalField(); + scalarField& rhoEff = trhoEff.ref().internalField(); forAllConstIter(typename KinematicCloud, *this, iter) { const parcelType& p = iter(); diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H index d159381215..1c9907ecdb 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H @@ -127,7 +127,7 @@ inline Foam::tmp Foam::ReactingCloud::SYi ) ); - volScalarField& sourceField = trhoTrans(); + volScalarField& sourceField = trhoTrans.ref(); sourceField.internalField() = rhoTrans_[i]/(this->db().time().deltaTValue()*this->mesh().V()); @@ -141,7 +141,7 @@ inline Foam::tmp Foam::ReactingCloud::SYi else { tmp tfvm(new fvScalarMatrix(Yi, dimMass/dimTime)); - fvScalarMatrix& fvm = tfvm(); + fvScalarMatrix& fvm = tfvm.ref(); fvm.source() = -rhoTrans_[i]/this->db().time().deltaTValue(); @@ -182,7 +182,7 @@ Foam::ReactingCloud::Srho(const label i) const if (this->solution().coupled()) { - scalarField& rhoi = tRhoi(); + scalarField& rhoi = tRhoi.ref(); rhoi = rhoTrans_[i]/(this->db().time().deltaTValue()*this->mesh().V()); } @@ -219,7 +219,7 @@ Foam::ReactingCloud::Srho() const if (this->solution().coupled()) { - scalarField& sourceField = trhoTrans(); + scalarField& sourceField = trhoTrans.ref(); forAll(rhoTrans_, i) { sourceField += rhoTrans_[i]; @@ -256,7 +256,7 @@ Foam::ReactingCloud::Srho(volScalarField& rho) const ) ); - scalarField& sourceField = trhoTrans(); + scalarField& sourceField = trhoTrans.ref(); if (this->solution().semiImplicit("rho")) { @@ -272,7 +272,7 @@ Foam::ReactingCloud::Srho(volScalarField& rho) const else { tmp tfvm(new fvScalarMatrix(rho, dimMass/dimTime)); - fvScalarMatrix& fvm = tfvm(); + fvScalarMatrix& fvm = tfvm.ref(); forAll(rhoTrans_, i) { diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H index 9655ef95f3..d23371cb82 100644 --- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H +++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H @@ -247,7 +247,7 @@ Foam::ThermoCloud::Sh(volScalarField& hs) const else { tmp tfvm(new fvScalarMatrix(hs, dimEnergy/dimTime)); - fvScalarMatrix& fvm = tfvm(); + fvScalarMatrix& fvm = tfvm.ref(); fvm.source() = -hsTrans()/(this->db().time().deltaT()); @@ -282,7 +282,7 @@ inline Foam::tmp Foam::ThermoCloud::Ep() const if (radiation_) { - scalarField& Ep = tEp().internalField(); + scalarField& Ep = tEp.ref().internalField(); const scalar dt = this->db().time().deltaTValue(); const scalarField& V = this->mesh().V(); const scalar epsilon = constProps_.epsilon0(); @@ -318,7 +318,7 @@ inline Foam::tmp Foam::ThermoCloud::ap() const if (radiation_) { - scalarField& ap = tap().internalField(); + scalarField& ap = tap.ref().internalField(); const scalar dt = this->db().time().deltaTValue(); const scalarField& V = this->mesh().V(); const scalar epsilon = constProps_.epsilon0(); @@ -355,7 +355,7 @@ Foam::ThermoCloud::sigmap() const if (radiation_) { - scalarField& sigmap = tsigmap().internalField(); + scalarField& sigmap = tsigmap.ref().internalField(); const scalar dt = this->db().time().deltaTValue(); const scalarField& V = this->mesh().V(); const scalar epsilon = constProps_.epsilon0(); diff --git a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C index 73a72f5540..ad22dc25fb 100644 --- a/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C +++ b/src/lagrangian/intermediate/submodels/MPPIC/PackingModels/Implicit/Implicit.C @@ -267,14 +267,14 @@ void Foam::PackingModels::Implicit::cacheFields(const bool store) if (applyGravity_) { - phiCorrect_() -= phiGByA(); + phiCorrect_.ref() -= phiGByA(); } forAll(phiCorrect_(), faceI) { // Current and correction fluxes const scalar phiCurr = phi[faceI]; - scalar& phiCorr = phiCorrect_()[faceI]; + scalar& phiCorr = phiCorrect_.ref()[faceI]; // Don't limit if the correction is in the opposite direction to // the flux. We need all the help we can get in this state. @@ -296,7 +296,7 @@ void Foam::PackingModels::Implicit::cacheFields(const bool store) if (applyGravity_) { - phiCorrect_() += phiGByA(); + phiCorrect_.ref() += phiGByA(); } } diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C index 56153ff88b..bf3a35272b 100644 --- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C +++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -95,7 +95,7 @@ Foam::radiation::cloudAbsorptionEmission::aDisp(const label) const mesh_.objectRegistry::lookupObject(cloudNames_[i]) ); - ta() += tc.ap(); + ta.ref() += tc.ap(); } return ta; @@ -155,7 +155,7 @@ Foam::radiation::cloudAbsorptionEmission::EDisp(const label bandI) const mesh_.objectRegistry::lookupObject(cloudNames_[i]) ); - tE() += tc.Ep(); + tE.ref() += tc.Ep(); } // Total emission is 4 times the projected emission diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C index aa38692a76..0f88407b4e 100644 --- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C +++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -95,7 +95,7 @@ Foam::radiation::cloudScatter::sigmaEff() const mesh_.objectRegistry::lookupObject(cloudNames_[i]) ); - tsigma() += tc.sigmap(); + tsigma.ref() += tc.sigmap(); } return 3.0*tsigma; diff --git a/src/lagrangian/molecularDynamics/molecule/Make/options b/src/lagrangian/molecularDynamics/molecule/Make/options index 5698f81a65..6ccac8015b 100644 --- a/src/lagrangian/molecularDynamics/molecule/Make/options +++ b/src/lagrangian/molecularDynamics/molecule/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ @@ -11,4 +11,3 @@ LIB_LIBS = \ -llagrangian \ -lpotential \ -lmolecularMeasurements - diff --git a/src/lagrangian/solidParticle/Make/options b/src/lagrangian/solidParticle/Make/options index 9fe79c9220..5cf0265987 100644 --- a/src/lagrangian/solidParticle/Make/options +++ b/src/lagrangian/solidParticle/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude diff --git a/src/lagrangian/spray/Make/options b/src/lagrangian/spray/Make/options index 3b5a4e72e9..d5eb8a74c5 100644 --- a/src/lagrangian/spray/Make/options +++ b/src/lagrangian/spray/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ diff --git a/src/lagrangian/turbulence/Make/options b/src/lagrangian/turbulence/Make/options index 7b2fc4bea8..67f1b6608c 100644 --- a/src/lagrangian/turbulence/Make/options +++ b/src/lagrangian/turbulence/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \ -I$(LIB_SRC)/lagrangian/distributionModels/lnInclude \ diff --git a/src/mesh/autoMesh/Make/options b/src/mesh/autoMesh/Make/options index d37a26a9dd..78bd91e593 100644 --- a/src/mesh/autoMesh/Make/options +++ b/src/mesh/autoMesh/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C index f1727c44b0..91ce9cce75 100644 --- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C +++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoLayerDriver.C @@ -112,7 +112,7 @@ Foam::tmp Foam::autoLayerDriver::avgPointData ) { tmp tfaceFld(new scalarField(pp.size(), 0.0)); - scalarField& faceFld = tfaceFld(); + scalarField& faceFld = tfaceFld.ref(); forAll(pp.localFaces(), faceI) { diff --git a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C index 7e4fd3a1af..29475a3958 100644 --- a/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C +++ b/src/mesh/autoMesh/autoHexMesh/autoHexMeshDriver/autoSnapDriver.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -514,7 +514,7 @@ Foam::tmp Foam::autoSnapDriver::edgePatchDist // Copy edge values into scalarField tmp tedgeDist(new scalarField(mesh.nEdges())); - scalarField& edgeDist = tedgeDist(); + scalarField& edgeDist = tedgeDist.ref(); forAll(allEdgeInfo, edgeI) { @@ -874,7 +874,7 @@ Foam::tmp Foam::autoSnapDriver::avgCellCentres ( new pointField(pointFaces.size(), vector::zero) ); - pointField& avgBoundary = tavgBoundary(); + pointField& avgBoundary = tavgBoundary.ref(); labelList nBoundary(pointFaces.size(), 0); forAll(pointFaces, pointI) diff --git a/src/mesh/blockMesh/Make/options b/src/mesh/blockMesh/Make/options index 1618ab57ec..d398d1687f 100644 --- a/src/mesh/blockMesh/Make/options +++ b/src/mesh/blockMesh/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude diff --git a/src/mesh/extrudeModel/Make/options b/src/mesh/extrudeModel/Make/options index eabd0b53a8..92abbacf67 100644 --- a/src/mesh/extrudeModel/Make/options +++ b/src/mesh/extrudeModel/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/dynamicMesh/lnInclude diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C index d9e3a0fb77..50dad9b28b 100644 --- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C +++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicACMIGAMGInterface/cyclicACMIGAMGInterface.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -184,7 +184,7 @@ Foam::cyclicACMIGAMGInterface::internalFieldTransfer const labelUList& nbrFaceCells = nbr.faceCells(); tmp tpnf(new labelField(nbrFaceCells.size())); - labelField& pnf = tpnf(); + labelField& pnf = tpnf.ref(); forAll(pnf, facei) { diff --git a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C index 151b021aba..0270d4c645 100644 --- a/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C +++ b/src/meshTools/AMIInterpolation/GAMG/interfaces/cyclicAMIGAMGInterface/cyclicAMIGAMGInterface.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -183,7 +183,7 @@ Foam::tmp Foam::cyclicAMIGAMGInterface::internalFieldTransfer const labelUList& nbrFaceCells = nbr.faceCells(); tmp tpnf(new labelField(nbrFaceCells.size())); - labelField& pnf = tpnf(); + labelField& pnf = tpnf.ref(); forAll(pnf, facei) { diff --git a/src/meshTools/Make/options b/src/meshTools/Make/options index 1713152e9e..2f8d1a7b47 100644 --- a/src/meshTools/Make/options +++ b/src/meshTools/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/triSurface/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/fileFormats/lnInclude diff --git a/src/meshTools/cellQuality/cellQuality.C b/src/meshTools/cellQuality/cellQuality.C index 95fe7e5339..c1165ee375 100644 --- a/src/meshTools/cellQuality/cellQuality.C +++ b/src/meshTools/cellQuality/cellQuality.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -47,7 +47,7 @@ Foam::tmp Foam::cellQuality::nonOrthogonality() const ) ); - scalarField& result = tresult(); + scalarField& result = tresult.ref(); scalarField sumArea(mesh_.nCells(), 0.0); @@ -108,7 +108,7 @@ Foam::tmp Foam::cellQuality::skewness() const mesh_.nCells(), 0.0 ) ); - scalarField& result = tresult(); + scalarField& result = tresult.ref(); scalarField sumArea(mesh_.nCells(), 0.0); @@ -187,7 +187,7 @@ Foam::tmp Foam::cellQuality::faceNonOrthogonality() const mesh_.nFaces(), 0.0 ) ); - scalarField& result = tresult(); + scalarField& result = tresult.ref(); const vectorField& centres = mesh_.cellCentres(); @@ -247,7 +247,7 @@ Foam::tmp Foam::cellQuality::faceSkewness() const mesh_.nFaces(), 0.0 ) ); - scalarField& result = tresult(); + scalarField& result = tresult.ref(); const vectorField& cellCtrs = mesh_.cellCentres(); diff --git a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C index 0ffe75d2e6..a0bfb14b8f 100644 --- a/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C +++ b/src/meshTools/coordinateSystems/coordinateRotation/EulerCoordinateRotation.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -128,7 +128,7 @@ transformVector ) const { tmp tfld(new symmTensorField(st.size())); - symmTensorField& fld = tfld(); + symmTensorField& fld = tfld.ref(); forAll(fld, i) { diff --git a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C index fde7eb39cc..41e331c2b5 100644 --- a/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C +++ b/src/meshTools/coordinateSystems/coordinateRotation/STARCDCoordinateRotation.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -129,7 +129,7 @@ transformVector ) const { tmp tfld(new symmTensorField(st.size())); - symmTensorField& fld = tfld(); + symmTensorField& fld = tfld.ref(); forAll(fld, i) { diff --git a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C index c28a6fd3b4..ae0614f8de 100644 --- a/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C +++ b/src/meshTools/coordinateSystems/coordinateRotation/axesRotation.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -232,7 +232,7 @@ Foam::tmp Foam::axesRotation::transformVector ) const { tmp tfld(new symmTensorField(st.size())); - symmTensorField& fld = tfld(); + symmTensorField& fld = tfld.ref(); forAll(fld, i) { diff --git a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C index a5427b5fa1..572db42283 100644 --- a/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C +++ b/src/meshTools/coordinateSystems/coordinateRotation/cylindrical.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -304,7 +304,7 @@ Foam::tmp Foam::cylindrical::transformTensor const tensorField& R = Rptr_(); const tensorField Rtr(R.T()); tmp tt(new tensorField(cellMap.size())); - tensorField& t = tt(); + tensorField& t = tt.ref(); forAll(cellMap, i) { const label cellI = cellMap[i]; @@ -328,7 +328,7 @@ Foam::tmp Foam::cylindrical::transformVector } tmp tfld(new symmTensorField(Rptr_->size())); - symmTensorField& fld = tfld(); + symmTensorField& fld = tfld.ref(); const tensorField& R = Rptr_(); forAll(fld, i) diff --git a/src/meshTools/coordinateSystems/cylindricalCS.C b/src/meshTools/coordinateSystems/cylindricalCS.C index 18be4ab3a8..fda455545a 100644 --- a/src/meshTools/coordinateSystems/cylindricalCS.C +++ b/src/meshTools/coordinateSystems/cylindricalCS.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -208,7 +208,7 @@ Foam::tmp Foam::cylindricalCS::globalToLocal ); tmp tresult(new vectorField(lc.size())); - vectorField& result = tresult(); + vectorField& result = tresult.ref(); result.replace ( diff --git a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C index 22e92fa7c3..0ecb78004f 100644 --- a/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C +++ b/src/meshTools/mappedPatches/mappedPolyPatch/mappedPatchBase.C @@ -99,7 +99,7 @@ Foam::tmp Foam::mappedPatchBase::facePoints // Initialise to face-centre tmp tfacePoints(new pointField(patch_.size())); - pointField& facePoints = tfacePoints(); + pointField& facePoints = tfacePoints.ref(); forAll(pp, faceI) { @@ -867,7 +867,7 @@ Foam::tmp Foam::mappedPatchBase::readListOrField ) { tmp tfld(new pointField()); - pointField& fld = tfld(); + pointField& fld = tfld.ref(); if (size) { @@ -1267,7 +1267,7 @@ Foam::tmp Foam::mappedPatchBase::samplePoints ) const { tmp tfld(new pointField(fc)); - pointField& fld = tfld(); + pointField& fld = tfld.ref(); switch (offsetMode_) { diff --git a/src/meshTools/momentOfInertia/momentOfInertia.C b/src/meshTools/momentOfInertia/momentOfInertia.C index bb17f5833c..c28ca0325b 100644 --- a/src/meshTools/momentOfInertia/momentOfInertia.C +++ b/src/meshTools/momentOfInertia/momentOfInertia.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -306,7 +306,7 @@ Foam::tmp Foam::momentOfInertia::meshInertia { tmp tTf = tmp(new tensorField(mesh.nCells())); - tensorField& tf = tTf(); + tensorField& tf = tTf.ref(); forAll(tf, cI) { diff --git a/src/meshTools/searchableSurface/searchableBox.C b/src/meshTools/searchableSurface/searchableBox.C index a293385436..c42150e7ef 100644 --- a/src/meshTools/searchableSurface/searchableBox.C +++ b/src/meshTools/searchableSurface/searchableBox.C @@ -223,7 +223,7 @@ const Foam::wordList& Foam::searchableBox::regions() const Foam::tmp Foam::searchableBox::coordinates() const { tmp tCtrs = tmp(new pointField(6)); - pointField& ctrs = tCtrs(); + pointField& ctrs = tCtrs.ref(); const pointField pts(treeBoundBox::points()); const faceList& fcs = treeBoundBox::faces; diff --git a/src/meshTools/searchableSurface/searchableCylinder.C b/src/meshTools/searchableSurface/searchableCylinder.C index 01eee6e635..69568fa18d 100644 --- a/src/meshTools/searchableSurface/searchableCylinder.C +++ b/src/meshTools/searchableSurface/searchableCylinder.C @@ -30,10 +30,8 @@ License namespace Foam { - -defineTypeNameAndDebug(searchableCylinder, 0); -addToRunTimeSelectionTable(searchableSurface, searchableCylinder, dict); - + defineTypeNameAndDebug(searchableCylinder, 0); + addToRunTimeSelectionTable(searchableSurface, searchableCylinder, dict); } @@ -67,7 +65,7 @@ void Foam::searchableCylinder::boundingSpheres Foam::tmp Foam::searchableCylinder::points() const { tmp tPts(new pointField(2)); - pointField& pts = tPts(); + pointField& pts = tPts.ref(); pts[0] = point1_; pts[1] = point2_; diff --git a/src/meshTools/searchableSurface/searchablePlate.C b/src/meshTools/searchableSurface/searchablePlate.C index f03b4ac26f..166aef7752 100644 --- a/src/meshTools/searchableSurface/searchablePlate.C +++ b/src/meshTools/searchableSurface/searchablePlate.C @@ -298,7 +298,7 @@ void Foam::searchablePlate::boundingSpheres Foam::tmp Foam::searchablePlate::points() const { tmp tPts(new pointField(4)); - pointField& pts = tPts(); + pointField& pts = tPts.ref(); pts[0] = origin_; pts[2] = origin_ + span_; diff --git a/src/meshTools/searchableSurface/searchableSurfaceCollection.C b/src/meshTools/searchableSurface/searchableSurfaceCollection.C index 868a959941..17477023ca 100644 --- a/src/meshTools/searchableSurface/searchableSurfaceCollection.C +++ b/src/meshTools/searchableSurface/searchableSurfaceCollection.C @@ -325,7 +325,7 @@ Foam::tmp Foam::searchableSurfaceCollection::coordinates() const { tmp tCtrs = tmp(new pointField(size())); - pointField& ctrs = tCtrs(); + pointField& ctrs = tCtrs.ref(); // Append individual coordinates label coordI = 0; @@ -400,7 +400,7 @@ Foam::searchableSurfaceCollection::points() const } tmp tPts(new pointField(nPoints)); - pointField& pts = tPts(); + pointField& pts = tPts.ref(); // Append individual coordinates nPoints = 0; diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.C b/src/meshTools/searchableSurface/triSurfaceMesh.C index de185b181c..507e839c92 100644 --- a/src/meshTools/searchableSurface/triSurfaceMesh.C +++ b/src/meshTools/searchableSurface/triSurfaceMesh.C @@ -382,7 +382,7 @@ void Foam::triSurfaceMesh::clearOut() Foam::tmp Foam::triSurfaceMesh::coordinates() const { tmp tPts(new pointField(8)); - pointField& pt = tPts(); + pointField& pt = tPts.ref(); // Use copy to calculate face centres so they don't get stored pt = PrimitivePatch diff --git a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C index 87300a9928..e61a40391e 100644 --- a/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C +++ b/src/meshTools/triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C @@ -197,7 +197,7 @@ void Foam::pointToPointPlanarInterpolation::calcWeights ( referenceCS_.localPosition(sourcePoints) ); - vectorField& localVertices = tlocalVertices(); + vectorField& localVertices = tlocalVertices.ref(); const boundBox bb(localVertices, true); const point bbMid(bb.midpoint()); diff --git a/src/postProcessing/functionObjects/field/Make/options b/src/postProcessing/functionObjects/field/Make/options index 0732822dba..583c538b9e 100644 --- a/src/postProcessing/functionObjects/field/Make/options +++ b/src/postProcessing/functionObjects/field/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ diff --git a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C index e633d9e72b..ca7c997662 100644 --- a/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C +++ b/src/postProcessing/functionObjects/field/fieldValues/faceSource/faceSourceTemplates.C @@ -83,7 +83,7 @@ Foam::tmp> Foam::fieldValues::faceSource::getFieldValues ( new Field(faces.size(), pTraits::zero) ); - Field& avg = tavg(); + Field& avg = tavg.ref(); forAll(faces, faceI) { @@ -355,7 +355,7 @@ Foam::tmp> Foam::fieldValues::faceSource::filterField ) const { tmp> tvalues(new Field(faceId_.size())); - Field& values = tvalues(); + Field& values = tvalues.ref(); forAll(values, i) { @@ -396,7 +396,7 @@ Foam::tmp> Foam::fieldValues::faceSource::filterField ) const { tmp> tvalues(new Field(faceId_.size())); - Field& values = tvalues(); + Field& values = tvalues.ref(); forAll(values, i) { diff --git a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C index 6d02c13969..8e6698b326 100644 --- a/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C +++ b/src/postProcessing/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C @@ -216,7 +216,7 @@ Foam::tmp Foam::regionSizeDistribution::divide ) { tmp tresult(new scalarField(num.size())); - scalarField& result = tresult(); + scalarField& result = tresult.ref(); forAll(denom, i) { diff --git a/src/postProcessing/functionObjects/utilities/Make/options b/src/postProcessing/functionObjects/utilities/Make/options index ad4e27c196..f50a857be2 100644 --- a/src/postProcessing/functionObjects/utilities/Make/options +++ b/src/postProcessing/functionObjects/utilities/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/lagrangian/DSMC/lnInclude \ -I$(LIB_SRC)/transportModels \ diff --git a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C index 1d9013d96e..3dd1877a87 100644 --- a/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C +++ b/src/postProcessing/functionObjects/utilities/pressureTools/pressureTools.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -148,7 +148,7 @@ Foam::tmp Foam::pressureTools::pDyn { const volVectorField& U = obr_.lookupObject(UName_); - tpDyn() == rho(p)*0.5*magSqr(U); + tpDyn.ref() == rho(p)*0.5*magSqr(U); } return tpDyn; @@ -164,13 +164,13 @@ Foam::tmp Foam::pressureTools::convertToCoeff if (calcCoeff_) { - tCoeff() -= dimensionedScalar("pInf", dimPressure, pInf_); + tCoeff.ref() -= dimensionedScalar("pInf", dimPressure, pInf_); const dimensionedScalar p0("p0", dimPressure, SMALL); const dimensionedVector U("U", dimVelocity, UInf_); const dimensionedScalar rho("rho", dimDensity, rhoInf_); - tCoeff() /= 0.5*rho*magSqr(U) + p0; + tCoeff.ref() /= 0.5*rho*magSqr(U) + p0; } return tCoeff; diff --git a/src/randomProcesses/Make/options b/src/randomProcesses/Make/options index 71b7873964..287318da1f 100644 --- a/src/randomProcesses/Make/options +++ b/src/randomProcesses/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ diff --git a/src/randomProcesses/fft/fft.C b/src/randomProcesses/fft/fft.C index fdc5e856ed..f859b37f52 100644 --- a/src/randomProcesses/fft/fft.C +++ b/src/randomProcesses/fft/fft.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -191,7 +191,7 @@ tmp fft::forwardTransform { tmp tfftField(new complexField(tfield)); - transform(tfftField(), nn, FORWARD_TRANSFORM); + transform(tfftField.ref(), nn, FORWARD_TRANSFORM); tfield.clear(); @@ -207,7 +207,7 @@ tmp fft::reverseTransform { tmp tifftField(new complexField(tfield)); - transform(tifftField(), nn, REVERSE_TRANSFORM); + transform(tifftField.ref(), nn, REVERSE_TRANSFORM); tfield.clear(); @@ -231,7 +231,7 @@ tmp fft::forwardTransform for (direction cmpt=0; cmpt fft::reverseTransform for (direction cmpt=0; cmpt Foam::noiseFFT::window } tmp tpw(new scalarField(N)); - scalarField& pw = tpw(); + scalarField& pw = tpw.ref(); label offset = ni*windowOffset; @@ -193,7 +193,7 @@ Foam::tmp Foam::noiseFFT::Pf scalarField::subField(tPn2(), tPn2().size()/2) ) ); - scalarField& Pn = tPn(); + scalarField& Pn = tPn.ref(); Pn *= 2.0/sqrt(scalar(tPn2().size())); Pn[0] /= 2.0; diff --git a/src/regionCoupled/Make/options b/src/regionCoupled/Make/options index a9753c5115..21a2486c48 100644 --- a/src/regionCoupled/Make/options +++ b/src/regionCoupled/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \ diff --git a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C index 697405daf7..004fecb0e2 100644 --- a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C +++ b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C @@ -190,7 +190,7 @@ weights() const const scalarField nbrAlphaDelta(nbrAlpha/nbrDeltas); tmp tw(new scalarField(deltas.size())); - scalarField& w = tw(); + scalarField& w = tw.ref(); forAll(alphaDelta, faceI) { diff --git a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C index 501f4aa64c..ec261e277e 100644 --- a/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C +++ b/src/regionModels/pyrolysisModels/reactingOneDim/reactingOneDim.C @@ -196,7 +196,6 @@ void reactingOneDim::updatePhiGas() } } } - tHsiGas().clear(); } } diff --git a/src/regionModels/regionModel/Make/options b/src/regionModels/regionModel/Make/options index a3ae8da833..bcd627471b 100644 --- a/src/regionModels/regionModel/Make/options +++ b/src/regionModels/regionModel/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude diff --git a/src/regionModels/regionModel/regionModel1D/regionModel1D.C b/src/regionModels/regionModel/regionModel1D/regionModel1D.C index 63e8145c5f..ba750c9f76 100644 --- a/src/regionModels/regionModel/regionModel1D/regionModel1D.C +++ b/src/regionModels/regionModel/regionModel1D/regionModel1D.C @@ -183,7 +183,7 @@ Foam::tmp Foam::regionModels::regionModel1D::moveMesh ) { tmp tcellMoveMap(new labelField(regionMesh().nCells(), 0)); - labelField& cellMoveMap = tcellMoveMap(); + labelField& cellMoveMap = tcellMoveMap.ref(); if (!moveMesh_) { diff --git a/src/regionModels/surfaceFilmModels/Make/options b/src/regionModels/surfaceFilmModels/Make/options index a0eb4828ea..0cd68b47e8 100644 --- a/src/regionModels/surfaceFilmModels/Make/options +++ b/src/regionModels/surfaceFilmModels/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C index 2b6727b91f..72b853d0de 100644 --- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C +++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,7 +49,7 @@ tmp nutkFilmWallFunctionFvPatchScalarField::calcUTau ) const { tmp tuTau(new scalarField(patch().size(), 0.0)); - scalarField& uTau = tuTau(); + scalarField& uTau = tuTau.ref(); typedef regionModels::surfaceFilmModels::surfaceFilmModel modelType; diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C index e87619f67f..529b95f964 100644 --- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C +++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayer.C @@ -299,13 +299,13 @@ tmp kinematicSingleLayer::solveMomentum + fvm::div(phi_, U_) == - USp_ -// - fvm::SuSp(rhoSp_, U_) + // - fvm::SuSp(rhoSp_, U_) - rhoSp_*U_ + forces_.correct(U_) + turbulence_->Su(U_) ); - fvVectorMatrix& UEqn = tUEqn(); + fvVectorMatrix& UEqn = tUEqn.ref(); UEqn.relax(); diff --git a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H index 3c0bd597f2..e7647ec9e0 100644 --- a/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H +++ b/src/regionModels/surfaceFilmModels/kinematicSingleLayer/kinematicSingleLayerI.H @@ -249,7 +249,7 @@ inline tmp kinematicSingleLayer::gNormClipped() const ) ); - volScalarField& gNormClipped = tgNormClipped(); + volScalarField& gNormClipped = tgNormClipped.ref(); gNormClipped.min(0.0); return tgNormClipped; diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C index cc53371852..3e7602868b 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/constantFilmThermo/constantFilmThermo.C @@ -275,8 +275,8 @@ tmp constantFilmThermo::rho() const ) ); - trho().internalField() = this->rho(0, 0); - trho().correctBoundaryConditions(); + trho.ref().internalField() = this->rho(0, 0); + trho.ref().correctBoundaryConditions(); return trho; } @@ -302,8 +302,8 @@ tmp constantFilmThermo::mu() const ) ); - tmu().internalField() = this->mu(0, 0); - tmu().correctBoundaryConditions(); + tmu.ref().internalField() = this->mu(0, 0); + tmu.ref().correctBoundaryConditions(); return tmu; } @@ -329,8 +329,8 @@ tmp constantFilmThermo::sigma() const ) ); - tsigma().internalField() = this->sigma(0, 0); - tsigma().correctBoundaryConditions(); + tsigma.ref().internalField() = this->sigma(0, 0); + tsigma.ref().correctBoundaryConditions(); return tsigma; } @@ -356,8 +356,8 @@ tmp constantFilmThermo::Cp() const ) ); - tCp().internalField() = this->Cp(0, 0); - tCp().correctBoundaryConditions(); + tCp.ref().internalField() = this->Cp(0, 0); + tCp.ref().correctBoundaryConditions(); return tCp; } @@ -383,8 +383,8 @@ tmp constantFilmThermo::kappa() const ) ); - tkappa().internalField() = this->kappa(0, 0); - tkappa().correctBoundaryConditions(); + tkappa.ref().internalField() = this->kappa(0, 0); + tkappa.ref().correctBoundaryConditions(); return tkappa; } diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C index 59b5713617..13f6937b2a 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C @@ -255,7 +255,7 @@ tmp liquidFilmThermo::rho() const ) ); - scalarField& rho = trho().internalField(); + scalarField& rho = trho.ref().internalField(); if (useReferenceValues_) { @@ -277,7 +277,7 @@ tmp liquidFilmThermo::rho() const } } - trho().correctBoundaryConditions(); + trho.ref().correctBoundaryConditions(); return trho; } @@ -303,7 +303,7 @@ tmp liquidFilmThermo::mu() const ) ); - scalarField& mu = tmu().internalField(); + scalarField& mu = tmu.ref().internalField(); if (useReferenceValues_) { @@ -325,7 +325,7 @@ tmp liquidFilmThermo::mu() const } } - tmu().correctBoundaryConditions(); + tmu.ref().correctBoundaryConditions(); return tmu; } @@ -351,7 +351,7 @@ tmp liquidFilmThermo::sigma() const ) ); - scalarField& sigma = tsigma().internalField(); + scalarField& sigma = tsigma.ref().internalField(); if (useReferenceValues_) { @@ -373,7 +373,7 @@ tmp liquidFilmThermo::sigma() const } } - tsigma().correctBoundaryConditions(); + tsigma.ref().correctBoundaryConditions(); return tsigma; } @@ -399,7 +399,7 @@ tmp liquidFilmThermo::Cp() const ) ); - scalarField& Cp = tCp().internalField(); + scalarField& Cp = tCp.ref().internalField(); if (useReferenceValues_) { @@ -421,7 +421,7 @@ tmp liquidFilmThermo::Cp() const } } - tCp().correctBoundaryConditions(); + tCp.ref().correctBoundaryConditions(); return tCp; } @@ -447,7 +447,7 @@ tmp liquidFilmThermo::kappa() const ) ); - scalarField& kappa = tkappa().internalField(); + scalarField& kappa = tkappa.ref().internalField(); if (useReferenceValues_) { @@ -469,7 +469,7 @@ tmp liquidFilmThermo::kappa() const } } - tkappa().correctBoundaryConditions(); + tkappa.ref().correctBoundaryConditions(); return tkappa; } diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C index df7ccf0845..4a1c6383e8 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmTurbulenceModel/laminar/laminar.C @@ -89,8 +89,8 @@ tmp laminar::Us() const ); // apply quadratic profile - tUs() = Foam::sqrt(2.0)*owner_.U(); - tUs().correctBoundaryConditions(); + tUs.ref() = Foam::sqrt(2.0)*owner_.U(); + tUs.ref().correctBoundaryConditions(); return tUs; } diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C index 756b1d8cc4..c8d111579e 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForce/contactAngleForce.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -153,7 +153,7 @@ tmp contactAngleForce::correct(volVectorField& U) ) ); - vectorField& force = tForce().internalField(); + vectorField& force = tForce.ref().internalField(); const labelUList& own = owner_.regionMesh().owner(); const labelUList& nbr = owner_.regionMesh().neighbour(); @@ -229,7 +229,7 @@ tmp contactAngleForce::correct(volVectorField& U) tmp tfvm(new fvVectorMatrix(U, dimForce/dimArea*dimVolume)); - tfvm() += tForce; + tfvm.ref() += tForce; return tfvm; } diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C index a6b54fe235..56a1454c46 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/forceList/forceList.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -81,7 +81,7 @@ tmp forceList::correct(volVectorField& U) ( new fvVectorMatrix(U, dimForce/dimArea*dimVolume) ); - fvVectorMatrix& result = tResult(); + fvVectorMatrix& result = tResult.ref(); forAll(*this, i) { diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C index 0d681da008..19614cbcf9 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/thermocapillaryForce/thermocapillaryForce.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -68,7 +68,7 @@ tmp thermocapillaryForce::correct(volVectorField& U) tmp tfvm(new fvVectorMatrix(U, dimForce/dimArea*dimVolume)); - tfvm() += fvc::grad(sigma); + tfvm.ref() += fvc::grad(sigma); return tfvm; } diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C index 2709cd08a5..72ec8a44ba 100644 --- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C +++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/curvatureSeparation/curvatureSeparation.C @@ -78,7 +78,7 @@ tmp curvatureSeparation::calcInvR1 ); - scalarField& invR1 = tinvR1().internalField(); + scalarField& invR1 = tinvR1.ref().internalField(); // apply defined patch radii const scalar rMin = 1e-6; diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C index 4f5c60f145..489b453cb9 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/constantRadiation/constantRadiation.C @@ -124,7 +124,7 @@ tmp constantRadiation::Shs() if ((time >= timeStart_) && (time <= timeStart_ + duration_)) { - scalarField& Shs = tShs(); + scalarField& Shs = tShs.ref(); const scalarField& Qr = QrConst_.internalField(); const scalarField& alpha = owner_.alpha().internalField(); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C index b653ee4638..a6350c3ac1 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/primaryRadiation/primaryRadiation.C @@ -107,7 +107,7 @@ tmp primaryRadiation::Shs() ) ); - scalarField& Shs = tShs(); + scalarField& Shs = tShs.ref(); const scalarField& QinP = QinPrimary_.internalField(); const scalarField& alpha = owner_.alpha().internalField(); diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C index 3505f9c8a0..2d6e8b77b8 100644 --- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C +++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmRadiationModel/standardRadiation/standardRadiation.C @@ -124,7 +124,7 @@ tmp standardRadiation::Shs() ) ); - scalarField& Shs = tShs(); + scalarField& Shs = tShs.ref(); const scalarField& QinP = QinPrimary_.internalField(); const scalarField& delta = owner_.delta().internalField(); const scalarField& alpha = owner_.alpha().internalField(); diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C index f29d5d64ed..c4fc973d23 100644 --- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C +++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayer.C @@ -751,7 +751,7 @@ tmp> thermoSingleLayer::Srho() const ) ); - scalarField& Srho = tSrho(); + scalarField& Srho = tSrho.ref(); const scalarField& V = primaryMesh().V(); const scalar dt = time_.deltaTValue(); @@ -805,7 +805,7 @@ tmp> thermoSingleLayer::Srho if (vapId == i) { - scalarField& Srho = tSrho(); + scalarField& Srho = tSrho.ref(); const scalarField& V = primaryMesh().V(); const scalar dt = time().deltaTValue(); @@ -855,7 +855,7 @@ tmp> thermoSingleLayer::Sh() const /* phase change energy fed back into the film... - scalarField& Sh = tSh(); + scalarField& Sh = tSh.ref(); const scalarField& V = primaryMesh().V(); const scalar dt = time_.deltaTValue(); diff --git a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H index 223254c38e..22bd215deb 100644 --- a/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H +++ b/src/regionModels/surfaceFilmModels/thermoSingleLayer/thermoSingleLayerI.H @@ -100,8 +100,8 @@ inline tmp thermoSingleLayer::T ) ); - tT().min(Tmax_); - tT().max(Tmin_); + tT.ref().min(Tmax_); + tT.ref().max(Tmin_); return tT; } diff --git a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C index 360bdfeb1f..1490e558b1 100644 --- a/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C +++ b/src/regionModels/thermalBaffleModels/thermalBaffle/thermalBaffle.C @@ -91,7 +91,7 @@ void thermalBaffle::solveEnergy() ) ); - volScalarField& Q = tQ(); + volScalarField& Q = tQ.ref(); volScalarField rho("rho", thermo_->rho()); volScalarField alpha("alpha", thermo_->alpha()); diff --git a/src/sampling/Make/options b/src/sampling/Make/options index 23e6bc81a7..15ca6b932f 100644 --- a/src/sampling/Make/options +++ b/src/sampling/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/surfMesh/lnInclude \ diff --git a/src/sampling/meshToMesh/meshToMeshTemplates.C b/src/sampling/meshToMesh/meshToMeshTemplates.C index 24d01d89a3..958b932be5 100644 --- a/src/sampling/meshToMesh/meshToMeshTemplates.C +++ b/src/sampling/meshToMesh/meshToMeshTemplates.C @@ -161,7 +161,7 @@ Foam::tmp> Foam::meshToMesh::mapSrcToTgt ) ); - mapSrcToTgt(srcField, cop, tresult()); + mapSrcToTgt(srcField, cop, tresult.ref()); return tresult; } @@ -280,7 +280,7 @@ Foam::tmp> Foam::meshToMesh::mapTgtToSrc ) ); - mapTgtToSrc(tgtField, cop, tresult()); + mapTgtToSrc(tgtField, cop, tresult.ref()); return tresult; } @@ -466,7 +466,7 @@ Foam::meshToMesh::mapSrcToTgt ) ); - mapSrcToTgt(field, cop, tresult()); + mapSrcToTgt(field, cop, tresult.ref()); return tresult; } @@ -655,7 +655,7 @@ Foam::meshToMesh::mapTgtToSrc ) ); - mapTgtToSrc(field, cop, tresult()); + mapTgtToSrc(field, cop, tresult.ref()); return tresult; } diff --git a/src/sampling/probes/patchProbesTemplates.C b/src/sampling/probes/patchProbesTemplates.C index 325ff16a0e..59dfd0f50a 100644 --- a/src/sampling/probes/patchProbesTemplates.C +++ b/src/sampling/probes/patchProbesTemplates.C @@ -202,7 +202,7 @@ Foam::patchProbes::sample new Field(this->size(), unsetVal) ); - Field& values = tValues(); + Field& values = tValues.ref(); const polyBoundaryMesh& patches = mesh_.boundaryMesh(); @@ -253,7 +253,7 @@ Foam::patchProbes::sample new Field(this->size(), unsetVal) ); - Field& values = tValues(); + Field& values = tValues.ref(); const polyBoundaryMesh& patches = mesh_.boundaryMesh(); diff --git a/src/sampling/probes/probesTemplates.C b/src/sampling/probes/probesTemplates.C index f035d5fe03..37d0bd98d5 100644 --- a/src/sampling/probes/probesTemplates.C +++ b/src/sampling/probes/probesTemplates.C @@ -225,7 +225,7 @@ Foam::probes::sample new Field(this->size(), unsetVal) ); - Field& values = tValues(); + Field& values = tValues.ref(); if (fixedLocations_) { @@ -295,7 +295,7 @@ Foam::probes::sample new Field(this->size(), unsetVal) ); - Field& values = tValues(); + Field& values = tValues.ref(); forAll(*this, probeI) { diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C index ac27677924..1eba2063c4 100644 --- a/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C +++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceCellTemplates.C @@ -596,7 +596,7 @@ Foam::isoSurfaceCell::interpolate // One value per point tmp> tvalues(new Field(points().size())); - Field& values = tvalues(); + Field& values = tvalues.ref(); forAll(triPoints, i) { diff --git a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C index 58950e006b..ea92b65ef7 100644 --- a/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C +++ b/src/sampling/sampledSurface/isoSurface/isoSurfaceTemplates.C @@ -70,7 +70,7 @@ Foam::isoSurface::adaptPatchFields true // preserveCouples ) ); - FieldType& sliceFld = tsliceFld(); + FieldType& sliceFld = tsliceFld.ref(); const fvMesh& mesh = fld.mesh(); @@ -737,7 +737,7 @@ Foam::isoSurface::interpolate ( new Field(points().size(), pTraits::zero) ); - Field& values = tvalues(); + Field& values = tvalues.ref(); labelList nValues(values.size(), 0); forAll(triPoints, i) diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C index a80bd81a3b..72bcbbf701 100644 --- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C +++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCellTemplates.C @@ -57,7 +57,7 @@ Foam::sampledIsoSurfaceCell::interpolateField // One value per point tmp> tvalues(new Field(points().size())); - Field& values = tvalues(); + Field& values = tvalues.ref(); boolList pointDone(points().size(), false); diff --git a/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C b/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C index dc7f0cbb6e..58bd02fcb0 100644 --- a/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C +++ b/src/sampling/sampledSurface/sampledPatch/sampledPatchTemplates.C @@ -36,7 +36,7 @@ Foam::sampledPatch::sampleField { // One value per face tmp> tvalues(new Field(patchFaceLabels_.size())); - Field& values = tvalues(); + Field& values = tvalues.ref(); forAll(patchFaceLabels_, i) { label patchI = patchIDs_[patchIndex_[i]]; @@ -57,7 +57,7 @@ Foam::sampledPatch::sampleField { // One value per face tmp> tvalues(new Field(patchFaceLabels_.size())); - Field& values = tvalues(); + Field& values = tvalues.ref(); forAll(patchFaceLabels_, i) { @@ -78,7 +78,7 @@ Foam::sampledPatch::interpolateField { // One value per vertex tmp> tvalues(new Field(points().size())); - Field& values = tvalues(); + Field& values = tvalues.ref(); const labelList& own = mesh().faceOwner(); diff --git a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C index 56852b4ec2..be2348729f 100644 --- a/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C +++ b/src/sampling/sampledSurface/sampledPatchInternalField/sampledPatchInternalFieldTemplates.C @@ -38,7 +38,7 @@ Foam::sampledPatchInternalField::sampleField { // One value per face tmp> tvalues(new Field(patchFaceLabels().size())); - Field& values = tvalues(); + Field& values = tvalues.ref(); forAll(patchStart(), i) { diff --git a/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C b/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C index 52e830d75f..60e6b5a489 100644 --- a/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C +++ b/src/sampling/sampledSurface/sampledPlane/sampledPlaneTemplates.C @@ -47,7 +47,7 @@ Foam::sampledPlane::interpolateField { // One value per point tmp> tvalues(new Field(points().size())); - Field& values = tvalues(); + Field& values = tvalues.ref(); boolList pointDone(points().size(), false); diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C index 59a34de598..38c478edc0 100644 --- a/src/sampling/sampledSurface/sampledSurface/sampledSurface.C +++ b/src/sampling/sampledSurface/sampledSurface/sampledSurface.C @@ -291,7 +291,7 @@ Foam::tmp> Foam::sampledSurface::project(const Field& field) const { tmp> tRes(new Field(faces().size())); - Field& res = tRes(); + Field& res = tRes.ref(); forAll(faces(), faceI) { @@ -306,7 +306,7 @@ Foam::tmp> Foam::sampledSurface::project(const Field& field) const { tmp> tRes(new Field(faces().size())); - project(tRes(), field); + project(tRes.ref(), field); return tRes; } @@ -315,7 +315,7 @@ Foam::tmp> Foam::sampledSurface::project(const Field& field) const { tmp> tRes(new Field(faces().size())); - project(tRes(), field); + project(tRes.ref(), field); return tRes; } @@ -324,7 +324,7 @@ Foam::tmp> Foam::sampledSurface::project(const Field& field) const { tmp> tRes(new Field(faces().size())); - project(tRes(), field); + project(tRes.ref(), field); return tRes; } @@ -333,7 +333,7 @@ Foam::tmp> Foam::sampledSurface::project(const Field& field) const { tmp> tRes(new Field(faces().size())); - project(tRes(), field); + project(tRes.ref(), field); return tRes; } diff --git a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C index d361cdd029..dcf176b56a 100644 --- a/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C +++ b/src/sampling/sampledSurface/sampledSurface/sampledSurfaceTemplates.C @@ -177,7 +177,7 @@ Foam::sampledSurface::pointAverage dimensioned("zero", dimless, pTraits::zero) ) ); - GeometricField& cellAvg = tcellAvg(); + GeometricField& cellAvg = tcellAvg.ref(); labelField nPointCells(mesh.nCells(), 0); { diff --git a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C index 40190c9ae3..c286dde965 100644 --- a/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C +++ b/src/sampling/sampledSurface/sampledTriSurfaceMesh/sampledTriSurfaceMeshTemplates.C @@ -36,7 +36,7 @@ Foam::sampledTriSurfaceMesh::sampleField { // One value per face tmp> tvalues(new Field(sampleElements_.size())); - Field& values = tvalues(); + Field& values = tvalues.ref(); if (sampleSource_ == cells || sampleSource_ == insideCells) { @@ -92,7 +92,7 @@ Foam::sampledTriSurfaceMesh::interpolateField { // One value per vertex tmp> tvalues(new Field(sampleElements_.size())); - Field& values = tvalues(); + Field& values = tvalues.ref(); if (sampleSource_ == cells || sampleSource_ == insideCells) { diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C index d78da36837..03c2fffb4a 100644 --- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C +++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFacesTemplates.C @@ -58,7 +58,7 @@ Foam::sampledThresholdCellFaces::interpolateField // One value per point tmp> tvalues(new Field(points().size())); - Field& values = tvalues(); + Field& values = tvalues.ref(); boolList pointDone(points().size(), false); diff --git a/src/sixDoFRigidBodyMotion/Make/options b/src/sixDoFRigidBodyMotion/Make/options index f2367d2e1d..fd1f401690 100644 --- a/src/sixDoFRigidBodyMotion/Make/options +++ b/src/sixDoFRigidBodyMotion/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/postProcessing/functionObjects/forces/lnInclude \ diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C index e7a8b92d33..c3a94123d1 100644 --- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C +++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -356,7 +356,7 @@ Foam::tmp Foam::sixDoFRigidBodyMotion::transform ); tmp tpoints(new pointField(initialPoints)); - pointField& points = tpoints(); + pointField& points = tpoints.ref(); forAll(points, pointi) { diff --git a/src/surfMesh/Make/options b/src/surfMesh/Make/options index 7e207d0dbe..079607db05 100644 --- a/src/surfMesh/Make/options +++ b/src/surfMesh/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/fileFormats/lnInclude LIB_LIBS = \ diff --git a/src/thermophysicalModels/SLGThermo/Make/options b/src/thermophysicalModels/SLGThermo/Make/options index c4f0b2a8a9..3dac244d79 100644 --- a/src/thermophysicalModels/SLGThermo/Make/options +++ b/src/thermophysicalModels/SLGThermo/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/Make/options b/src/thermophysicalModels/barotropicCompressibilityModel/Make/options index 71b7873964..287318da1f 100644 --- a/src/thermophysicalModels/barotropicCompressibilityModel/Make/options +++ b/src/thermophysicalModels/barotropicCompressibilityModel/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ diff --git a/src/thermophysicalModels/basic/Make/options b/src/thermophysicalModels/basic/Make/options index b5c859baf1..95f178b455 100644 --- a/src/thermophysicalModels/basic/Make/options +++ b/src/thermophysicalModels/basic/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/src/thermophysicalModels/basic/heThermo/heThermo.C b/src/thermophysicalModels/basic/heThermo/heThermo.C index 0cc1354ffa..1db5c4ac7c 100644 --- a/src/thermophysicalModels/basic/heThermo/heThermo.C +++ b/src/thermophysicalModels/basic/heThermo/heThermo.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -184,7 +184,7 @@ Foam::tmp Foam::heThermo::he ) ); - volScalarField& he = the(); + volScalarField& he = the.ref(); scalarField& heCells = he.internalField(); const scalarField& pCells = p.internalField(); const scalarField& TCells = T.internalField(); @@ -221,7 +221,7 @@ Foam::tmp Foam::heThermo::he ) const { tmp the(new scalarField(T.size())); - scalarField& he = the(); + scalarField& he = the.ref(); forAll(T, celli) { @@ -241,7 +241,7 @@ Foam::tmp Foam::heThermo::he ) const { tmp the(new scalarField(T.size())); - scalarField& he = the(); + scalarField& he = the.ref(); forAll(T, facei) { @@ -277,7 +277,7 @@ Foam::heThermo::hc() const ) ); - volScalarField& hcf = thc(); + volScalarField& hcf = thc.ref(); scalarField& hcCells = hcf.internalField(); forAll(hcCells, celli) @@ -308,7 +308,7 @@ Foam::tmp Foam::heThermo::Cp ) const { tmp tCp(new scalarField(T.size())); - scalarField& cp = tCp(); + scalarField& cp = tCp.ref(); forAll(T, facei) { @@ -344,7 +344,7 @@ Foam::heThermo::Cp() const ) ); - volScalarField& cp = tCp(); + volScalarField& cp = tCp.ref(); forAll(this->T_, celli) { @@ -379,7 +379,7 @@ Foam::heThermo::Cv ) const { tmp tCv(new scalarField(T.size())); - scalarField& cv = tCv(); + scalarField& cv = tCv.ref(); forAll(T, facei) { @@ -415,7 +415,7 @@ Foam::heThermo::Cv() const ) ); - volScalarField& cv = tCv(); + volScalarField& cv = tCv.ref(); forAll(this->T_, celli) { @@ -446,7 +446,7 @@ Foam::tmp Foam::heThermo::gamma ) const { tmp tgamma(new scalarField(T.size())); - scalarField& cpv = tgamma(); + scalarField& cpv = tgamma.ref(); forAll(T, facei) { @@ -482,7 +482,7 @@ Foam::heThermo::gamma() const ) ); - volScalarField& cpv = tgamma(); + volScalarField& cpv = tgamma.ref(); forAll(this->T_, celli) { @@ -519,7 +519,7 @@ Foam::tmp Foam::heThermo::Cpv ) const { tmp tCpv(new scalarField(T.size())); - scalarField& cpv = tCpv(); + scalarField& cpv = tCpv.ref(); forAll(T, facei) { @@ -555,7 +555,7 @@ Foam::heThermo::Cpv() const ) ); - volScalarField& cpv = tCpv(); + volScalarField& cpv = tCpv.ref(); forAll(this->T_, celli) { @@ -589,7 +589,7 @@ Foam::tmp Foam::heThermo::CpByCpv ) const { tmp tCpByCpv(new scalarField(T.size())); - scalarField& cpByCpv = tCpByCpv(); + scalarField& cpByCpv = tCpByCpv.ref(); forAll(T, facei) { @@ -625,7 +625,7 @@ Foam::heThermo::CpByCpv() const ) ); - volScalarField& cpByCpv = tCpByCpv(); + volScalarField& cpByCpv = tCpByCpv.ref(); forAll(this->T_, celli) { @@ -666,7 +666,7 @@ Foam::tmp Foam::heThermo::THE ) const { tmp tT(new scalarField(h.size())); - scalarField& T = tT(); + scalarField& T = tT.ref(); forAll(h, celli) { @@ -689,7 +689,7 @@ Foam::tmp Foam::heThermo::THE { tmp tT(new scalarField(h.size())); - scalarField& T = tT(); + scalarField& T = tT.ref(); forAll(h, facei) { T[facei] = this->patchFaceMixture @@ -708,7 +708,7 @@ Foam::tmp Foam::heThermo::kappa() const { tmp kappa(Cp()*this->alpha_); - kappa().rename("kappa"); + kappa.ref().rename("kappa"); return kappa; } @@ -737,7 +737,7 @@ Foam::heThermo::kappaEff ) const { tmp kappaEff(Cp()*(this->alpha_ + alphat)); - kappaEff().rename("kappaEff"); + kappaEff.ref().rename("kappaEff"); return kappaEff; } @@ -772,7 +772,7 @@ Foam::heThermo::alphaEff ) const { tmp alphaEff(this->CpByCpv()*(this->alpha_ + alphat)); - alphaEff().rename("alphaEff"); + alphaEff.ref().rename("alphaEff"); return alphaEff; } diff --git a/src/thermophysicalModels/chemistryModel/Make/options b/src/thermophysicalModels/chemistryModel/Make/options index de52d7e6ae..7a1e7f43d2 100644 --- a/src/thermophysicalModels/chemistryModel/Make/options +++ b/src/thermophysicalModels/chemistryModel/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C index ee7a8974d6..7c2d9beac2 100644 --- a/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C +++ b/src/thermophysicalModels/chemistryModel/chemistryModel/chemistryModel/chemistryModel.C @@ -104,7 +104,7 @@ Foam::chemistryModel::omega label lRef, rRef; tmp tom(new scalarField(nEqns(), 0.0)); - scalarField& om = tom(); + scalarField& om = tom.ref(); forAll(reactions_, i) { @@ -500,7 +500,7 @@ Foam::chemistryModel::tc() const ) ); - scalarField& tc = ttc(); + scalarField& tc = ttc.ref(); const scalarField& T = this->thermo().T(); const scalarField& p = this->thermo().p(); @@ -540,7 +540,7 @@ Foam::chemistryModel::tc() const } - ttc().correctBoundaryConditions(); + ttc.ref().correctBoundaryConditions(); return ttc; } @@ -570,7 +570,7 @@ Foam::chemistryModel::Sh() const if (this->chemistry_) { - scalarField& Sh = tSh(); + scalarField& Sh = tSh.ref(); forAll(Y_, i) { @@ -610,7 +610,7 @@ Foam::chemistryModel::dQ() const if (this->chemistry_) { - volScalarField& dQ = tdQ(); + volScalarField& dQ = tdQ.ref(); dQ.dimensionedInternalField() = this->mesh_.V()*Sh()(); } @@ -668,7 +668,7 @@ Foam::chemistryModel::calculateRR ) ); - DimensionedField& RR = tRR(); + DimensionedField& RR = tRR.ref(); const scalarField& T = this->thermo().T(); const scalarField& p = this->thermo().p(); diff --git a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C index a1563921c2..8ed9f35853 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C +++ b/src/thermophysicalModels/laminarFlameSpeed/Gulders/Gulders.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -128,7 +128,7 @@ Foam::tmp Foam::laminarFlameSpeedModels::Gulders::Su0pTphi ) ); - volScalarField& Su0 = tSu0(); + volScalarField& Su0 = tSu0.ref(); forAll(Su0, celli) { @@ -179,7 +179,7 @@ Foam::tmp Foam::laminarFlameSpeedModels::Gulders::Su0pTphi ) ); - volScalarField& Su0 = tSu0(); + volScalarField& Su0 = tSu0.ref(); forAll(Su0, celli) { diff --git a/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C b/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C index 173e3d8841..74e62e7114 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C +++ b/src/thermophysicalModels/laminarFlameSpeed/GuldersEGR/GuldersEGR.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -128,7 +128,7 @@ Foam::laminarFlameSpeedModels::GuldersEGR::Su0pTphi ) ); - volScalarField& Su0 = tSu0(); + volScalarField& Su0 = tSu0.ref(); forAll(Su0, celli) { @@ -181,7 +181,7 @@ Foam::laminarFlameSpeedModels::GuldersEGR::Su0pTphi ) ); - volScalarField& Su0 = tSu0(); + volScalarField& Su0 = tSu0.ref(); forAll(Su0, celli) { diff --git a/src/thermophysicalModels/laminarFlameSpeed/Make/options b/src/thermophysicalModels/laminarFlameSpeed/Make/options index f97edb8458..925d4a58aa 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/Make/options +++ b/src/thermophysicalModels/laminarFlameSpeed/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ diff --git a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C index e57be1b68f..c3eaf9c0e9 100644 --- a/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C +++ b/src/thermophysicalModels/laminarFlameSpeed/RaviPetersen/RaviPetersen.C @@ -343,7 +343,7 @@ Foam::laminarFlameSpeedModels::RaviPetersen::operator()() const ) ); - volScalarField& Su0 = tSu0(); + volScalarField& Su0 = tSu0.ref(); forAll(Su0, cellI) { diff --git a/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options b/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options index 138f439935..690761730f 100644 --- a/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options +++ b/src/thermophysicalModels/properties/liquidMixtureProperties/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/properties/liquidProperties/lnInclude \ @@ -8,4 +8,3 @@ EXE_INC = \ LIB_LIBS = \ -lliquidProperties \ -lthermophysicalFunctions - diff --git a/src/thermophysicalModels/properties/liquidProperties/Make/options b/src/thermophysicalModels/properties/liquidProperties/Make/options index b964b61294..e1fbd3ed45 100644 --- a/src/thermophysicalModels/properties/liquidProperties/Make/options +++ b/src/thermophysicalModels/properties/liquidProperties/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude LIB_LIBS = \ diff --git a/src/thermophysicalModels/properties/solidMixtureProperties/Make/options b/src/thermophysicalModels/properties/solidMixtureProperties/Make/options index f2d8f809d5..97cc509212 100644 --- a/src/thermophysicalModels/properties/solidMixtureProperties/Make/options +++ b/src/thermophysicalModels/properties/solidMixtureProperties/Make/options @@ -1,3 +1,3 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I${LIB_SRC}/thermophysicalModels/properties/solidProperties/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude diff --git a/src/thermophysicalModels/properties/solidProperties/Make/options b/src/thermophysicalModels/properties/solidProperties/Make/options index 848cce789f..f8779f538f 100644 --- a/src/thermophysicalModels/properties/solidProperties/Make/options +++ b/src/thermophysicalModels/properties/solidProperties/Make/options @@ -1,2 +1,2 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude diff --git a/src/thermophysicalModels/radiation/Make/options b/src/thermophysicalModels/radiation/Make/options index 726b76e764..ea189b0b63 100644 --- a/src/thermophysicalModels/radiation/Make/options +++ b/src/thermophysicalModels/radiation/Make/options @@ -1,4 +1,4 @@ -EXE_INC = \ +EXE_INC = -DCONST_TMP \ -I$(LIB_SRC)/transportModels/compressible/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C index 4b07238462..b2fdb85d16 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/blackBodyEmission/blackBodyEmission.C @@ -227,18 +227,15 @@ Foam::radiation::blackBodyEmission::EbDeltaLambdaT } else { + scalarField& Ebif = Eb.ref(); + forAll(T, i) { scalar T1 = fLambdaT(band[1]*T[i]); scalar T2 = fLambdaT(band[0]*T[i]); - dimensionedScalar fLambdaDelta - ( - "fLambdaDelta", - dimless, - T1 - T2 - ); - Eb()[i] = Eb()[i]*fLambdaDelta.value(); + Ebif[i] *= T1 - T2; } + return Eb; } } diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C index c27520f4e5..92f0ae3084 100644 --- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C +++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/radiativeIntensityRay/radiativeIntensityRay.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -253,11 +253,11 @@ Foam::scalar Foam::radiation::radiativeIntensityRay::correct() ); } - IiEq().relax(); + IiEq.ref().relax(); const solverPerformance ILambdaSol = solve ( - IiEq(), + IiEq.ref(), mesh_.solver("Ii") ); diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C index 208425212f..5d7e9070ef 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C @@ -213,7 +213,7 @@ Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const ) ); - scalarField& a = ta().internalField(); + scalarField& a = ta.ref().internalField(); forAll(a, cellI) { @@ -261,7 +261,7 @@ Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const ); } } - ta().correctBoundaryConditions(); + ta.ref().correctBoundaryConditions(); return ta; } @@ -300,11 +300,11 @@ Foam::radiation::greyMeanAbsorptionEmission::ECont(const label bandI) const if (dQ.dimensions() == dimEnergy/dimTime) { - E().internalField() = EhrrCoeff_*dQ/mesh_.V(); + E.ref().internalField() = EhrrCoeff_*dQ/mesh_.V(); } else if (dQ.dimensions() == dimEnergy/dimTime/dimVolume) { - E().internalField() = EhrrCoeff_*dQ; + E.ref().internalField() = EhrrCoeff_*dQ; } else { diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C index d3da12eb59..0e2238eeec 100644 --- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C +++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanSolidAbsorptionEmission/greyMeanSolidAbsorptionEmission.C @@ -55,10 +55,10 @@ greyMeanSolidAbsorptionEmission::X(const word specie) const const volScalarField& p = thermo_.p(); tmp tXj(new scalarField(T.internalField().size(), 0.0)); - scalarField& Xj = tXj(); + scalarField& Xj = tXj.ref(); tmp tRhoInv(new scalarField(T.internalField().size(), 0.0)); - scalarField& rhoInv = tRhoInv(); + scalarField& rhoInv = tRhoInv.ref(); forAll(mixture_.Y(), specieI) { @@ -162,7 +162,7 @@ calc(const label propertyId) const ) ); - scalarField& a = ta().internalField(); + scalarField& a = ta.ref().internalField(); forAllConstIter(HashTable