Commit c4eaf3f7 authored by Douglas Serson's avatar Douglas Serson

Merge branch 'master' into feature/tidy-timer

parents 43db0488 e97a170a
......@@ -8,6 +8,7 @@ v5.0.0
expansion in pyramids (!750)
- Significant overhaul of CMake infrastructure (!770, !804)
- Fix ThridpartyCCM options (!802)
- Fix Windows CRLF tokens in GEO reader and improve comment handling (!805)
- Use chrono in Timer (!807)
**NekMesh**:
......
......@@ -57,9 +57,9 @@ bool CADSystemOCE::LoadCAD()
{
if (m_naca.size() == 0)
{
//not a naca profile behave normally
//could be a geo
string ext = boost::filesystem::extension(m_name);
// not a naca profile behave normally
// could be a geo
string ext = boost::filesystem::extension(m_name);
if (boost::iequals(ext, ".geo"))
{
......@@ -422,15 +422,11 @@ TopoDS_Shape CADSystemOCE::BuildGeo(string geo)
{
getline(f, fline);
if (fline.size() == 0)
{
continue;
}
boost::erase_all(fline, "\r");
if (boost::starts_with(fline, "//"))
{
continue;
}
vector<string> tmp1, tmp2;
boost::split(tmp1, fline, boost::is_any_of("//"));
fline = tmp1[0];
if (!boost::contains(fline, ";"))
{
......@@ -441,7 +437,6 @@ TopoDS_Shape CADSystemOCE::BuildGeo(string geo)
fline = flinetmp + fline;
flinetmp.clear();
vector<string> tmp1, tmp2;
boost::split(tmp1, fline, boost::is_any_of("="));
boost::split(tmp2, tmp1[0], boost::is_any_of("("));
......@@ -472,9 +467,9 @@ TopoDS_Shape CADSystemOCE::BuildGeo(string geo)
}
else if (boost::iequals(type, "Line Loop"))
{
//line loops sometimes have negative entries for gmsh
//orientaton purposes
//we dont care so remove it
// line loops sometimes have negative entries for gmsh
// orientaton purposes
// we dont care so remove it
boost::erase_all(var, "-");
loops[id] = var;
}
......@@ -561,6 +556,5 @@ TopoDS_Shape CADSystemOCE::BuildGeo(string geo)
return sf.Face();
}
}
}
......@@ -59,7 +59,7 @@ public:
NodeOpti(NodeSharedPtr n, std::vector<ElUtilSharedPtr> e,
ResidualSharedPtr r,
std::map<LibUtilities::ShapeType, DerivUtilSharedPtr> d,
optiType o)
optiType o, int dim)
: m_node(n), m_res(r), m_derivUtils(d), m_opti(o)
{
// filter element types within d vector
......@@ -79,12 +79,12 @@ public:
const int nElmt = typeIt->second.size();
storageCount = std::max(storageCount,
3 * m_derivUtils[typeIt->first]->ptsStd *
dim * m_derivUtils[typeIt->first]->ptsStd *
typeIt->second.size());
m_derivs.insert(std::make_pair(
typeIt->first,
DerivArray(boost::extents[3][nElmt][3][pts])));
DerivArray(boost::extents[dim][nElmt][dim][pts])));
}
m_tmpStore.resize(storageCount);
......@@ -148,7 +148,7 @@ public:
ResidualSharedPtr r,
std::map<LibUtilities::ShapeType, DerivUtilSharedPtr> d,
optiType o)
: NodeOpti(n, e, r, d, o)
: NodeOpti(n, e, r, d, o, 3)
{
}
......@@ -174,7 +174,7 @@ public:
ResidualSharedPtr r,
std::map<LibUtilities::ShapeType, DerivUtilSharedPtr> d,
optiType o)
: NodeOpti(n, e, r, d, o)
: NodeOpti(n, e, r, d, o, 2)
{
}
......
......@@ -52,7 +52,7 @@ public:
ResidualSharedPtr r,
std::map<LibUtilities::ShapeType, DerivUtilSharedPtr> d,
optiType o, CADCurveSharedPtr c)
: NodeOpti(n, e, r, d, o), curve(c)
: NodeOpti(n, e, r, d, o, 3), curve(c)
{
}
......@@ -81,7 +81,7 @@ public:
ResidualSharedPtr r,
std::map<LibUtilities::ShapeType, DerivUtilSharedPtr> d,
optiType o, CADSurfSharedPtr s)
: NodeOpti(n, e, r, d, o), surf(s)
: NodeOpti(n, e, r, d, o, 3), surf(s)
{
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment