Skip to content
Snippets Groups Projects
Commit f4d67b24 authored by Amaury Johnen's avatar Amaury Johnen
Browse files

fix order node of high order prism

parent c51b04dc
No related branches found
No related tags found
No related merge requests found
...@@ -451,11 +451,11 @@ int MergeFile(const std::string &fileName, bool warnIfMissing) ...@@ -451,11 +451,11 @@ int MergeFile(const std::string &fileName, bool warnIfMissing)
tmp->readMSH(fileName); tmp->readMSH(fileName);
status = GeomMeshMatcher::instance()->match(tmp2, tmp); status = GeomMeshMatcher::instance()->match(tmp2, tmp);
delete tmp; delete tmp;
GModel::setCurrent(tmp2); GModel::setCurrent(tmp2);
tmp2->setVisibility(1); tmp2->setVisibility(1);
} }
else else
status = GModel::current()->readMSH(fileName); status = GModel::current()->readMSH(fileName);
#if defined(HAVE_POST) #if defined(HAVE_POST)
if(status > 1) status = PView::readMSH(fileName); if(status > 1) status = PView::readMSH(fileName);
#endif #endif
......
...@@ -494,6 +494,10 @@ class MPrismN : public MPrism { ...@@ -494,6 +494,10 @@ class MPrismN : public MPrism {
} }
return ""; return "";
} }
virtual void reverse()
{
Msg::Error("Reverse not implemented yet for MPrismN");
}
virtual void getNode(int num, double &u, double &v, double &w) const virtual void getNode(int num, double &u, double &v, double &w) const
{ {
const fullMatrix<double> &p = getFunctionSpace()->points; const fullMatrix<double> &p = getFunctionSpace()->points;
......
...@@ -16,11 +16,11 @@ Circle(3) = {5,1,6}; ...@@ -16,11 +16,11 @@ Circle(3) = {5,1,6};
Circle(4) = {2,1,3}; Circle(4) = {2,1,3};
Circle(5) = {7,1,6}; Circle(5) = {7,1,6};
Circle(6) = {4,1,3}; Circle(6) = {4,1,3};
Line(7) = {1,5}; //Line(7) = {1,5};
Line(8) = {5,2}; Line(8) = {5,2};
Line(9) = {1,6}; //Line(9) = {1,6};
Line(10) = {6,3}; Line(10) = {6,3};
Line(11) = {1,7}; //Line(11) = {1,7};
Line(12) = {7,4}; Line(12) = {7,4};
Line Loop(17) = {2,-8,-1,12}; Line Loop(17) = {2,-8,-1,12};
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment