Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'OCCT780'
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_AutomaticLength.cxx
diff --git
a/src/StdMeshers/StdMeshers_AutomaticLength.cxx
b/src/StdMeshers/StdMeshers_AutomaticLength.cxx
index a22a334151bd7cce234e59e82fc1ff3e158e9222..cbfced1faa68b9d81778c1855d7c8636c61daac2 100644
(file)
--- a/
src/StdMeshers/StdMeshers_AutomaticLength.cxx
+++ b/
src/StdMeshers/StdMeshers_AutomaticLength.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16 CEA/DEN, EDF R&D
, OPEN CASCADE
+// Copyright (C) 2007-20
24 CEA, EDF
, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-20,7
+20,7
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-// SMESH SMESH : implementaion of SMESH idl descriptions
+// SMESH SMESH : implementa
t
ion of SMESH idl descriptions
// File : StdMeshers_AutomaticLength.cxx
// Author : Edward AGAPOV, OCC
// Module : SMESH
// File : StdMeshers_AutomaticLength.cxx
// Author : Edward AGAPOV, OCC
// Module : SMESH
@@
-47,8
+47,8
@@
using namespace std;
*/
//=============================================================================
*/
//=============================================================================
-StdMeshers_AutomaticLength::StdMeshers_AutomaticLength(int hypId,
int studyId,
SMESH_Gen * gen)
- :SMESH_Hypothesis(hypId,
studyId,
gen)
+StdMeshers_AutomaticLength::StdMeshers_AutomaticLength(int hypId, SMESH_Gen * gen)
+ :SMESH_Hypothesis(hypId, gen)
{
_name = "AutomaticLength";
_param_algo_dim = 1; // is used by SMESH_Regular_1D
{
_name = "AutomaticLength";
_param_algo_dim = 1; // is used by SMESH_Regular_1D
@@
-84,7
+84,6
@@
const double theCoarseConst = 0.5;
const double theFineConst = 4.5;
void StdMeshers_AutomaticLength::SetFineness(double theFineness)
const double theFineConst = 4.5;
void StdMeshers_AutomaticLength::SetFineness(double theFineness)
- throw(SALOME_Exception)
{
if ( theFineness < 0.0 || theFineness > 1.0 )
throw SALOME_Exception(LOCALIZED("theFineness is out of range [0.0-1.0]"));
{
if ( theFineness < 0.0 || theFineness > 1.0 )
throw SALOME_Exception(LOCALIZED("theFineness is out of range [0.0-1.0]"));
@@
-191,7
+190,7
@@
namespace {
theTShapeToLengthMap.insert( make_pair( getTShape( edge ), L ));
}
theTShapeToLengthMap.insert( make_pair( getTShape( edge ), L ));
}
- // Compute S0 - minimal seg
e
ment length, is computed by the shortest EDGE
+ // Compute S0 - minimal segment length, is computed by the shortest EDGE
/* image attached to PAL10237
/* image attached to PAL10237
@@
-216,7
+215,7
@@
namespace {
NbSeg += ( Lrat2 - Lratio ) / ( Lrat2 - Lrat1 ) * ( NbSegMax - NbSegMin );
double S0 = Lmin / (int) NbSeg;
NbSeg += ( Lrat2 - Lratio ) / ( Lrat2 - Lrat1 ) * ( NbSegMax - NbSegMin );
double S0 = Lmin / (int) NbSeg;
- MESSAGE( "S0 = " << S0 << ", Lmin = " << Lmin << ", Nbseg = " << (int) NbSeg);
+
//
MESSAGE( "S0 = " << S0 << ", Lmin = " << Lmin << ", Nbseg = " << (int) NbSeg);
// Compute segments length for all edges
// Compute segments length for all edges
@@
-239,7
+238,6
@@
namespace {
double StdMeshers_AutomaticLength::GetLength(const SMESH_Mesh* theMesh,
const double theEdgeLength)
double StdMeshers_AutomaticLength::GetLength(const SMESH_Mesh* theMesh,
const double theEdgeLength)
- throw(SALOME_Exception)
{
if ( !theMesh ) throw SALOME_Exception(LOCALIZED("NULL Mesh"));
{
if ( !theMesh ) throw SALOME_Exception(LOCALIZED("NULL Mesh"));
@@
-261,7
+259,6
@@
double StdMeshers_AutomaticLength::GetLength(const SMESH_Mesh* theMesh,
double StdMeshers_AutomaticLength::GetLength(const SMESH_Mesh* theMesh,
const TopoDS_Shape& anEdge)
double StdMeshers_AutomaticLength::GetLength(const SMESH_Mesh* theMesh,
const TopoDS_Shape& anEdge)
- throw(SALOME_Exception)
{
if ( !theMesh ) throw SALOME_Exception(LOCALIZED("NULL Mesh"));
{
if ( !theMesh ) throw SALOME_Exception(LOCALIZED("NULL Mesh"));
@@
-368,7
+365,7
@@
bool StdMeshers_AutomaticLength::SetParametersByMesh(const SMESH_Mesh* theMesh
SMESHDS_SubMesh * eSubMesh = aMeshDS->MeshElements( edge );
if ( !eSubMesh )
return false;
SMESHDS_SubMesh * eSubMesh = aMeshDS->MeshElements( edge );
if ( !eSubMesh )
return false;
-
int
nbSeg = eSubMesh->NbElements();
+
smIdType
nbSeg = eSubMesh->NbElements();
if ( nbSeg < 1 )
continue;
double segLen = L / nbSeg;
if ( nbSeg < 1 )
continue;
double segLen = L / nbSeg;