X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers%2FStdMeshers_CartesianParameters3D.cxx;h=f55687ca3ead5a1d620edcf7fa12213d71735f36;hp=00cd8615ec4bbddafa83cc1c238d708e52b07766;hb=1cea00918546e5ab79c0d74d49d7820d431f3c85;hpb=cd3ffac3fabc68b4d1dee2ad199302f04b20d2c8 diff --git a/src/StdMeshers/StdMeshers_CartesianParameters3D.cxx b/src/StdMeshers/StdMeshers_CartesianParameters3D.cxx index 00cd8615e..f55687ca3 100644 --- a/src/StdMeshers/StdMeshers_CartesianParameters3D.cxx +++ b/src/StdMeshers/StdMeshers_CartesianParameters3D.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -6,7 +6,7 @@ // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -234,11 +235,12 @@ void StdMeshers_CartesianParameters3D::SetFixedPoint(const double p[3], bool toU //purpose : Returns either false or (true + point coordinates) //======================================================================= -bool StdMeshers_CartesianParameters3D::GetFixedPoint(double p[3]) +bool StdMeshers_CartesianParameters3D::GetFixedPoint(double p[3]) const { if ( Precision::IsInfinite( _fixedPoint[0] )) return false; std::copy( &_fixedPoint[0], &_fixedPoint[0]+3, &p[0] ); + return true; } @@ -294,20 +296,41 @@ bool StdMeshers_CartesianParameters3D::IsGridBySpacing(const int axis) const //purpose : Computes node coordinates by spacing functions //======================================================================= -void StdMeshers_CartesianParameters3D::ComputeCoordinates(const double x0, - const double x1, - vector& spaceFuns, - vector& points, - vector& coords, - const std::string& axis ) +void StdMeshers_CartesianParameters3D::ComputeCoordinates(const double x0, + const double x1, + vector& theSpaceFuns, + vector& thePoints, + vector& coords, + const string& axis, + const double* xForced ) throw ( SALOME_Exception ) { - checkGridSpacing( spaceFuns, points, axis ); + checkGridSpacing( theSpaceFuns, thePoints, axis ); + + vector spaceFuns = theSpaceFuns; + vector points = thePoints; + + bool forced = false; + if (( forced = ( xForced && ( x0 < *xForced ) && ( *xForced < x1 )))) + { + // divide a range at xForced + + // find a range to insert xForced + double pos = ( *xForced - x0 ) / ( x1 - x0 ); + int iR = 1; + while ( pos > points[ iR ] ) ++iR; + + // insert xForced + vector::iterator pntIt = points.begin() + iR; + points.insert( pntIt, pos ); + vector::iterator funIt = spaceFuns.begin() + iR; + spaceFuns.insert( funIt, spaceFuns[ iR-1 ]); + } coords.clear(); for ( size_t i = 0; i < spaceFuns.size(); ++i ) { - FunctionExpr fun( spaceFuns[i].c_str(), /*convMode=*/-1 ); + StdMeshers::FunctionExpr fun( spaceFuns[i].c_str(), /*convMode=*/-1 ); const double p0 = x0 * ( 1. - points[i]) + x1 * points[i]; const double p1 = x0 * ( 1. - points[i+1]) + x1 * points[i+1]; @@ -345,6 +368,28 @@ void StdMeshers_CartesianParameters3D::ComputeCoordinates(const double x if ( fabs( coords.back() - p1 ) > 0.5 * lastCellLen ) coords.push_back ( p1 ); } + + // correct coords if a forced point is too close to a neighbor node + if ( forced ) + { + size_t iF = 0; + double minLen = ( x1 - x0 ); + for ( size_t i = 1; i < coords.size(); ++i ) + { + if ( !iF && Abs( coords[i] - *xForced ) < 1e-20 ) + iF = i++; // xForced found + else + minLen = Min( minLen, coords[i] - coords[i-1] ); + } + const double tol = minLen * 1e-3; + int iRem = -1; + if (( iF > 1 ) && ( coords[iF] - coords[iF-1] < tol )) + iRem = iF-1; + else if (( iF < coords.size()-2 ) && ( coords[iF+1] - coords[iF] < tol )) + iRem = iF+1; + if ( iRem > 0 ) + coords.erase( coords.begin() + iRem ); + } } //======================================================================= @@ -370,19 +415,45 @@ void StdMeshers_CartesianParameters3D::GetCoordinates(std::vector& xNode bndBox.Get(x0,y0,z0, x1,y1,z1); } + double fp[3], *pfp[3] = { NULL, NULL, NULL }; + if ( GetFixedPoint( fp )) + { + // convert fp into a basis defined by _axisDirs + gp_XYZ axis[3] = { gp_XYZ( _axisDirs[0], _axisDirs[1], _axisDirs[2] ), + gp_XYZ( _axisDirs[3], _axisDirs[4], _axisDirs[5] ), + gp_XYZ( _axisDirs[6], _axisDirs[7], _axisDirs[8] ) }; + axis[0].Normalize(); + axis[1].Normalize(); + axis[2].Normalize(); + + gp_Mat basis( axis[0], axis[1], axis[2] ); + gp_Mat bi = basis.Inverted(); + + gp_XYZ p( fp[0], fp[1], fp[2] ); + p *= bi; + p.Coord( fp[0], fp[1], fp[2] ); + + pfp[0] = & fp[0]; + pfp[1] = & fp[1]; + pfp[2] = & fp[2]; + } + StdMeshers_CartesianParameters3D* me = const_cast(this); if ( IsGridBySpacing(0) ) - ComputeCoordinates( x0, x1, me->_spaceFunctions[0], me->_internalPoints[0], xNodes, "X" ); + ComputeCoordinates + ( x0, x1, me->_spaceFunctions[0], me->_internalPoints[0], xNodes, "X", pfp[0] ); else xNodes = _coords[0]; if ( IsGridBySpacing(1) ) - ComputeCoordinates( y0, y1, me->_spaceFunctions[1], me->_internalPoints[1], yNodes, "Y" ); + ComputeCoordinates + ( y0, y1, me->_spaceFunctions[1], me->_internalPoints[1], yNodes, "Y", pfp[1] ); else yNodes = _coords[1]; if ( IsGridBySpacing(2) ) - ComputeCoordinates( z0, z1, me->_spaceFunctions[2], me->_internalPoints[2], zNodes, "Z" ); + ComputeCoordinates + ( z0, z1, me->_spaceFunctions[2], me->_internalPoints[2], zNodes, "Z", pfp[2] ); else zNodes = _coords[2]; } @@ -452,9 +523,8 @@ ComputeOptimalAxesDirs(const TopoDS_Shape& shape, const TCooTriple* norm1 = 0; double sumArea = 0; vector< const TCooTriple* > norms; - for ( int iF = 1; norm2a != areasByNormal.end(); ++norm2a, ++iF ) + for ( size_t iF = 1; norm2a != areasByNormal.end(); ++norm2a, ++iF ) { - if ( !norm1 || !sameDir( *norm1, norm2a->first )) { if ( !norms.empty() ) @@ -729,51 +799,51 @@ std::istream & StdMeshers_CartesianParameters3D::LoadFrom(std::istream & load) { bool ok; - ok = ( load >> _sizeThreshold ); + ok = static_cast( load >> _sizeThreshold ); for ( int ax = 0; ax < 3; ++ax ) { if (ok) { size_t i = 0; - ok = (load >> i ); + ok = static_cast(load >> i ); if ( i > 0 && ok ) { _coords[ax].resize( i ); for ( i = 0; i < _coords[ax].size() && ok; ++i ) - ok = (load >> _coords[ax][i] ); + ok = static_cast(load >> _coords[ax][i] ); } } if (ok) { size_t i = 0; - ok = (load >> i ); + ok = static_cast(load >> i ); if ( i > 0 && ok ) { _internalPoints[ax].resize( i ); for ( i = 0; i < _internalPoints[ax].size() && ok; ++i ) - ok = (load >> _internalPoints[ax][i] ); + ok = static_cast(load >> _internalPoints[ax][i] ); } } if (ok) { size_t i = 0; - ok = (load >> i ); + ok = static_cast(load >> i ); if ( i > 0 && ok ) { _spaceFunctions[ax].resize( i ); for ( i = 0; i < _spaceFunctions[ax].size() && ok; ++i ) - ok = (load >> _spaceFunctions[ax][i] ); + ok = static_cast(load >> _spaceFunctions[ax][i] ); } } } - ok = ( load >> _toAddEdges ); + ok = static_cast( load >> _toAddEdges ); for ( int i = 0; i < 9 && ok; ++i ) - ok = ( load >> _axisDirs[i]); + ok = static_cast( load >> _axisDirs[i]); for ( int i = 0; i < 3 && ok ; ++i ) - ok = ( load >> _fixedPoint[i]); + ok = static_cast( load >> _fixedPoint[i]); return load; }