From dbbf69273d05f8b3b67c107f2193bfc88d2ea12b Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 15 Oct 2010 10:44:01 +0000
Subject: [PATCH] fix compile
---
Mesh/Generator.cpp | 4 ++--
Mesh/HighOrder.cpp | 8 +++++---
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Mesh/Generator.cpp b/Mesh/Generator.cpp
index 95d932e49d..1f750f869d 100644
--- a/Mesh/Generator.cpp
+++ b/Mesh/Generator.cpp
@@ -450,13 +450,13 @@ static void Mesh2D(GModel *m)
while(1){
meshGFace mesher;
int nbPending = 0;
- for(GModel::fiter it = f.begin(); it != f.end(); ++it){
+ for(std::set<GFace*>::iterator it = f.begin(); it != f.end(); ++it){
if ((*it)->meshStatistics.status == GFace::PENDING){
mesher(*it);
nbPending++;
}
}
- for(GModel::fiter it = cf.begin(); it != cf.end(); ++it){
+ for(std::set<GFace*>::iterator = cf.begin(); it != cf.end(); ++it){
if ((*it)->meshStatistics.status == GFace::PENDING){
mesher(*it);
nbPending++;
diff --git a/Mesh/HighOrder.cpp b/Mesh/HighOrder.cpp
index c95bf5618a..1417a619cb 100644
--- a/Mesh/HighOrder.cpp
+++ b/Mesh/HighOrder.cpp
@@ -35,7 +35,8 @@ static bool mappingIsInvertible(MTetrahedron *e)
fullMatrix<double> df;
{
- const fullMatrix<double> &alldf = e->getGradShapeFunctionsAtIntegrationPoints(e->getPolynomialOrder());
+ const fullMatrix<double> &alldf =
+ e->getGradShapeFunctionsAtIntegrationPoints(e->getPolynomialOrder());
for (int i = 0; i < alldf.size2()/3; i++){
df.setAsProxy(alldf, 3*i, 3);
e->getJacobian(df, mat);
@@ -44,7 +45,8 @@ static bool mappingIsInvertible(MTetrahedron *e)
}
{
const fullMatrix<double> &points = e->getFunctionSpace()->points;
- const fullMatrix<double> &alldf = e->getGradShapeFunctionsAtNodes(e->getPolynomialOrder());
+ const fullMatrix<double> &alldf =
+ e->getGradShapeFunctionsAtNodes(e->getPolynomialOrder());
double gradShapeFunctions[300][3];
for (int i = 0; i < alldf.size2()/3; i++){
df.setAsProxy(alldf, 3*i, 3);
@@ -476,7 +478,7 @@ static void reorientTrianglePoints(std::vector<MVertex*> &vtcs, int orientation,
int nbPts = vtcs.size();
if (nbPts <= 1) return;
std::vector<MVertex*> tmp(nbPts);
- int interiorOrder = (int)((sqrt(1+8*nbPts)-3)/2);
+ int interiorOrder = (int)((sqrt(1. + 8. * nbPts) - 3) / 2);
int pos = 0;
for (int o = interiorOrder; o>0; o-=3) {
if (swap) {
--
GitLab