Commit 09ae6ace authored by Michael Turner's avatar Michael Turner Committed by David Moxey
Browse files

bug fix and test changes

(cherry picked from commit 9e546b1d)
parent a28d6783
......@@ -959,8 +959,8 @@ void Octree::CompileSourcePointList()
// these are the acutal number of sample points in each parametric
// direction
int nu = ceil(DeltaU / m_minDelta) * 2;
int nv = ceil(DeltaV / m_minDelta) * 2;
int nu = ceil(DeltaU / m_minDelta) * 40 * 2;
int nv = ceil(DeltaV / m_minDelta) * 40 * 2;
for (int j = 0; j < nu; j++)
{
......
......@@ -432,19 +432,19 @@ void InputMCF::Process()
module->RegisterConfig("maxiter", "10");
module->RegisterConfig("numthreads",
boost::lexical_cast<string>(np));
}
try
{
module->SetDefaults();
module->Process();
}
catch (runtime_error &e)
{
cout << "Variational optimisation has failed with message:" << endl;
cout << e.what() << endl;
cout << "The mesh will be written as is, it may be invalid" << endl;
return;
try
{
module->SetDefaults();
module->Process();
}
catch (runtime_error &e)
{
cout << "Variational optimisation has failed with message:" << endl;
cout << e.what() << endl;
cout << "The mesh will be written as is, it may be invalid" << endl;
return;
}
}
////**** SPLIT BL ****////
......@@ -457,34 +457,22 @@ void InputMCF::Process()
module->RegisterConfig(
"nq", boost::lexical_cast<string>(m_mesh->m_nummode));
module->RegisterConfig("r", m_blprog);
}
try
{
vector<string> lines;
boost::split(lines, m_periodic, boost::is_any_of(":"));
for (vector<string>::iterator il = lines.begin(); il != lines.end();
++il)
try
{
module = GetModuleFactory().CreateInstance(
ModuleKey(eProcessModule, "peralign"), m_mesh);
vector<string> tmp(2);
boost::split(tmp, *il, boost::is_any_of(","));
module->RegisterConfig("surf1", tmp[0]);
module->SetDefaults();
module->Process();
}
catch (runtime_error &e)
{
cout << "Boundary layer splitting has failed with message:" << endl;
cout << e.what() << endl;
cout << "The mesh will be written as is, it may be invalid" << endl;
return;
}
module->SetDefaults();
module->Process();
}
catch (runtime_error &e)
{
cout << "Boundary layer splitting has failed with message:" << endl;
cout << e.what() << endl;
cout << "The mesh will be written as is, it may be invalid" << endl;
return;
}
}
}
}
......@@ -7,9 +7,9 @@
</INFORMATION>
<PARAMETERS>
<P PARAM="MinDelta" VALUE="0.003" />
<P PARAM="MinDelta" VALUE="0.03" />
<P PARAM="MaxDelta" VALUE="0.2" />
<P PARAM="EPS" VALUE="0.05" />
<P PARAM="EPS" VALUE="0.5" />
<P PARAM="Order" VALUE="4" />
......
......@@ -7,9 +7,9 @@
</INFORMATION>
<PARAMETERS>
<P PARAM="MinDelta" VALUE="0.012" />
<P PARAM="MinDelta" VALUE="0.02" />
<P PARAM="MaxDelta" VALUE="0.5" />
<P PARAM="EPS" VALUE="0.005" />
<P PARAM="EPS" VALUE="0.05" />
<P PARAM="Order" VALUE="4" />
......
......@@ -7,9 +7,9 @@
</INFORMATION>
<PARAMETERS>
<P PARAM="MinDelta" VALUE="0.01" />
<P PARAM="MinDelta" VALUE="0.05" />
<P PARAM="MaxDelta" VALUE="0.2" />
<P PARAM="EPS" VALUE="0.01" />
<P PARAM="EPS" VALUE="0.03" />
<P PARAM="Order" VALUE="4" />
</PARAMETERS>
......
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