diff --git a/Geo/GEdgeLoop.h b/Geo/GEdgeLoop.h index 84e6f149bc2cc6006c1f371656371c251d5bbd3f..845cd5d1a0f64d1563d92284d07c5850e9b21b80 100644 --- a/Geo/GEdgeLoop.h +++ b/Geo/GEdgeLoop.h @@ -8,8 +8,9 @@ #include "GEdge.h" -struct GEdgeSigned +class GEdgeSigned { + public: int _sign; GEdge *ge; GEdgeSigned(int i, GEdge *g) : _sign(i), ge(g) {} diff --git a/Geo/GModelIO_MSH.cpp b/Geo/GModelIO_MSH.cpp index 7cf835757f5ddbde1facf2e039cbec8e425bd308..848688c2fb4327bb1fae6e47440647d2c69ad61d 100644 --- a/Geo/GModelIO_MSH.cpp +++ b/Geo/GModelIO_MSH.cpp @@ -159,7 +159,6 @@ int GModel::readMSH(const std::string &name) char str[256] = ""; - // detect prehistoric MSH files if(!fgets(str, sizeof(str), fp)){ fclose(fp); return 0; } if(!strncmp(&str[1], "NOD", 3) || !strncmp(&str[1], "NOE", 3)){ diff --git a/Numeric/CondNumBasis.cpp b/Numeric/CondNumBasis.cpp index eb4f72e94b0db6a644447c59d3147e15160de300..e08e983b1071f891b93cad0b3e9b01854b30498e 100644 --- a/Numeric/CondNumBasis.cpp +++ b/Numeric/CondNumBasis.cpp @@ -405,7 +405,7 @@ inline void CondNumBasis::getInvCondNumGeneral(int nCondNumNodes, const fullMatrix<double> &nodesXYZ, const fullMatrix<double> &normals, fullVector<double> &condNum) const -{ +{ switch (_dim) { case 0 : { @@ -433,10 +433,10 @@ inline void CondNumBasis::getInvCondNumGeneral(int nCondNumNodes, } case 3 : { - if (ElementType::ParentTypeFromTag(_tag) == TYPE_TRIH){ + /* FIXME Amaury if (ElementType::ParentTypeFromTag(_tag) == TYPE_TRIH){ for (int i = 0; i < nCondNumNodes; i++) condNum(i) = 1.; break; - } + }*/ fullMatrix<double> dxyzdX(nCondNumNodes, 3), dxyzdY(nCondNumNodes, 3), dxyzdZ(nCondNumNodes, 3); gSMatX.mult(nodesXYZ, dxyzdX); gSMatY.mult(nodesXYZ, dxyzdY); @@ -530,7 +530,7 @@ inline void CondNumBasis::getInvCondNumAndGradientsGeneral(int nCondNumNodes, } case 3 : { - if (ElementType::ParentTypeFromTag(_tag) == TYPE_TRIH){ + /* FIXME Amaury if (ElementType::ParentTypeFromTag(_tag) == TYPE_TRIH){ for (int i = 0; i < nCondNumNodes; i++) { for (int j = 0; j < _nMapNodes; j++) { IDI(i,j) = 0.; @@ -540,7 +540,7 @@ inline void CondNumBasis::getInvCondNumAndGradientsGeneral(int nCondNumNodes, IDI(i,3*_nMapNodes) = 1.; } break; - } + }*/ fullMatrix<double> dxyzdX(nCondNumNodes,3), dxyzdY(nCondNumNodes,3), dxyzdZ(nCondNumNodes,3); gSMatX.mult(nodesXYZ, dxyzdX); gSMatY.mult(nodesXYZ, dxyzdY);