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
52618: Import_1D2D fails to import from a mesh group onto a group of geom faces
[modules/smesh.git]
/
src
/
StdMeshers
/
StdMeshers_CartesianParameters3D.hxx
diff --git
a/src/StdMeshers/StdMeshers_CartesianParameters3D.hxx
b/src/StdMeshers/StdMeshers_CartesianParameters3D.hxx
index 98970956bc8dcc2a62f80a9d2b789fbe5a8b73e5..befb9afd8e8f17f01f4717c4cae2c832490ac5e5 100644
(file)
--- a/
src/StdMeshers/StdMeshers_CartesianParameters3D.hxx
+++ b/
src/StdMeshers/StdMeshers_CartesianParameters3D.hxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
5
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
//
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-78,6
+78,13
@@
public:
bool IsGridBySpacing(const int axis) const throw ( SALOME_Exception );
bool IsGridBySpacing(const int axis) const throw ( SALOME_Exception );
+ /*!
+ * Set/unset a fixed point, at which a node will be created provided that grid
+ * is defined by spacing in all directions
+ */
+ void SetFixedPoint(const double p[3], bool toUnset);
+ bool GetFixedPoint(double p[3]) const;
+
/*!
* \brief Computes node coordinates by spacing functions
* \param x0 - lower coordinate
/*!
* \brief Computes node coordinates by spacing functions
* \param x0 - lower coordinate
@@
-91,7
+98,8
@@
public:
std::vector<std::string>& spaceFuns,
std::vector<double>& points,
std::vector<double>& coords,
std::vector<std::string>& spaceFuns,
std::vector<double>& points,
std::vector<double>& coords,
- const std::string& axis ) throw (SALOME_Exception);
+ const std::string& axis,
+ const double* xForced=0) throw (SALOME_Exception);
/*!
* Return coordinates of node positions along the three axes.
* If the grid is defined by spacing functions, the coordinates are computed
/*!
* Return coordinates of node positions along the three axes.
* If the grid is defined by spacing functions, the coordinates are computed
@@
-101,13
+109,21
@@
public:
std::vector<double>& zNodes,
const Bnd_Box& bndBox) const throw ( SALOME_Exception );
std::vector<double>& zNodes,
const Bnd_Box& bndBox) const throw ( SALOME_Exception );
+ /*!
+ * \brief Set custom direction of axes
+ */
void SetAxisDirs(const double* the9DirComps) throw ( SALOME_Exception );
const double* GetAxisDirs() const { return _axisDirs; }
void SetAxisDirs(const double* the9DirComps) throw ( SALOME_Exception );
const double* GetAxisDirs() const { return _axisDirs; }
-
+ /*!
+ * \brief Returns axes at which number of hexahedra is maximal
+ */
+ static void ComputeOptimalAxesDirs(const TopoDS_Shape& shape,
+ const bool isOrthogonal,
+ double dirCoords[9]);
/*!
* Set size threshold. A polyhedral cell got by cutting an initial
* hexahedron by geometry boundary is considered small and is removed if
/*!
* Set size threshold. A polyhedral cell got by cutting an initial
* hexahedron by geometry boundary is considered small and is removed if
- * it's size is \athreshold times less than the size of the initial hexahedron.
+ * it's size is \athreshold times less than the size of the initial hexahedron.
*/
void SetSizeThreshold(const double threshold) throw ( SALOME_Exception );
/*!
*/
void SetSizeThreshold(const double threshold) throw ( SALOME_Exception );
/*!
@@
-150,7
+166,8
@@
public:
std::vector<std::string> _spaceFunctions[3];
std::vector<double> _internalPoints[3];
std::vector<std::string> _spaceFunctions[3];
std::vector<double> _internalPoints[3];
- double _axisDirs[9];
+ double _axisDirs [9];
+ double _fixedPoint[3];
double _sizeThreshold;
bool _toAddEdges;
double _sizeThreshold;
bool _toAddEdges;