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 'master' of https://codev-tuleap.cea.fr/plugins/git/salome/smesh
[modules/smesh.git]
/
src
/
DriverMED
/
DriverMED_W_SMESHDS_Mesh.h
diff --git
a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
index d817c3f276ad14a6da1c0b42fa80facf4a0c9fdb..e9f9d172c2964c59fc8d6be7e373876af65a4979 100644
(file)
--- a/
src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
+++ b/
src/DriverMED/DriverMED_W_SMESHDS_Mesh.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
14
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
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
@@
-30,7
+30,7
@@
#include "SMESH_DriverMED.hxx"
#include "Driver_SMESHDS_Mesh.h"
#include "SMESH_DriverMED.hxx"
#include "Driver_SMESHDS_Mesh.h"
-#include "MED_Common.hxx"
+
//
#include "MED_Common.hxx"
#include <string>
#include <list>
#include <string>
#include <list>
@@
-40,6
+40,7
@@
class SMESHDS_Mesh;
class SMESHDS_GroupBase;
class SMESHDS_SubMesh;
class SMESHDS_Mesh;
class SMESHDS_GroupBase;
class SMESHDS_SubMesh;
+class SMDS_MeshElement;
class MESHDRIVERMED_EXPORT DriverMED_W_SMESHDS_Mesh: public Driver_SMESHDS_Mesh
{
class MESHDRIVERMED_EXPORT DriverMED_W_SMESHDS_Mesh: public Driver_SMESHDS_Mesh
{
@@
-47,11
+48,11
@@
class MESHDRIVERMED_EXPORT DriverMED_W_SMESHDS_Mesh: public Driver_SMESHDS_Mesh
DriverMED_W_SMESHDS_Mesh();
DriverMED_W_SMESHDS_Mesh();
- virtual void SetFile(const std::string& theFileName);
- void SetFile(const std::string& theFileName, MED::EVersion theId);
+ void SetFile(const std::string& theFileName, int theVersion=-1);
void SetAutoDimension(bool toFindOutDimension) { myAutoDimension = toFindOutDimension; }
void SetAutoDimension(bool toFindOutDimension) { myAutoDimension = toFindOutDimension; }
+ void SetZTolerance(double tol) { myZTolerance = tol; }
- static std::string GetVersionString(
const MED::EVersion theVersion
, int theNbDigits=2);
+ static std::string GetVersionString(
int theMinor
, int theNbDigits=2);
void AddGroupOfNodes();
void AddGroupOfEdges();
void AddGroupOfNodes();
void AddGroupOfEdges();
@@
-59,6
+60,7
@@
class MESHDRIVERMED_EXPORT DriverMED_W_SMESHDS_Mesh: public Driver_SMESHDS_Mesh
void AddGroupOfVolumes();
void AddGroupOf0DElems();
void AddGroupOfBalls();
void AddGroupOfVolumes();
void AddGroupOf0DElems();
void AddGroupOfBalls();
+ void AddAllToGroup();
/*! functions to prepare adding one mesh
*/
/*! functions to prepare adding one mesh
*/
@@
-72,14
+74,16
@@
class MESHDRIVERMED_EXPORT DriverMED_W_SMESHDS_Mesh: public Driver_SMESHDS_Mesh
/*! add one mesh
*/
/*! add one mesh
*/
- virtual Status Perform();
+ Status Perform() override;
+
+ template<class LowLevelWriter>
+ Driver_Mesh::Status PerformInternal(LowLevelWriter myMed);
private:
private:
- MED::EVersion myMedVersion;
std::list<SMESHDS_GroupBase*> myGroups;
bool myAllSubMeshes;
std::list<SMESHDS_GroupBase*> myGroups;
bool myAllSubMeshes;
- std::
map<int,
SMESHDS_SubMesh*> mySubMeshes;
+ std::
vector<
SMESHDS_SubMesh*> mySubMeshes;
bool myDoGroupOfNodes;
bool myDoGroupOfEdges;
bool myDoGroupOfFaces;
bool myDoGroupOfNodes;
bool myDoGroupOfEdges;
bool myDoGroupOfFaces;
@@
-88,6
+92,20
@@
class MESHDRIVERMED_EXPORT DriverMED_W_SMESHDS_Mesh: public Driver_SMESHDS_Mesh
bool myDoGroupOfBalls;
bool myAutoDimension;
bool myAddODOnVertices;
bool myDoGroupOfBalls;
bool myAutoDimension;
bool myAddODOnVertices;
+ bool myDoAllInGroups;
+ int myVersion;
+ double myZTolerance;
+};
+
+#include "MEDCouplingMemArray.hxx"
+
+class MESHDRIVERMED_EXPORT DriverMED_W_SMESHDS_Mesh_Mem : public DriverMED_W_SMESHDS_Mesh
+{
+public:
+ Status Perform() override;
+ MEDCoupling::MCAuto<MEDCoupling::DataArrayByte> getData() { return _data; }
+private:
+ MEDCoupling::MCAuto<MEDCoupling::DataArrayByte> _data;
};
#endif
};
#endif