From 465022b8782e6cfec9131ce472e4f84733431067 Mon Sep 17 00:00:00 2001
From: Jonathan Lambrechts <jonathan.lambrechts@uclouvain.be>
Date: Fri, 11 May 2012 08:31:58 +0000
Subject: [PATCH] OptHom : small tricks to improve python call to OptHom
---
contrib/HighOrderMeshOptimizer/OptHomMesh.cpp | 2 +-
contrib/HighOrderMeshOptimizer/OptHomRun.cpp | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/contrib/HighOrderMeshOptimizer/OptHomMesh.cpp b/contrib/HighOrderMeshOptimizer/OptHomMesh.cpp
index 53ced1d321..f386ff6854 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomMesh.cpp
+++ b/contrib/HighOrderMeshOptimizer/OptHomMesh.cpp
@@ -99,7 +99,7 @@ Mesh::Mesh(GEntity *ge, const std::set<MElement*> &els, std::set<MVertex*> &toFi
_pc = new ParamCoordSurf(_ge);
Msg::Debug("METHOD: Using surface parametric coordinates");
}
- Msg::Error("ERROR: Surface parametric coordinates only for 2D optimization");
+ else Msg::Error("ERROR: Surface parametric coordinates only for 2D optimization");
}
else {
_pc = new ParamCoordParent;
diff --git a/contrib/HighOrderMeshOptimizer/OptHomRun.cpp b/contrib/HighOrderMeshOptimizer/OptHomRun.cpp
index 38df043683..38bbc7b922 100644
--- a/contrib/HighOrderMeshOptimizer/OptHomRun.cpp
+++ b/contrib/HighOrderMeshOptimizer/OptHomRun.cpp
@@ -37,6 +37,8 @@ void OptHomMessage (const char *s, ...) {
FlGui::instance()->highordertools->messages->show();
}
}
+ else
+ fprintf(stdout,"%s\n",str);
#else
fprintf(stdout,"%s\n",str);
#endif
@@ -386,6 +388,8 @@ void HighOrderMeshOptimizer (GModel *gm, OptHomParameters &p)
method = Mesh::METHOD_PROJJAC;
else if (p.method == 2)
method = Mesh::METHOD_FIXBND | Mesh::METHOD_PHYSCOORD | Mesh::METHOD_PROJJAC;
+ else if(p.method < 0)
+ method = -p.method;
// printf("p.method = %d\n",p.method);
@@ -427,7 +431,7 @@ void HighOrderMeshOptimizer (GModel *gm, OptHomParameters &p)
temp.getJacDist(minJac, maxJac, distMaxBND, distAvgBND);
OptHomMessage("Optimizing a blob %i/%i composed of %4d elements minJ %12.5E -- maxJ %12.5E", i+1, toOptimizeSplit.size(), toOptimizeSplit[i].size(), minJac, maxJac);
p.SUCCESS = std::min(p.SUCCESS,temp.optimize(p.weightFixed, p.weightFree, p.BARRIER_MIN, p.BARRIER_MAX, samples, p.itMax));
- temp.mesh.updateGEntityPositions();
+ temp.mesh.updateGEntityPositions();
}
}
else while (1){
--
GitLab