From f4d67b247bbaf8232d5415d2a56fcb5e6b42cc44 Mon Sep 17 00:00:00 2001
From: Amaury Johnan <amjohnen@gmail.com>
Date: Mon, 21 Oct 2013 21:00:09 +0000
Subject: [PATCH] fix order node of high order prism
---
Common/OpenFile.cpp | 6 +++---
Geo/MPrism.h | 4 ++++
benchmarks/3d/sph.geo | 6 +++---
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp
index 9877fa365c..fa019fe1cc 100644
--- a/Common/OpenFile.cpp
+++ b/Common/OpenFile.cpp
@@ -451,11 +451,11 @@ int MergeFile(const std::string &fileName, bool warnIfMissing)
tmp->readMSH(fileName);
status = GeomMeshMatcher::instance()->match(tmp2, tmp);
delete tmp;
- GModel::setCurrent(tmp2);
- tmp2->setVisibility(1);
+ GModel::setCurrent(tmp2);
+ tmp2->setVisibility(1);
}
else
- status = GModel::current()->readMSH(fileName);
+ status = GModel::current()->readMSH(fileName);
#if defined(HAVE_POST)
if(status > 1) status = PView::readMSH(fileName);
#endif
diff --git a/Geo/MPrism.h b/Geo/MPrism.h
index 2b14f051da..dc9a8b9bff 100644
--- a/Geo/MPrism.h
+++ b/Geo/MPrism.h
@@ -494,6 +494,10 @@ class MPrismN : public MPrism {
}
return "";
}
+ virtual void reverse()
+ {
+ Msg::Error("Reverse not implemented yet for MPrismN");
+ }
virtual void getNode(int num, double &u, double &v, double &w) const
{
const fullMatrix<double> &p = getFunctionSpace()->points;
diff --git a/benchmarks/3d/sph.geo b/benchmarks/3d/sph.geo
index d4a6bb71a9..61f25d0e56 100644
--- a/benchmarks/3d/sph.geo
+++ b/benchmarks/3d/sph.geo
@@ -16,11 +16,11 @@ Circle(3) = {5,1,6};
Circle(4) = {2,1,3};
Circle(5) = {7,1,6};
Circle(6) = {4,1,3};
-Line(7) = {1,5};
+//Line(7) = {1,5};
Line(8) = {5,2};
-Line(9) = {1,6};
+//Line(9) = {1,6};
Line(10) = {6,3};
-Line(11) = {1,7};
+//Line(11) = {1,7};
Line(12) = {7,4};
Line Loop(17) = {2,-8,-1,12};
--
GitLab