zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

OpenFOAM libraries: Updated to use the new const-safe tmp

Browse Source
This commit is contained in:
Henry Weller
2016-02-26 08:13:59 +00:00
parent e1405f2260
commit f4ba71ddd0
163 changed files with 346 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fvMotionSolver/Make/options
View File

@ -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 \

9
src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
View File

@ -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<pointField> 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;
}

6
src/fvMotionSolver/fvMotionSolvers/componentVelocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C
View File

@ -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<pointField> 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;
}

4
src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
View File

@ -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;
}

2
src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationMotionSolver.C
View File

@ -313,7 +313,7 @@ Foam::displacementInterpolationMotionSolver::curPoints() const
}
tmp<pointField> tcurPoints(new pointField(points0()));
pointField& curPoints = tcurPoints();
pointField& curPoints = tcurPoints.ref();
// Interpolate the displacement of the face zones.
vectorField zoneDisp(displacements_.size(), vector::zero);

7
src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
View File

@ -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;
}

4
src/fvMotionSolver/fvMotionSolvers/displacement/layeredSolver/displacementLayeredMotionMotionSolver.C
View File

@ -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<vectorField> tfld(new vectorField(meshPoints.size()));
vectorField& fld = tfld();
vectorField& fld = tfld.ref();
const word type(dict.lookup("type"));

4
src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
View File

@ -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;
}