Skip to content
Snippets Groups Projects
Commit 891bab04 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

temp compile fix

parent 9f8e302b
No related branches found
No related tags found
No related merge requests found
...@@ -8,8 +8,9 @@ ...@@ -8,8 +8,9 @@
#include "GEdge.h" #include "GEdge.h"
struct GEdgeSigned class GEdgeSigned
{ {
public:
int _sign; int _sign;
GEdge *ge; GEdge *ge;
GEdgeSigned(int i, GEdge *g) : _sign(i), ge(g) {} GEdgeSigned(int i, GEdge *g) : _sign(i), ge(g) {}
......
...@@ -159,7 +159,6 @@ int GModel::readMSH(const std::string &name) ...@@ -159,7 +159,6 @@ int GModel::readMSH(const std::string &name)
char str[256] = ""; char str[256] = "";
// detect prehistoric MSH files // detect prehistoric MSH files
if(!fgets(str, sizeof(str), fp)){ fclose(fp); return 0; } if(!fgets(str, sizeof(str), fp)){ fclose(fp); return 0; }
if(!strncmp(&str[1], "NOD", 3) || !strncmp(&str[1], "NOE", 3)){ if(!strncmp(&str[1], "NOD", 3) || !strncmp(&str[1], "NOE", 3)){
......
...@@ -405,7 +405,7 @@ inline void CondNumBasis::getInvCondNumGeneral(int nCondNumNodes, ...@@ -405,7 +405,7 @@ inline void CondNumBasis::getInvCondNumGeneral(int nCondNumNodes,
const fullMatrix<double> &nodesXYZ, const fullMatrix<double> &nodesXYZ,
const fullMatrix<double> &normals, const fullMatrix<double> &normals,
fullVector<double> &condNum) const fullVector<double> &condNum) const
{ {
switch (_dim) { switch (_dim) {
case 0 : { case 0 : {
...@@ -433,10 +433,10 @@ inline void CondNumBasis::getInvCondNumGeneral(int nCondNumNodes, ...@@ -433,10 +433,10 @@ inline void CondNumBasis::getInvCondNumGeneral(int nCondNumNodes,
} }
case 3 : { 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.; for (int i = 0; i < nCondNumNodes; i++) condNum(i) = 1.;
break; break;
} }*/
fullMatrix<double> dxyzdX(nCondNumNodes, 3), dxyzdY(nCondNumNodes, 3), dxyzdZ(nCondNumNodes, 3); fullMatrix<double> dxyzdX(nCondNumNodes, 3), dxyzdY(nCondNumNodes, 3), dxyzdZ(nCondNumNodes, 3);
gSMatX.mult(nodesXYZ, dxyzdX); gSMatX.mult(nodesXYZ, dxyzdX);
gSMatY.mult(nodesXYZ, dxyzdY); gSMatY.mult(nodesXYZ, dxyzdY);
...@@ -530,7 +530,7 @@ inline void CondNumBasis::getInvCondNumAndGradientsGeneral(int nCondNumNodes, ...@@ -530,7 +530,7 @@ inline void CondNumBasis::getInvCondNumAndGradientsGeneral(int nCondNumNodes,
} }
case 3 : { 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 i = 0; i < nCondNumNodes; i++) {
for (int j = 0; j < _nMapNodes; j++) { for (int j = 0; j < _nMapNodes; j++) {
IDI(i,j) = 0.; IDI(i,j) = 0.;
...@@ -540,7 +540,7 @@ inline void CondNumBasis::getInvCondNumAndGradientsGeneral(int nCondNumNodes, ...@@ -540,7 +540,7 @@ inline void CondNumBasis::getInvCondNumAndGradientsGeneral(int nCondNumNodes,
IDI(i,3*_nMapNodes) = 1.; IDI(i,3*_nMapNodes) = 1.;
} }
break; break;
} }*/
fullMatrix<double> dxyzdX(nCondNumNodes,3), dxyzdY(nCondNumNodes,3), dxyzdZ(nCondNumNodes,3); fullMatrix<double> dxyzdX(nCondNumNodes,3), dxyzdY(nCondNumNodes,3), dxyzdZ(nCondNumNodes,3);
gSMatX.mult(nodesXYZ, dxyzdX); gSMatX.mult(nodesXYZ, dxyzdX);
gSMatY.mult(nodesXYZ, dxyzdY); gSMatY.mult(nodesXYZ, dxyzdY);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment