diff --git a/Common/OpenFile.cpp b/Common/OpenFile.cpp index 9877fa365cb59e09b61f14903d4474ac2bc19931..fa019fe1cc19f80a3095c30d4fcf46a1c6d8901a 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 2b14f051dad0ce1651ef18b6d43b0cf2047911b3..dc9a8b9bff9278da79bc87207ba9189970f0019d 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 d4a6bb71a9acd0052f4c8d6c050d8d4dc16eeb86..61f25d0e5635a3a502a7df92363de904c8788c89 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};