Commit 9e546b1d authored by Michael Turner's avatar Michael Turner
Browse files

bug fix and test changes

parent 0fe0983b
...@@ -959,8 +959,8 @@ void Octree::CompileSourcePointList() ...@@ -959,8 +959,8 @@ void Octree::CompileSourcePointList()
// these are the acutal number of sample points in each parametric // these are the acutal number of sample points in each parametric
// direction // direction
int nu = ceil(DeltaU / m_minDelta) * 2; int nu = ceil(DeltaU / m_minDelta) * 40 * 2;
int nv = ceil(DeltaV / m_minDelta) * 2; int nv = ceil(DeltaV / m_minDelta) * 40 * 2;
for (int j = 0; j < nu; j++) for (int j = 0; j < nu; j++)
{ {
......
...@@ -423,19 +423,19 @@ void InputMCF::Process() ...@@ -423,19 +423,19 @@ void InputMCF::Process()
module->RegisterConfig("maxiter", "10"); module->RegisterConfig("maxiter", "10");
module->RegisterConfig("numthreads", module->RegisterConfig("numthreads",
boost::lexical_cast<string>(np)); boost::lexical_cast<string>(np));
}
try try
{ {
module->SetDefaults(); module->SetDefaults();
module->Process(); module->Process();
} }
catch (runtime_error &e) catch (runtime_error &e)
{ {
cout << "Variational optimisation has failed with message:" << endl; cout << "Variational optimisation has failed with message:" << endl;
cout << e.what() << endl; cout << e.what() << endl;
cout << "The mesh will be written as is, it may be invalid" << endl; cout << "The mesh will be written as is, it may be invalid" << endl;
return; return;
}
} }
////**** SPLIT BL ****//// ////**** SPLIT BL ****////
...@@ -448,20 +448,22 @@ void InputMCF::Process() ...@@ -448,20 +448,22 @@ void InputMCF::Process()
module->RegisterConfig( module->RegisterConfig(
"nq", boost::lexical_cast<string>(m_mesh->m_nummode)); "nq", boost::lexical_cast<string>(m_mesh->m_nummode));
module->RegisterConfig("r", m_blprog); module->RegisterConfig("r", m_blprog);
}
try try
{ {
module->SetDefaults(); module->SetDefaults();
module->Process(); module->Process();
} }
catch (runtime_error &e) catch (runtime_error &e)
{ {
cout << "Boundary layer splitting has failed with message:" << endl; cout << "Boundary layer splitting has failed with message:" << endl;
cout << e.what() << endl; cout << e.what() << endl;
cout << "The mesh will be written as is, it may be invalid" << endl; cout << "The mesh will be written as is, it may be invalid" << endl;
return; return;
}
} }
} }
} }
} }
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
</INFORMATION> </INFORMATION>
<PARAMETERS> <PARAMETERS>
<P PARAM="MinDelta" VALUE="0.003" /> <P PARAM="MinDelta" VALUE="0.03" />
<P PARAM="MaxDelta" VALUE="0.2" /> <P PARAM="MaxDelta" VALUE="0.2" />
<P PARAM="EPS" VALUE="0.05" /> <P PARAM="EPS" VALUE="0.5" />
<P PARAM="Order" VALUE="4" /> <P PARAM="Order" VALUE="4" />
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
</INFORMATION> </INFORMATION>
<PARAMETERS> <PARAMETERS>
<P PARAM="MinDelta" VALUE="0.012" /> <P PARAM="MinDelta" VALUE="0.02" />
<P PARAM="MaxDelta" VALUE="0.5" /> <P PARAM="MaxDelta" VALUE="0.5" />
<P PARAM="EPS" VALUE="0.005" /> <P PARAM="EPS" VALUE="0.05" />
<P PARAM="Order" VALUE="4" /> <P PARAM="Order" VALUE="4" />
......
...@@ -7,9 +7,9 @@ ...@@ -7,9 +7,9 @@
</INFORMATION> </INFORMATION>
<PARAMETERS> <PARAMETERS>
<P PARAM="MinDelta" VALUE="0.01" /> <P PARAM="MinDelta" VALUE="0.05" />
<P PARAM="MaxDelta" VALUE="0.2" /> <P PARAM="MaxDelta" VALUE="0.2" />
<P PARAM="EPS" VALUE="0.01" /> <P PARAM="EPS" VALUE="0.03" />
<P PARAM="Order" VALUE="4" /> <P PARAM="Order" VALUE="4" />
</PARAMETERS> </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