diff --git a/Geo/MLine.h b/Geo/MLine.h index f4c55d834cb8d94ca9e43f0025496d25219b0082..225c5271b9799f25465836a20c50aa5c500b6291 100644 --- a/Geo/MLine.h +++ b/Geo/MLine.h @@ -38,7 +38,7 @@ class MLine : public MElement { virtual int getDim() const { return 1; } virtual int getNumVertices() const { return 2; } virtual MVertex *getVertex(int num){ return _v[num]; } - virtual const MVertex *getVertex(int num) const{ return _v[num]; } + virtual const MVertex *getVertex(int num) const{ return _v[num]; } virtual void setVertex(int num, MVertex *v){ _v[num] = v; } virtual double getInnerRadius(); // half-length of segment line virtual double getLength(); // length of segment line @@ -69,7 +69,7 @@ class MLine : public MElement { virtual int getTypeForVTK() const { return 3; } virtual const char *getStringForPOS() const { return "SL"; } virtual const char *getStringForBDF() const { return "CBAR"; } - virtual const char *getStringForINP() const { return "C1D2"; } + virtual const char *getStringForINP() const { return "T3D2"/*"C1D2"*/; } virtual void revert() { MVertex *tmp = _v[0]; _v[0] = _v[1]; _v[1] = tmp; @@ -125,7 +125,7 @@ class MLine3 : public MLine { virtual int getPolynomialOrder() const { return 2; } virtual int getNumVertices() const { return 3; } virtual MVertex *getVertex(int num){ return num < 2 ? _v[num] : _vs[num - 2]; } - virtual const MVertex *getVertex(int num) const{ return num < 2 ? _v[num] : _vs[num - 2]; } + virtual const MVertex *getVertex(int num) const{ return num < 2 ? _v[num] : _vs[num - 2]; } virtual MVertex *getVertexUNV(int num) { static const int map[3] = {0, 2, 1}; @@ -151,7 +151,7 @@ class MLine3 : public MLine { virtual int getTypeForUNV() const { return 24; } // parabolic beam virtual int getTypeForVTK() const { return 21; } virtual const char *getStringForPOS() const { return "SL2"; } - virtual const char *getStringForINP() const { return "C1D3"; } + virtual const char *getStringForINP() const { return "T3D3"/*"C1D3"*/; } virtual void getNode(int num, double &u, double &v, double &w) const { num < 2 ? MLine::getNode(num, u, v, w) : MElement::getNode(num, u, v, w); diff --git a/Geo/MQuadrangle.h b/Geo/MQuadrangle.h index 1422d1ab8456b39e3e7b165539aa6632e20385b7..8dcc7fca8f79f527be65ec19fc5e50b48b8a09e4 100644 --- a/Geo/MQuadrangle.h +++ b/Geo/MQuadrangle.h @@ -56,7 +56,7 @@ class MQuadrangle : public MElement { virtual int getDim() const { return 2; } virtual int getNumVertices() const { return 4; } virtual MVertex *getVertex(int num){ return _v[num]; } - virtual const MVertex *getVertex(int num) const{ return _v[num]; } + virtual const MVertex *getVertex(int num) const{ return _v[num]; } virtual void setVertex(int num, MVertex *v){ _v[num] = v; } virtual MVertex *getVertexDIFF(int num) { @@ -116,7 +116,7 @@ class MQuadrangle : public MElement { virtual const char *getStringForPOS() const { return "SQ"; } virtual const char *getStringForBDF() const { return "CQUAD4"; } virtual const char *getStringForDIFF() const { return "ElmB4n2D"; } - virtual const char *getStringForINP() const { return "C2D4"; } + virtual const char *getStringForINP() const { return "CPS4"/*"C2D4"*/; } virtual const nodalBasis* getFunctionSpace(int o=-1) const; virtual const JacobianBasis* getJacobianFuncSpace(int o=-1) const; virtual void getNode(int num, double &u, double &v, double &w) const @@ -200,7 +200,7 @@ class MQuadrangle8 : public MQuadrangle { virtual int getPolynomialOrder() const { return 2; } virtual int getNumVertices() const { return 8; } virtual MVertex *getVertex(int num){ return num < 4 ? _v[num] : _vs[num - 4]; } - virtual const MVertex *getVertex(int num) const { return num < 4 ? _v[num] : _vs[num - 4]; } + virtual const MVertex *getVertex(int num) const { return num < 4 ? _v[num] : _vs[num - 4]; } virtual MVertex *getVertexUNV(int num) { static const int map[8] = {0, 4, 1, 5, 2, 6, 3, 7}; @@ -236,7 +236,7 @@ class MQuadrangle8 : public MQuadrangle { virtual int getTypeForVTK() const { return 23; } virtual const char *getStringForBDF() const { return "CQUAD8"; } virtual const char *getStringForDIFF() const { return "ElmB8n2D"; } - virtual const char *getStringForINP() const { return "C2D8"; } + virtual const char *getStringForINP() const { return "CPS8"/*"C2D8"*/; } virtual void revert() { MVertex *tmp; diff --git a/Geo/MTriangle.h b/Geo/MTriangle.h index ea6e66bc647563134cd09c761348a1230712957f..98ab2435fef07b218a00df45172a8ca3e95b9606 100644 --- a/Geo/MTriangle.h +++ b/Geo/MTriangle.h @@ -119,7 +119,7 @@ class MTriangle : public MElement { virtual const char *getStringForPOS() const { return "ST"; } virtual const char *getStringForBDF() const { return "CTRIA3"; } virtual const char *getStringForDIFF() const { return "ElmT3n2D"; } - virtual const char *getStringForINP() const { return "C2D3"; } + virtual const char *getStringForINP() const { return "CPS3"/*"STRI3"*//*"C2D3"*/; } virtual void revert() { MVertex *tmp = _v[1]; _v[1] = _v[2]; _v[2] = tmp; @@ -194,7 +194,7 @@ class MTriangle6 : public MTriangle { virtual int getPolynomialOrder() const { return 2; } virtual int getNumVertices() const { return 6; } virtual MVertex *getVertex(int num){ return num < 3 ? _v[num] : _vs[num - 3]; } - virtual const MVertex *getVertex(int num) const { return num < 3 ? _v[num] : _vs[num - 3]; } + virtual const MVertex *getVertex(int num) const { return num < 3 ? _v[num] : _vs[num - 3]; } virtual MVertex *getVertexUNV(int num) { static const int map[6] = {0, 3, 1, 4, 2, 5}; @@ -226,7 +226,7 @@ class MTriangle6 : public MTriangle { virtual const char *getStringForPOS() const { return "ST2"; } virtual const char *getStringForBDF() const { return "CTRIA6"; } virtual const char *getStringForDIFF() const { return "ElmT6n2D"; } - virtual const char *getStringForINP() const { return "C2D6"; } + virtual const char *getStringForINP() const { return "CPS6"/*"STRI65"*//*"C2D6"*/; } virtual void revert() { MVertex *tmp;