Commit 316686bb authored by Michael Turner's avatar Michael Turner

start refinment lines

parent d5dbfabb
......@@ -1047,6 +1047,9 @@ void Octree::CompileSourcePointList()
cout << endl;
}
//vector<unsigned int> surfs;
//ParseUtils::GenerateSeqVector(surf.c_str(), surfs);
if (m_udsfileset)
{
if(m_mesh->m_verbose)
......
......@@ -117,7 +117,13 @@ void InputCAD::ParseFile(string nm)
}
}
<<<<<<< HEAD
map<string, string>::iterator it;
=======
set<string>
map<string,string>::iterator it;
>>>>>>> start refinment lines
it = information.find("CADFile");
ASSERTL0(it != information.end(), "no cadfile defined");
......@@ -256,10 +262,6 @@ void InputCAD::Process()
mods.back()->RegisterConfig("opti", "");
}
<<<<<<< HEAD
for (int i = 0; i < mods.size(); i++)
=======
////**** SPLIT BL ****////
if(m_splitBL)
{
......@@ -272,7 +274,6 @@ void InputCAD::Process()
}
for(int i = 0; i < mods.size(); i++)
>>>>>>> automatically split bl
{
mods[i]->Process();
}
......
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