From b4a2f37f1b99d135bc37219999d10879e10c199a Mon Sep 17 00:00:00 2001 From: sergio Date: Mon, 8 Dec 2008 13:51:31 +0000 Subject: [PATCH 01/34] PDRFoam documentation completion --- .../XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H | 2 +- .../PDRModels/XiGModels/basicXiSubG/basicXiSubG.H | 2 +- .../PDRModels/dragModels/PDRDragModel/PDRDragModel.H | 5 +++-- .../PDRFoam/PDRModels/dragModels/basic/basic.H | 4 ++-- .../PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C | 2 +- .../PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H | 6 +++--- .../PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H | 2 +- .../XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H | 8 ++++++-- .../XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H | 4 +++- .../XiModels/XiEqModels/XiEqModel/XiEqModel.H | 8 +++++++- .../XiEqModels/instabilityXiEq/instabilityXiEq.H | 8 ++++++-- .../combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H | 5 +++-- .../PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H | 5 ++++- .../XiModels/XiGModels/instabilityG/instabilityG.H | 7 +++++-- .../combustion/PDRFoam/XiModels/XiModel/XiModel.H | 12 +++++++----- .../PDRFoam/XiModels/algebraic/algebraic.H | 4 +++- .../combustion/PDRFoam/XiModels/fixed/fixed.H | 5 +++-- .../PDRFoam/XiModels/transport/transport.H | 4 +++- .../laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H | 2 +- 19 files changed, 63 insertions(+), 32 deletions(-) diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H index 04cc2a83ca..335012c868 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiEqModels/basicXiSubXiEq/basicXiSubXiEq.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - basicSubGrid + Foam::XiEqModels::basicSubGrid Description Basic sub-grid obstacle flame-wrinking enhancement factor model. diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H index a455fd28b4..d844dca34e 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/XiGModels/basicXiSubG/basicXiSubG.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - basicSubGrid + Foam::XiGModel::basicSubGrid Description diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H index 3448d1166c..9844a4cf35 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.H @@ -23,10 +23,11 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - PDRDragModel + Foam::PDRDragModel Description - Base-class for sub-grid obstacle drag models. + Base-class for sub-grid obstacle drag models. The available drag model is at + \link basic.H \endlink. SourceFiles PDRDragModel.C diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H index 05ec433919..f021b6829e 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - basic + Foam::PDRDragModels::basic Description Basic sub-grid obstacle drag model. @@ -70,7 +70,7 @@ Description \f$ T \f$ is a tensor in the file CT. The term \f$ G_{R} \f$ is treated explicitly in the \f$ \kappa-\epsilon - \f$ Eqs in the PDRkEpsilon.C file. + \f$ Eqs in the \link PDRkEpsilon.C \endlink file. SourceFiles diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C index a0e4bcfdb0..463acf2448 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.C @@ -50,7 +50,7 @@ PDRkEpsilon::PDRkEpsilon const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - const basicThermo& thermophysicalModel + basicThermo& thermophysicalModel ) : RASModel(typeName, rho, U, phi, thermophysicalModel), diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H index b35ef9151e..8fa9d2dfcc 100644 --- a/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H +++ b/applications/solvers/combustion/PDRFoam/PDRModels/turbulence/PDRkEpsilon/PDRkEpsilon.H @@ -23,11 +23,11 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - PDRkEpsilon + Foam::compressible::RASModels::PDRkEpsilon Description Standard k-epsilon turbulence model with additional source terms - corresponding to PDR basic drag model (basic.H) + corresponding to PDR basic drag model (\link basic.H \endlink) The turbulence source term \f$ G_{R} \f$ appears in the \f$ \kappa-\epsilon \f$ equation for the generation of turbulence due to @@ -93,7 +93,7 @@ public: const volScalarField& rho, const volVectorField& U, const surfaceScalarField& phi, - const basicThermo& thermophysicalModel + basicThermo& thermophysicalModel ); diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H index d8bc58b170..c361e81946 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/Gulder/Gulder.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - Gulder + Foam::XiEqModels::Gulder Description Simple Gulder model for XiEq based on Gulders correlation diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H index b9a45ffb63..0747fec865 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEBlendXiEq/SCOPEBlendXiEq.H @@ -23,10 +23,14 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - SCOPEBlend + Foam::XiEqModels::SCOPEBlend Description - + Simple SCOPEBlendXiEq model for XiEq based on SCOPEXiEqs correlation + with a linear correction function to give a plausible profile for XiEq. + See \link SCOPELaminarFlameSpeed.H \endlink for details on the SCOPE laminar + flame speed model. + SourceFiles SCOPEBlend.C diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H index b2b2b35edf..a10b07e35e 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/SCOPEXiEq/SCOPEXiEq.H @@ -23,11 +23,13 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - SCOPEXiEq + Foam::XiEqModel::SCOPEXiEq Description Simple SCOPEXiEq model for XiEq based on SCOPEXiEqs correlation with a linear correction function to give a plausible profile for XiEq. + See \link SCOPELaminarFlameSpeed.H \endlink for details on the SCOPE laminar + flame speed model. SourceFiles SCOPEXiEq.C diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H index 2c35877f5e..150ff09782 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.H @@ -23,10 +23,16 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - XiEqModel + Foam::XiEqModel Description Base-class for all XiEq models used by the b-XiEq combustion model. + The available models are : + \link basicXiSubXiEq.H \endlink + \link Gulder.H \endlink + \link instabilityXiEq.H \endlink + \link SCOPEBlendXiEq.H \endlink + \link SCOPEXiEq.H \endlink SourceFiles XiEqModel.C diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H index 455635dc08..8c8aa51e04 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/instabilityXiEq/instabilityXiEq.H @@ -23,10 +23,14 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - instability + Foam::XiEqModels::instability Description - + + This is the equilibrium level of the flame wrinkling generated by + inestability. It is a constant (default 2.5). It is used in + \link XiModel.H \endlink. + SourceFiles instability.C diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H index 8884c00deb..ab77cf1c9d 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/KTS/KTS.H @@ -23,10 +23,11 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - KTS + Foam::XiGModels::KTS Description - Simple Kolmogorov time-scale model for the flame-wrinling generation rate. + Simple Kolmogorov time-scale (KTS) model for the flame-wrinling generation + rate. SourceFiles KTS.C diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H index 908dc3a623..0e3dd00db1 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.H @@ -23,10 +23,13 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - XiGModel + Foam::XiGModel Description Base-class for all Xi generation models used by the b-Xi combustion model. + See Technical Report SH/RE/01R for details on the PDR modelling. For details + on the use of XiGModel see \link XiModel.H \endlink. The model available is + \link instabilityG.H \endlink SourceFiles XiGModel.C diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H index 596e86229b..2b92efdac9 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiGModels/instabilityG/instabilityG.H @@ -23,10 +23,13 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - instabilityG + Foam::XiGModels::instabilityG Description - Flame-surface instabilityG flame-wrinking generation rate coefficient model. + Flame-surface instabilityG flame-wrinking generation rate coefficient model + used in \link XiModel.H \endlink. + + See Technical Report SH/RE/01R for details on the PDR modelling. SourceFiles instabilityG.C diff --git a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H index 2b76f9bc92..dc1936b8cd 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.H @@ -23,14 +23,16 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - XiModel + Foam::XiModel Description Base-class for all Xi models used by the b-Xi combustion model. See Technical Report SH/RE/01R for details on the PDR modelling. - Xi is given through an algebraic expression (algebraic.H), - by solving a transport equation (transport.H) or a fixed value (fixed.H). + Xi is given through an algebraic expression (\link algebraic.H \endlink), + by solving a transport equation (\link transport.H \endlink) or a + fixed value (\link fixed.H \endlink). + See report TR/HGW/10 for details on the Weller two equations model. In the algebraic and transport methods \f$\Xi_{eq}\f$ is calculated in @@ -45,6 +47,8 @@ Description \f$ \dwea{b} \f$ is the regress variable. + \f$ \Xi_{coeff} \f$ is a model constant. + \f$ \Xi^* \f$ is the total equilibrium wrinkling combining the effects of the flame inestability and turbulence interaction and is given by @@ -102,8 +106,6 @@ namespace Foam Class XiModel Declaration \*---------------------------------------------------------------------------*/ - - class XiModel { diff --git a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H index 9da38cf00d..9feb1d713a 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/algebraic/algebraic.H @@ -23,11 +23,13 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - algebraic + Foam::XiModels::algebraic Description Simple algebraic model for Xi based on Gulders correlation with a linear correction function to give a plausible profile for Xi. + See report TR/HGW/10 for details on the Weller two equations model. + See \link XiModel.H \endlink for more details on flame wrinkling modelling. SourceFiles algebraic.C diff --git a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H index 64c44fdff4..230ff204a1 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/fixed/fixed.H @@ -23,10 +23,11 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - fixed + Foam::XiModels::fixed Description - Fixed value model for Xi. + Fixed value model for Xi. See \link XiModel.H \endlink for more details + on flame wrinkling modelling. SourceFiles fixed.C diff --git a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H index db2a7255aa..8e6ebe45d3 100644 --- a/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H +++ b/applications/solvers/combustion/PDRFoam/XiModels/transport/transport.H @@ -23,11 +23,13 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - transport + Foam::XiModels::transport Description Simple transport model for Xi based on Gulders correlation with a linear correction function to give a plausible profile for Xi. + See report TR/HGW/10 for details on the Weller two equations model. + See \link XiModel.H \endlink for more details on flame wrinkling modelling. SourceFiles transport.C diff --git a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H index 8c65453b94..029d31f25d 100644 --- a/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H +++ b/applications/solvers/combustion/PDRFoam/laminarFlameSpeed/SCOPE/SCOPELaminarFlameSpeed.H @@ -23,7 +23,7 @@ License Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Class - SCOPE + Foam::laminarFlameSpeedModels::SCOPE Description Laminar flame speed obtained from the SCOPE correlation. From d3ab1df730acb4b34a0ddbaffe1072717b564dfa Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Fri, 19 Dec 2008 19:04:09 +0100 Subject: [PATCH 02/34] fixed silly mistakes in wmakePrintBuild --- wmake/wmakePrintBuild | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wmake/wmakePrintBuild b/wmake/wmakePrintBuild index 868357fe58..65a5d83671 100755 --- a/wmake/wmakePrintBuild +++ b/wmake/wmakePrintBuild @@ -61,15 +61,15 @@ do -h | -help) usage ;; - -check) + -c | -check) checkOnly=true shift ;; - -update) + -u | -update) update=true shift ;; - -version) + -v | -version) [ "$#" -ge 2 ] || usage "'$1' option requires an argument" version=$2 shift 2 @@ -108,14 +108,14 @@ fi # update persistent build tag if possible if [ $rc -eq 0 -a -n "$update" -a "$version" != "$previous" ] then - if [ -w "$build" -a \( -w "$WM_PROJECT_DIR" -o ! -e "$build" \) ] + if [ -w "$build" -o \( -w "$WM_PROJECT_DIR" -a ! -e "$build" \) ] then echo $version >| "$build" 2>/dev/null fi fi -# check git vs. persistent build tag - no output +# check git vs. persistent build tag if [ -n "$checkOnly" ] then if [ $rc -eq 0 ] From 1389f61287a8dddfea97183bdc6ecab54bbc26d4 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 31 Dec 2008 14:55:00 +0100 Subject: [PATCH 03/34] rename PrimitiveMeshedSurface -> BasicMeshedSurface --- .../BasicMeshedSurface.C} | 46 +++++++++---------- .../BasicMeshedSurface.H} | 28 +++++------ src/surfMesh/MeshedSurface/MeshedSurface.H | 6 +-- .../UnsortedMeshedSurface.H | 6 +-- 4 files changed, 43 insertions(+), 43 deletions(-) rename src/surfMesh/{PrimitiveMeshedSurface/PrimitiveMeshedSurface.C => BasicMeshedSurface/BasicMeshedSurface.C} (89%) rename src/surfMesh/{PrimitiveMeshedSurface/PrimitiveMeshedSurface.H => BasicMeshedSurface/BasicMeshedSurface.H} (89%) diff --git a/src/surfMesh/PrimitiveMeshedSurface/PrimitiveMeshedSurface.C b/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.C similarity index 89% rename from src/surfMesh/PrimitiveMeshedSurface/PrimitiveMeshedSurface.C rename to src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.C index 6c4337e3b2..1a5659a5e9 100644 --- a/src/surfMesh/PrimitiveMeshedSurface/PrimitiveMeshedSurface.C +++ b/src/surfMesh/BasicMeshedSurface/BasicMeshedSurface.C @@ -24,13 +24,13 @@ License \*---------------------------------------------------------------------------*/ -#include "PrimitiveMeshedSurface.H" +#include "BasicMeshedSurface.H" #include "boundBox.H" #include "mergePoints.H" // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * // template -inline bool Foam::PrimitiveMeshedSurface::isTri() +inline bool Foam::BasicMeshedSurface::isTri() { return false; } @@ -39,14 +39,14 @@ inline bool Foam::PrimitiveMeshedSurface::isTri() // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // template -Foam::PrimitiveMeshedSurface::PrimitiveMeshedSurface() +Foam::BasicMeshedSurface::BasicMeshedSurface() : ParentType(List(), pointField()) {} template -Foam::PrimitiveMeshedSurface::PrimitiveMeshedSurface +Foam::BasicMeshedSurface::BasicMeshedSurface ( const xfer& pointLst, const xfer >& faceLst @@ -61,14 +61,14 @@ Foam::PrimitiveMeshedSurface::PrimitiveMeshedSurface // * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // template -Foam::PrimitiveMeshedSurface::~PrimitiveMeshedSurface() +Foam::BasicMeshedSurface::~BasicMeshedSurface() {} // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // template -void Foam::PrimitiveMeshedSurface::clear() +void Foam::BasicMeshedSurface::clear() { ParentType::clearOut(); @@ -78,7 +78,7 @@ void Foam::PrimitiveMeshedSurface::clear() template -void Foam::PrimitiveMeshedSurface::movePoints(const pointField& newPoints) +void Foam::BasicMeshedSurface::movePoints(const pointField& newPoints) { // Remove all geometry dependent data ParentType::clearTopology(); @@ -92,7 +92,7 @@ void Foam::PrimitiveMeshedSurface::movePoints(const pointField& newPoints) template -void Foam::PrimitiveMeshedSurface::scalePoints(const scalar& scaleFactor) +void Foam::BasicMeshedSurface::scalePoints(const scalar& scaleFactor) { // avoid bad scaling if (scaleFactor > 0 && scaleFactor != 1.0) @@ -109,7 +109,7 @@ void Foam::PrimitiveMeshedSurface::scalePoints(const scalar& scaleFactor) template -void Foam::PrimitiveMeshedSurface::reset +void Foam::BasicMeshedSurface::reset ( const xfer& pointLst, const xfer >& faceLst @@ -133,7 +133,7 @@ void Foam::PrimitiveMeshedSurface::reset // Remove badly degenerate faces, double faces. template -void Foam::PrimitiveMeshedSurface::cleanup(const bool verbose) +void Foam::BasicMeshedSurface::cleanup(const bool verbose) { // merge points (already done for STL, TRI) stitchFaces(SMALL, verbose); @@ -144,7 +144,7 @@ void Foam::PrimitiveMeshedSurface::cleanup(const bool verbose) template -bool Foam::PrimitiveMeshedSurface::stitchFaces +bool Foam::BasicMeshedSurface::stitchFaces ( const scalar tol, const bool verbose @@ -165,7 +165,7 @@ bool Foam::PrimitiveMeshedSurface::stitchFaces if (verbose) { - Info<< "PrimitiveMeshedSurface::stitchFaces : Renumbering all faces" + Info<< "BasicMeshedSurface::stitchFaces : Renumbering all faces" << endl; } @@ -198,7 +198,7 @@ bool Foam::PrimitiveMeshedSurface::stitchFaces } else if (verbose) { - Pout<< "PrimitiveMeshedSurface::stitchFaces : " + Pout<< "BasicMeshedSurface::stitchFaces : " << "Removing collapsed face " << faceI << endl << " vertices :" << f << endl; } @@ -209,7 +209,7 @@ bool Foam::PrimitiveMeshedSurface::stitchFaces { if (verbose) { - Pout<< "PrimitiveMeshedSurface::stitchFaces : " + Pout<< "BasicMeshedSurface::stitchFaces : " << "Removed " << faceLst.size() - newFaceI << " faces" << endl; } @@ -226,7 +226,7 @@ bool Foam::PrimitiveMeshedSurface::stitchFaces // Remove badly degenerate faces and double faces. template -bool Foam::PrimitiveMeshedSurface::checkFaces +bool Foam::BasicMeshedSurface::checkFaces ( const bool verbose ) @@ -250,7 +250,7 @@ bool Foam::PrimitiveMeshedSurface::checkFaces { if (f[fp] < 0 || f[fp] > maxPointI) { - FatalErrorIn("PrimitiveMeshedSurface::checkFaces(bool)") + FatalErrorIn("BasicMeshedSurface::checkFaces(bool)") << "face " << f << " uses point indices outside point range 0.." << maxPointI @@ -271,7 +271,7 @@ bool Foam::PrimitiveMeshedSurface::checkFaces { WarningIn ( - "PrimitiveMeshedSurface::checkFaces(bool verbose)" + "BasicMeshedSurface::checkFaces(bool verbose)" ) << "face[" << faceI << "] = " << f << " does not have three unique vertices" << endl; } @@ -319,7 +319,7 @@ bool Foam::PrimitiveMeshedSurface::checkFaces { WarningIn ( - "PrimitiveMeshedSurface::checkFaces(bool verbose)" + "BasicMeshedSurface::checkFaces(bool verbose)" ) << "faces share the same vertices:" << nl << " face[" << faceI << "] : " << f << nl << " face[" << neiFaceI << "] : " << nei << endl; @@ -353,7 +353,7 @@ bool Foam::PrimitiveMeshedSurface::checkFaces { WarningIn ( - "PrimitiveMeshedSurface::checkFaces(bool verbose)" + "BasicMeshedSurface::checkFaces(bool verbose)" ) << "Removed " << faceLst.size() - newFaceI << " illegal faces." << endl; } @@ -385,7 +385,7 @@ bool Foam::PrimitiveMeshedSurface::checkFaces template -Foam::label Foam::PrimitiveMeshedSurface::triangulate() +Foam::label Foam::BasicMeshedSurface::triangulate() { return triangulate ( @@ -395,7 +395,7 @@ Foam::label Foam::PrimitiveMeshedSurface::triangulate() template -Foam::label Foam::PrimitiveMeshedSurface::triangulate +Foam::label Foam::BasicMeshedSurface::triangulate ( List