From bd77d50b5ffca4683da5232f85a774df6cf3ead9 Mon Sep 17 00:00:00 2001 From: henry <Henry Weller h.weller@opencfd.co.uk> Date: Thu, 10 Jun 2010 13:15:04 +0100 Subject: [PATCH] Miscellaneous developments from Hilary --- .../extrudeMesh/extrudeModel/linearRadial/linearRadial.C | 4 +++- .../extrudeMesh/extrudeModel/linearRadial/linearRadial.H | 1 + .../interpolation/interpolationCell/interpolationCell.H | 2 +- .../interpolationCellPoint/interpolationCellPoint.H | 3 ++- .../volPointInterpolation/volPointInterpolation.H | 3 ++- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.C b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.C index 21c6813526a..ca3631f2242 100644 --- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.C +++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.C @@ -43,7 +43,8 @@ addToRunTimeSelectionTable(extrudeModel, linearRadial, dictionary); linearRadial::linearRadial(const dictionary& dict) : extrudeModel(typeName, dict), - R_(readScalar(coeffDict_.lookup("R"))) + R_(readScalar(coeffDict_.lookup("R"))), + Rsurface_(coeffDict_.lookupOrDefault<scalar>("Rsurface", -1)) {} @@ -65,6 +66,7 @@ point linearRadial::operator() // radius of the surface scalar rs = mag(surfacePoint); vector rsHat = surfacePoint/rs; + if (Rsurface_ >= 0) rs = Rsurface_; scalar r = rs + (R_ - rs)*sumThickness(layer); return r*rsHat; diff --git a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.H b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.H index 9b481dee06d..9b42bb6690e 100644 --- a/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.H +++ b/applications/utilities/mesh/generation/extrudeMesh/extrudeModel/linearRadial/linearRadial.H @@ -51,6 +51,7 @@ class linearRadial // Private data scalar R_; + scalar Rsurface_; public: diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H b/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H index 994d1cae404..c16d234613c 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H +++ b/src/finiteVolume/interpolation/interpolation/interpolationCell/interpolationCell.H @@ -25,7 +25,7 @@ Class Foam::interpolationCell Description - Foam::interpolationCell + Uses the cell value for any point in the cell \*---------------------------------------------------------------------------*/ diff --git a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H index b187d3ff08b..ab37149b145 100644 --- a/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H +++ b/src/finiteVolume/interpolation/interpolation/interpolationCellPoint/interpolationCellPoint.H @@ -25,7 +25,8 @@ Class Foam::interpolationCellPoint Description - Foam::interpolationCellPoint + Given cell centre values and point (vertex) values decompose into + tetrahedra and linear interpolate within them. \*---------------------------------------------------------------------------*/ diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H index fb46d50a871..d850c1b68d5 100644 --- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H +++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H @@ -25,7 +25,8 @@ Class Foam::volPointInterpolation Description - Foam::volPointInterpolation + Interpolate from cell centres to points (vertices) using inverse distance + weighting SourceFiles volPointInterpolation.C -- GitLab