diff --git a/Geo/GModelIO_Mesh.cpp b/Geo/GModelIO_Mesh.cpp index 3953916624a2bc1e3d5678cea1591cd01263b29b..fe9ca232846c4df09a780522dfbbba1bbe34ed54 100644 --- a/Geo/GModelIO_Mesh.cpp +++ b/Geo/GModelIO_Mesh.cpp @@ -3499,9 +3499,6 @@ int GModel::writeINP(const std::string &name, bool saveAll, return 0; } - Msg::Error("Abaqus INP export has not been tested yet -- please give us" - "feedback!"); - if(noPhysicalGroups()) saveAll = true; indexMeshVertices(saveAll); diff --git a/Geo/MHexahedron.h b/Geo/MHexahedron.h index b54b3597a7457ecef2c31711b63e3eb92f32ad6d..d7cb5336c3bcead07e537af98193e3f4ab048d57 100644 --- a/Geo/MHexahedron.h +++ b/Geo/MHexahedron.h @@ -517,10 +517,6 @@ class MHexahedronN : public MHexahedron { virtual int getPolynomialOrder() const { return (int)_order; } virtual int getNumVertices() const { return 8 + _vs.size(); } virtual MVertex *getVertex(int num){ return num < 8 ? _v[num] : _vs[num - 8]; } - virtual MVertex *getVertexDIFF(int num) - { - throw; - } virtual int getNumEdgeVertices() const { return 12 * (_order - 1); } virtual int getNumFaceVertices() const { return 6 * (_order - 1)*(_order - 1); } virtual int getNumVolumeVertices() const { diff --git a/Geo/MTetrahedron.h b/Geo/MTetrahedron.h index f666db4a18903c99ed0caf04791614c964573044..93e2a93e0aaff5935e205d52b850f67327eece25 100644 --- a/Geo/MTetrahedron.h +++ b/Geo/MTetrahedron.h @@ -223,25 +223,19 @@ class MTetrahedron10 : public MTetrahedron { static const int map[10] = {0, 1, 2, 3, 4, 5, 6, 7, 9, 8}; return getVertex(map[num]); } - virtual MVertex *getVertexDIFF(int num) - { - static const int map[10] = {0, 1, 2, 3, 4, 5, 6, 7, 9, 8}; - return getVertex(map[num]); - } + virtual MVertex *getVertexDIFF(int num){ return getVertexBDF(num); } + virtual MVertex *getVertexINP(int num){ return getVertexBDF(num); } virtual int getNumEdgeVertices() const { return 6; } - virtual void getEdgeRep(int num, double *x, double *y, double *z, SVector3 *n); virtual int getNumEdgesRep(); virtual void getFaceRep(int num, double *x, double *y, double *z, SVector3 *n); virtual int getNumFacesRep(); - virtual void getEdgeVertices(const int num, std::vector<MVertex*> &v) const { v.resize(3); MTetrahedron::_getEdgeVertices(num, v); v[2] = _vs[num]; } - virtual void getFaceVertices(const int num, std::vector<MVertex*> &v) const { v.resize(6); diff --git a/benchmarks/stl/mobilette.geo b/benchmarks/stl/mobilette.geo index 8a10a2a6e5659e09535b01f90e59ec83ce95ee39..43a248c0cda24dd1e5a6d81d2756117209812b35 100644 --- a/benchmarks/stl/mobilette.geo +++ b/benchmarks/stl/mobilette.geo @@ -26,4 +26,5 @@ EndFor Surface Loop(1) = {s : s + #ss[]-1}; Volume(1) = {1}; -//Physical Surface(1) = {s : s + #ss[]-1}; +Physical Surface(1) = {s : s + #ss[]-1}; +Physical Volume(1) = 1;