From 891bab04357e74fbf9204d824ba58bd4c7255164 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 31 Mar 2016 18:34:18 +0000
Subject: [PATCH] temp compile fix
---
Geo/GEdgeLoop.h | 3 ++-
Geo/GModelIO_MSH.cpp | 1 -
Numeric/CondNumBasis.cpp | 10 +++++-----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Geo/GEdgeLoop.h b/Geo/GEdgeLoop.h
index 84e6f149bc..845cd5d1a0 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 7cf835757f..848688c2fb 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 eb4f72e94b..e08e983b10 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);
--
GitLab