Commit 0cb0e719 authored by Michael Turner's avatar Michael Turner
Browse files

trying to fix blrg

parent 154e7e02
......@@ -1263,8 +1263,8 @@ void FaceMesh::OrientateCurves()
N[1] = (n2info[0] - n1info[0]) / mag;
Array<OneD, NekDouble> P(2);
P[0] = (n1info[0] + n2info[0]) / 2.0 + 1e-8 * N[0];
P[1] = (n1info[1] + n2info[1]) / 2.0 + 1e-8 * N[1];
P[0] = (n1info[0] + n2info[0]) / 2.0 + 1e-4 * N[0];
P[1] = (n1info[1] + n2info[1]) / 2.0 + 1e-4 * N[1];
// now test to see if p is inside or outside the shape
// vector to the right
......@@ -1308,8 +1308,8 @@ void FaceMesh::OrientateCurves()
}
if (intercepts % 2 == 0)
{
P[0] = (n1info[0] + n2info[0]) / 2.0 - 1e-6 * N[0];
P[1] = (n1info[1] + n2info[1]) / 2.0 - 1e-6 * N[1];
P[0] = (n1info[0] + n2info[0]) / 2.0 - 1e-4 * N[0];
P[1] = (n1info[1] + n2info[1]) / 2.0 - 1e-4 * N[1];
intercepts = 0;
for (int j = 0; j < orderedLoops[i].size() - 1; j++)
{
......
......@@ -132,7 +132,8 @@ void SurfaceMesh::Process()
{
if((*it)->m_elLink.size() != 2)
{
ASSERTL0(false,"mesh connectivity error");
cout << (*it)->m_elLink.size() << endl;
//ASSERTL0(false,"mesh connectivity error");
}
}
......
......@@ -313,7 +313,7 @@ void InputMCF::Process()
ModuleKey(eProcessModule, "surfacemesh"), m_mesh));
////**** VolumeMesh ****////
mods.push_back(GetModuleFactory().CreateInstance(
/*mods.push_back(GetModuleFactory().CreateInstance(
ModuleKey(eProcessModule, "volumemesh"), m_mesh));
if(m_makeBL)
{
......@@ -321,11 +321,11 @@ void InputMCF::Process()
mods.back()->RegisterConfig("blthick",m_blthick);
mods.back()->RegisterConfig("bllayers",m_bllayers);
mods.back()->RegisterConfig("blprog",m_blprog);
}
}*/
}
////**** HOSurface ****////
mods.push_back(GetModuleFactory().CreateInstance(
/*mods.push_back(GetModuleFactory().CreateInstance(
ModuleKey(eProcessModule, "hosurface"), m_mesh));
if (m_surfopti)
{
......@@ -333,7 +333,7 @@ void InputMCF::Process()
}
////*** VARIATIONAL OPTIMISATION ****////
if(m_varopti)
/*if(m_varopti)
{
unsigned int np = boost::thread::physical_concurrency();
if(m_mesh->m_verbose)
......@@ -348,7 +348,7 @@ void InputMCF::Process()
}
////**** SPLIT BL ****////
if(m_splitBL)
/*if(m_splitBL)
{
mods.push_back(GetModuleFactory().CreateInstance(
ModuleKey(eProcessModule, "bl"), m_mesh));
......@@ -356,13 +356,15 @@ void InputMCF::Process()
mods.back()->RegisterConfig("surf",m_blsurfs);
mods.back()->RegisterConfig("nq",boost::lexical_cast<string>(m_mesh->m_nummode));
mods.back()->RegisterConfig("r",m_blprog);
}
}*/
for(int i = 0; i < mods.size(); i++)
{
mods[i]->SetDefaults();
mods[i]->Process();
}
m_mesh->m_expDim = 2;
}
}
}
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