From 82535208dfd33aae7f166da97f4eb885f448beaa Mon Sep 17 00:00:00 2001 From: graham Date: Wed, 21 Oct 2009 17:33:30 +0100 Subject: [PATCH] Adding mathematical:: changes and modifying boost library for old meshers. --- .../mesh/generation/CV2DMesher/Make/options | 2 +- .../generation/CV2DMesher/insertFeaturePoints.C | 13 ++++--------- .../mesh/generation/CV2DMesher/querySurface.C | 4 ++-- .../utilities/mesh/generation/CV3DMesher/CV3D.C | 4 ++-- .../utilities/mesh/generation/CV3DMesher/CV3D.H | 2 +- .../mesh/generation/CV3DMesher/Make/options | 2 +- .../generation/CV3DMesher/insertFeaturePoints.C | 7 +++---- .../CV3DMesher/insertSurfaceNearestPointPairs.C | 3 +-- .../mesh/generation/CV3DMesher/querySurface.C | 2 +- 9 files changed, 16 insertions(+), 23 deletions(-) diff --git a/applications/utilities/mesh/generation/CV2DMesher/Make/options b/applications/utilities/mesh/generation/CV2DMesher/Make/options index ae6f0b006e..9794e9e08a 100755 --- a/applications/utilities/mesh/generation/CV2DMesher/Make/options +++ b/applications/utilities/mesh/generation/CV2DMesher/Make/options @@ -22,5 +22,5 @@ EXE_LIBS = \ -lmeshTools \ -ltriSurface \ -ldynamicMesh \ - -lboost_thread-${BOOST_COMPILER}-mt-${BOOST_LIB_VERSION} \ + -lboost_thread \ -lmpfr diff --git a/applications/utilities/mesh/generation/CV2DMesher/insertFeaturePoints.C b/applications/utilities/mesh/generation/CV2DMesher/insertFeaturePoints.C index 48f949b05f..46977afe0a 100644 --- a/applications/utilities/mesh/generation/CV2DMesher/insertFeaturePoints.C +++ b/applications/utilities/mesh/generation/CV2DMesher/insertFeaturePoints.C @@ -27,7 +27,7 @@ License #include "CV2D.H" #include "plane.H" #include "triSurfaceTools.H" -#include "mathematicalConstants.H" +#include "unitConversion.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -98,20 +98,15 @@ void Foam::CV2D::insertFeaturePoints() point2D reflMasterPt = refPt + 2*(featPt - refPt); // Reflect refPt in both faces. - point2D reflectedA = + point2D reflectedA = reflMasterPt + 2*((featPt - reflMasterPt) & nA)*nA; point2D reflectedB = reflMasterPt + 2*((featPt - reflMasterPt) & nB)*nB; // Total angle around the concave feature -// scalar totalAngle = -// 180*(2.0*mathematicalConstant::pi - acos(mag(nA & nB))) -// /mathematicalConstant::pi; - - scalar totalAngle = - 180*(mathematicalConstant::pi + acos(mag(nA & nB))) - /mathematicalConstant::pi; + scalar totalAngle = + radToDeg(constant::mathematical::pi + acos(mag(nA & nB))); // Number of quadrants the angle should be split into int nQuads = int(totalAngle/controls_.maxQuadAngle) + 1; diff --git a/applications/utilities/mesh/generation/CV2DMesher/querySurface.C b/applications/utilities/mesh/generation/CV2DMesher/querySurface.C index 2a83af51d0..cec0bb35f7 100644 --- a/applications/utilities/mesh/generation/CV2DMesher/querySurface.C +++ b/applications/utilities/mesh/generation/CV2DMesher/querySurface.C @@ -25,7 +25,7 @@ License \*----------------------------------------------------------------------------*/ #include "querySurface.H" -#include "mathematicalConstants.H" +#include "unitConversion.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -58,7 +58,7 @@ Foam::labelList Foam::querySurface::extractFeatures2D const scalar featAngle ) const { - scalar featCos = cos(mathematicalConstant::pi*featAngle/180.0); + scalar featCos = cos(degToRad(featAngle)); const labelListList& edgeFaces = this->edgeFaces(); const pointField& localPoints = this->localPoints(); diff --git a/applications/utilities/mesh/generation/CV3DMesher/CV3D.C b/applications/utilities/mesh/generation/CV3DMesher/CV3D.C index 0d9a170f48..441ed824b8 100644 --- a/applications/utilities/mesh/generation/CV3DMesher/CV3D.C +++ b/applications/utilities/mesh/generation/CV3DMesher/CV3D.C @@ -116,8 +116,8 @@ void Foam::CV3D::setVertexAlignmentDirections() { vector spoke ( - Foam::cos(i*mathematicalConstant::twoPi/s), - Foam::sin(i*mathematicalConstant::twoPi/s), + Foam::cos(i*constant::mathematical::twoPi/s), + Foam::sin(i*constant::mathematical::twoPi/s), 0 ); diff --git a/applications/utilities/mesh/generation/CV3DMesher/CV3D.H b/applications/utilities/mesh/generation/CV3DMesher/CV3D.H index e3dbe80c78..6b730faa97 100644 --- a/applications/utilities/mesh/generation/CV3DMesher/CV3D.H +++ b/applications/utilities/mesh/generation/CV3DMesher/CV3D.H @@ -59,7 +59,7 @@ SourceFiles #include "SortableList.H" #include "plane.H" #include "triSurfaceTools.H" -#include "mathematicalConstants.H" +#include "unitConversion.H" #include "transform.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/utilities/mesh/generation/CV3DMesher/Make/options b/applications/utilities/mesh/generation/CV3DMesher/Make/options index ff54c4ad91..445a2ee843 100644 --- a/applications/utilities/mesh/generation/CV3DMesher/Make/options +++ b/applications/utilities/mesh/generation/CV3DMesher/Make/options @@ -21,5 +21,5 @@ EXE_LIBS = \ -lmeshTools \ -ltriSurface \ -ldynamicMesh \ - -lboost_thread-${BOOST_COMPILER}-mt-${BOOST_LIB_VERSION} \ + -lboost_thread \ -lmpfr diff --git a/applications/utilities/mesh/generation/CV3DMesher/insertFeaturePoints.C b/applications/utilities/mesh/generation/CV3DMesher/insertFeaturePoints.C index 303ab167ed..bfad04ca02 100644 --- a/applications/utilities/mesh/generation/CV3DMesher/insertFeaturePoints.C +++ b/applications/utilities/mesh/generation/CV3DMesher/insertFeaturePoints.C @@ -40,8 +40,7 @@ void Foam::CV3D::insertFeaturePoints() scalar planeErrorAngle = 0.1*(180.0 - controls_.includedAngle); - scalar planeErrorAngleCos = - cos(mathematicalConstant::pi*planeErrorAngle/180.0); + scalar planeErrorAngleCos = cos(degToRad(planeErrorAngle)); forAll(featPoints, i) { @@ -372,9 +371,9 @@ void Foam::CV3D::insertFeaturePoints() insertPoint(concaveEdgeExternalPt, internalPtAI); - scalar totalAngle = 180/mathematicalConstant::pi * + scalar totalAngle = radToDeg ( - mathematicalConstant::pi + + constant::mathematical::pi + acos(mag(concaveEdgePlaneANormal & concaveEdgePlaneBNormal)) ); diff --git a/applications/utilities/mesh/generation/CV3DMesher/insertSurfaceNearestPointPairs.C b/applications/utilities/mesh/generation/CV3DMesher/insertSurfaceNearestPointPairs.C index 0eac6f2e37..2090d0798c 100644 --- a/applications/utilities/mesh/generation/CV3DMesher/insertSurfaceNearestPointPairs.C +++ b/applications/utilities/mesh/generation/CV3DMesher/insertSurfaceNearestPointPairs.C @@ -751,8 +751,7 @@ void Foam::CV3D::insertEdgePointGroups reflMasterPt + 2*((edgePt - reflMasterPt) & nB)*nB; scalar totalAngle = - 180*(mathematicalConstant::pi + acos(mag(nA & nB))) - /mathematicalConstant::pi; + radToDeg(constant::mathematical::pi + acos(mag(nA & nB))); // Number of quadrants the angle should be split into int nQuads = int(totalAngle/controls_.maxQuadAngle) + 1; diff --git a/applications/utilities/mesh/generation/CV3DMesher/querySurface.C b/applications/utilities/mesh/generation/CV3DMesher/querySurface.C index 7dd328ea6b..b5eea59714 100644 --- a/applications/utilities/mesh/generation/CV3DMesher/querySurface.C +++ b/applications/utilities/mesh/generation/CV3DMesher/querySurface.C @@ -25,7 +25,7 @@ License \*----------------------------------------------------------------------------*/ #include "querySurface.H" -#include "mathematicalConstants.H" +#include "unitConversion.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //