From 95572f359f74dac95842c288fa84a4c63726dc66 Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 27 Sep 2012 15:21:11 +0100 Subject: [PATCH 1/8] ENH: snappyHexMeshDict: updated comment --- .../generation/snappyHexMesh/snappyHexMeshDict | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict index 8d7927c42b..ef479dbbbb 100644 --- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict +++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict @@ -255,6 +255,8 @@ addLayersControls relativeSizes true; // Per final patch (so not geometry!) the layer information + // Note: This behaviour changed after 21x. Any non-mentioned patches + // now slide unless nSurfaceLayers is explicitly mentioned to be 0. layers { sphere.stl_firstSolid @@ -265,6 +267,17 @@ addLayersControls maxY { nSurfaceLayers 1; + // Per patch layer data + expansionRatio 1.3; + finalLayerThickness 0.3; + minThickness 0.1; + } + + // Disable any mesh shrinking and layer addition on any point of + // a patch by setting nSurfaceLayers to 0 + frozenPatches + { + nSurfaceLayers 0; } } @@ -281,6 +294,7 @@ addLayersControls //- Minimum thickness of cell layer. If for any reason layer // cannot be above minThickness do not add layer. + // Relative to undistorted size of cell outside layer. // See relativeSizes parameter. minThickness 0.25; @@ -417,7 +431,7 @@ meshQualityControls // Flags for optional output // 0 : only write final meshes // 1 : write intermediate meshes -// 2 : write volScalarFields with cellLevel and cell centres for postprocessing +// 2 : write volScalarField with cellLevel for postprocessing // 4 : write current intersections as .obj files debug 0; From e9268406dc35b1425e502e768d6280a04ab0461d Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 27 Sep 2012 16:55:14 +0100 Subject: [PATCH 2/8] ENH: OBJstream: convenient way of writing obj files --- src/surfMesh/Make/files | 1 + src/surfMesh/surfaceFormats/obj/OBJstream.C | 323 ++++++++++++++++++++ src/surfMesh/surfaceFormats/obj/OBJstream.H | 164 ++++++++++ 3 files changed, 488 insertions(+) create mode 100644 src/surfMesh/surfaceFormats/obj/OBJstream.C create mode 100644 src/surfMesh/surfaceFormats/obj/OBJstream.H diff --git a/src/surfMesh/Make/files b/src/surfMesh/Make/files index a62f9c27f9..3b63a621ae 100644 --- a/src/surfMesh/Make/files +++ b/src/surfMesh/Make/files @@ -26,6 +26,7 @@ $(surfaceFormats)/ftr/FTRsurfaceFormatRunTime.C $(surfaceFormats)/gts/GTSsurfaceFormatRunTime.C $(surfaceFormats)/nas/NASsurfaceFormatRunTime.C $(surfaceFormats)/obj/OBJsurfaceFormatRunTime.C +$(surfaceFormats)/obj/OBJstream.C $(surfaceFormats)/off/OFFsurfaceFormatRunTime.C $(surfaceFormats)/ofs/OFSsurfaceFormatCore.C $(surfaceFormats)/ofs/OFSsurfaceFormatRunTime.C diff --git a/src/surfMesh/surfaceFormats/obj/OBJstream.C b/src/surfMesh/surfaceFormats/obj/OBJstream.C new file mode 100644 index 0000000000..ca24b6b6aa --- /dev/null +++ b/src/surfMesh/surfaceFormats/obj/OBJstream.C @@ -0,0 +1,323 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +\*---------------------------------------------------------------------------*/ + +#include "OBJstream.H" +//#include "token.H" +#include "primitivePatch.H" + +// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * // + +defineTypeNameAndDebug(Foam::OBJstream, 0); + + +// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // + +void Foam::OBJstream::writeAndCheck(const char c) +{ + if (c == '\n') + { + startOfLine_ = true; + } + else if (startOfLine_) + { + startOfLine_ = false; + if (c == 'v') + { + nVertices_++; + } + } + OFstream::write(c); +} + + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +Foam::OBJstream::OBJstream +( + const fileName& pathname, + streamFormat format, + versionNumber version, + compressionType compression +) +: + OFstream(pathname, format, version, compression), + startOfLine_(true), + nVertices_(0) +{} + + +// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * // + +Foam::OBJstream::~OBJstream() +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +Foam::Ostream& Foam::OBJstream::write(const char c) +{ + writeAndCheck(c); + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write(const char* str) +{ + for (const char* p = str; *p != '\0'; ++p) + { + writeAndCheck(*p); + } + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write(const word& str) +{ + write(str.c_str()); + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write(const string& str) +{ + OFstream::write(token::BEGIN_STRING); + + register int backslash = 0; + for (string::const_iterator iter = str.begin(); iter != str.end(); ++iter) + { + register char c = *iter; + + if (c == '\\') + { + backslash++; + // suppress output until we know if other characters follow + continue; + } + else if (c == token::NL) + { + lineNumber_++; + backslash++; // backslash escape for newline + } + else if (c == token::END_STRING) + { + backslash++; // backslash escape for quote + } + + // output pending backslashes + while (backslash) + { + OFstream::write('\\'); + backslash--; + } + + writeAndCheck(c); + } + + // silently drop any trailing backslashes + // they would otherwise appear like an escaped end-quote + + OFstream::write(token::END_STRING); + return *this; +} + + +Foam::Ostream& Foam::OBJstream::writeQuoted +( + const std::string& str, + const bool quoted +) +{ + if (quoted) + { + OFstream::write(token::BEGIN_STRING); + + register int backslash = 0; + for + ( + string::const_iterator iter = str.begin(); + iter != str.end(); + ++iter + ) + { + register char c = *iter; + + if (c == '\\') + { + backslash++; + // suppress output until we know if other characters follow + continue; + } + else if (c == token::NL) + { + lineNumber_++; + backslash++; // backslash escape for newline + } + else if (c == token::END_STRING) + { + backslash++; // backslash escape for quote + } + + // output pending backslashes + while (backslash) + { + OFstream::write('\\'); + backslash--; + } + + writeAndCheck(c); + } + + // silently drop any trailing backslashes + // they would otherwise appear like an escaped end-quote + OFstream::write(token::END_STRING); + } + else + { + // output unquoted string, only advance line number on newline + write(str.c_str()); + } + + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write(const point& pt) +{ + write("v ") << pt.x() << ' ' << pt.y() << ' ' << pt.z() + << nl; + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write(const point& pt, const vector& n) +{ + write(pt); + OFstream::write("vn ") << n.x() << ' ' << n.y() + << ' ' << n.z() << nl; + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write(const edge& e, const pointField& points) +{ + write(points[e[0]]); + write(points[e[1]]); + write("l ") << nVertices_-1 << ' ' << nVertices_ << nl; + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write(const linePointRef& ln) +{ + write(ln.start()); + write(ln.end()); + write("l ") << nVertices_-1 << ' ' << nVertices_ << nl; + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write +( + const face& f, + const pointField& points, + const bool lines +) +{ + label start = nVertices_; + forAll(f, i) + { + write(points[f[i]]); + } + if (lines) + { + write('l'); + forAll(f, i) + { + write(' ') << start+1+i; + } + write(' ') << start+1 << '\n'; + } + else + { + write('f'); + forAll(f, i) + { + write(' ') << start+1+i; + } + write('\n'); + } + return *this; +} + + +Foam::Ostream& Foam::OBJstream::write +( + const faceList& fcs, + const pointField& points, + const bool lines +) +{ + SubList allFcs(fcs, fcs.size()); + + primitivePatch pp(allFcs, points); + + const pointField& localPoints = pp.localPoints(); + const faceList& localFaces = pp.localFaces(); + + label start = nVertices_; + + forAll(localPoints, i) + { + write(localPoints[i]); + } + + if (lines) + { + const edgeList& edges = pp.edges(); + forAll(edges, edgeI) + { + const edge& e = edges[edgeI]; + + write("l ") << start+e[0]+1 << ' ' << start+e[1]+1 << nl; + } + } + else + { + forAll(localFaces, faceI) + { + const face& f = localFaces[faceI]; + write('f'); + forAll(f, i) + { + write(' ') << start+f[i]+1; + } + write('\n'); + } + } + return *this; +} + + +// ************************************************************************* // diff --git a/src/surfMesh/surfaceFormats/obj/OBJstream.H b/src/surfMesh/surfaceFormats/obj/OBJstream.H new file mode 100644 index 0000000000..9e62cbdbeb --- /dev/null +++ b/src/surfMesh/surfaceFormats/obj/OBJstream.H @@ -0,0 +1,164 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2012 OpenFOAM Foundation + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software: you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM. If not, see . + +Class + Foam::OBJstream + +Description + OFstream which keeps track of vertices + +SourceFiles + OBJstream.C + +\*---------------------------------------------------------------------------*/ + +#ifndef OBJstream_H +#define OBJstream_H + +#include "OFstream.H" +#include "point.H" +#include "edge.H" +#include "face.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + + +/*---------------------------------------------------------------------------*\ + Class OBJstream Declaration +\*---------------------------------------------------------------------------*/ + +class OBJstream +: + public OFstream +{ + // Private data + + bool startOfLine_; + + label nVertices_; + + + // Private Member Functions + + void writeAndCheck(const char); + +public: + + // Declare name of the class and its debug switch + ClassName("OBJstream"); + + + // Constructors + + //- Construct from pathname + OBJstream + ( + const fileName& pathname, + streamFormat format=ASCII, + versionNumber version=currentVersion, + compressionType compression=UNCOMPRESSED + ); + + + //- Destructor + ~OBJstream(); + + + // Member functions + + // Access + + //- Return the name of the stream + label nVertices() const + { + return nVertices_; + } + + + // Ostream implementation + + //- Write character + virtual Ostream& write(const char); + + //- Write character string + virtual Ostream& write(const char*); + + //- Write word + virtual Ostream& write(const word&); + + virtual Ostream& write(const string&); + + //- Write std::string surrounded by quotes. + // Optional write without quotes. + virtual Ostream& writeQuoted + ( + const std::string&, + const bool quoted=true + ); + + + // Direct write functionality + + //- Write point + Ostream& write(const point&); + + //- Write point and vector normal ('vn') + Ostream& write(const point&, const vector&); + + //- Write edge as points with line + Ostream& write(const edge&, const pointField&); + + //- Write line + Ostream& write(const linePointRef&); + + //- Write face as points with lines or filled polygon + Ostream& write + ( + const face&, + const pointField&, + const bool lines = true + ); + + //- Write patch as points and faces with lines or filled polygons + Ostream& write + ( + const faceList&, + const pointField&, + const bool lines = true + ); + +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // From ee2c41b7a8b2738722a92b4454cf7d9e7d287dd9 Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 27 Sep 2012 22:01:22 +0100 Subject: [PATCH 3/8] ENH: codedMixed: comment --- .../derived/codedMixed/codedMixedFvPatchField.H | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H index 3ab69cc81c..59c434ee72 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H +++ b/src/finiteVolume/fields/fvPatchFields/derived/codedMixed/codedMixedFvPatchField.H @@ -38,7 +38,11 @@ Description myPatch { type codedMixed; - value uniform 0; + + refValue uniform (0 0 0); + refGradient uniform (0 0 0); + valueFraction uniform 1; + redirectType rampedMixed; // name of generated BC code From 16d7763522f6a4d43c365f6a64f6c798353f785c Mon Sep 17 00:00:00 2001 From: mattijs Date: Thu, 27 Sep 2012 22:02:33 +0100 Subject: [PATCH 4/8] BUG: autoMesh: link in surfMesh for OBJstream --- src/mesh/autoMesh/Make/options | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/mesh/autoMesh/Make/options b/src/mesh/autoMesh/Make/options index fef235e518..ca8cb9e2e4 100644 --- a/src/mesh/autoMesh/Make/options +++ b/src/mesh/autoMesh/Make/options @@ -5,6 +5,7 @@ EXE_INC = \ -I$(LIB_SRC)/lagrangian/basic/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude \ -I$(LIB_SRC)/edgeMesh/lnInclude \ + -I$(LIB_SRC)/surfMesh/lnInclude \ -I$(LIB_SRC)/triSurface/lnInclude LIB_LIBS = \ @@ -13,5 +14,6 @@ LIB_LIBS = \ -llagrangian \ -lmeshTools \ -ledgeMesh \ + -lsurfMesh \ -ltriSurface \ -ldistributed From 66ec81f502cc5be80f390a05a5d012a535993af6 Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 28 Sep 2012 11:11:17 +0100 Subject: [PATCH 5/8] ENH: Removed unused variable yPlusLam from epsilon wall functions --- .../epsilonWallFunctionFvPatchScalarField.C | 19 +++++-------------- .../epsilonWallFunctionFvPatchScalarField.H | 3 --- .../epsilonWallFunctionFvPatchScalarField.C | 15 +++++---------- .../epsilonWallFunctionFvPatchScalarField.H | 3 --- 4 files changed, 10 insertions(+), 30 deletions(-) diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C index edd4dea763..e8e4e70a18 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C @@ -77,10 +77,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField GName_("RASModel::G"), Cmu_(0.09), kappa_(0.41), - E_(9.8), - yPlusLam_(mutWallFunctionFvPatchScalarField::yPlusLam(kappa_, E_)) - - + E_(9.8) { checkType(); } @@ -98,9 +95,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField GName_(ptf.GName_), Cmu_(ptf.Cmu_), kappa_(ptf.kappa_), - E_(ptf.E_), - yPlusLam_(ptf.yPlusLam_) - + E_(ptf.E_) { checkType(); } @@ -117,9 +112,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField GName_(dict.lookupOrDefault("G", "RASModel::G")), Cmu_(dict.lookupOrDefault("Cmu", 0.09)), kappa_(dict.lookupOrDefault("kappa", 0.41)), - E_(dict.lookupOrDefault("E", 9.8)), - yPlusLam_(mutWallFunctionFvPatchScalarField::yPlusLam(kappa_, E_)) - + E_(dict.lookupOrDefault("E", 9.8)) { checkType(); } @@ -134,8 +127,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField GName_(ewfpsf.GName_), Cmu_(ewfpsf.Cmu_), kappa_(ewfpsf.kappa_), - E_(ewfpsf.E_), - yPlusLam_(ewfpsf.yPlusLam_) + E_(ewfpsf.E_) { checkType(); } @@ -151,8 +143,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField GName_(ewfpsf.GName_), Cmu_(ewfpsf.Cmu_), kappa_(ewfpsf.kappa_), - E_(ewfpsf.E_), - yPlusLam_(ewfpsf.yPlusLam_) + E_(ewfpsf.E_) { checkType(); } diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H index 24172ea21e..486b7fb707 100644 --- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H @@ -107,9 +107,6 @@ protected: //- E coefficient scalar E_; - //- Y+ at the edge of the laminar sublayer - scalar yPlusLam_; - // Protected Member Functions diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C index 33c656dc5b..17247003e3 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C @@ -78,8 +78,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField GName_("RASModel::G"), Cmu_(0.09), kappa_(0.41), - E_(9.8), - yPlusLam_(nutkWallFunctionFvPatchScalarField::yPlusLam(kappa_, E_)) + E_(9.8) { checkType(); } @@ -97,8 +96,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField GName_(ptf.GName_), Cmu_(ptf.Cmu_), kappa_(ptf.kappa_), - E_(ptf.E_), - yPlusLam_(ptf.yPlusLam_) + E_(ptf.E_) { checkType(); } @@ -115,8 +113,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField GName_(dict.lookupOrDefault("G", "RASModel::G")), Cmu_(dict.lookupOrDefault("Cmu", 0.09)), kappa_(dict.lookupOrDefault("kappa", 0.41)), - E_(dict.lookupOrDefault("E", 9.8)), - yPlusLam_(nutkWallFunctionFvPatchScalarField::yPlusLam(kappa_, E_)) + E_(dict.lookupOrDefault("E", 9.8)) { checkType(); } @@ -131,8 +128,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField GName_(ewfpsf.GName_), Cmu_(ewfpsf.Cmu_), kappa_(ewfpsf.kappa_), - E_(ewfpsf.E_), - yPlusLam_(ewfpsf.yPlusLam_) + E_(ewfpsf.E_) { checkType(); } @@ -148,8 +144,7 @@ epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField GName_(ewfpsf.GName_), Cmu_(ewfpsf.Cmu_), kappa_(ewfpsf.kappa_), - E_(ewfpsf.E_), - yPlusLam_(ewfpsf.yPlusLam_) + E_(ewfpsf.E_) { checkType(); } diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H index abd360cba4..e988f05aff 100644 --- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H +++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H @@ -107,9 +107,6 @@ protected: //- E coefficient scalar E_; - //- Y+ at the edge of the laminar sublayer - scalar yPlusLam_; - // Protected Member Functions From 5a0700bc7b817a2697244b56cb9f5737fa26565f Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 28 Sep 2012 11:54:12 +0100 Subject: [PATCH 6/8] ENH: Removed duplicate namespace declarations --- .../waveSurfacePressureFvPatchScalarField.C | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C index fe4ddd3357..5f70f9e247 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C @@ -38,9 +38,9 @@ License namespace Foam { template<> - const char* Foam::NamedEnum + const char* NamedEnum < - Foam::waveSurfacePressureFvPatchScalarField::timeSchemeType, + waveSurfacePressureFvPatchScalarField::timeSchemeType, 3 >::names[] = { From 75c708410fc7a5f75acd80ae94297dd727eaa1aa Mon Sep 17 00:00:00 2001 From: andy Date: Fri, 28 Sep 2012 14:22:57 +0100 Subject: [PATCH 7/8] BUG: Corrected typeName usage for NamedEnum --- .../waveSurfacePressureFvPatchScalarField.C | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C index 5f70f9e247..8149855235 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C @@ -44,9 +44,9 @@ namespace Foam 3 >::names[] = { - fv::EulerDdtScheme::typeName.c_str(), - fv::CrankNicholsonDdtScheme::typeName.c_str(), - fv::backwardDdtScheme::typeName.c_str() + fv::EulerDdtScheme::typeName_(), + fv::CrankNicholsonDdtScheme::typeName_(), + fv::backwardDdtScheme::typeName_() }; } From 16c351dc42077dbf2ffdf7a0e89bed873b37d368 Mon Sep 17 00:00:00 2001 From: sergio Date: Fri, 28 Sep 2012 16:59:39 +0100 Subject: [PATCH 8/8] BUG: Changing lsolid for lsolidSpecie --- src/regionModels/pyrolysisModels/Make/options | 3 +-- src/regionModels/thermoBaffleModels/Make/options | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/regionModels/pyrolysisModels/Make/options b/src/regionModels/pyrolysisModels/Make/options index 6f12d7c8ee..eac63d03a0 100644 --- a/src/regionModels/pyrolysisModels/Make/options +++ b/src/regionModels/pyrolysisModels/Make/options @@ -19,8 +19,7 @@ LIB_LIBS = \ -lmeshTools \ -lchemistryModel \ -lspecie \ - -lspecie \ - -lsolid \ + -lsolidSpecie \ -lfluidThermophysicalModels \ -lsolidChemistryModel \ -lcompressibleTurbulenceModel \ diff --git a/src/regionModels/thermoBaffleModels/Make/options b/src/regionModels/thermoBaffleModels/Make/options index 88c8955f91..8d14c45c93 100644 --- a/src/regionModels/thermoBaffleModels/Make/options +++ b/src/regionModels/thermoBaffleModels/Make/options @@ -17,4 +17,4 @@ LIB_LIBS = \ -lfiniteVolume \ -lmeshTools \ -lOpenFOAM \ - -lsolid + -lsolidSpecie