Skip to content
Snippets Groups Projects
Commit f21b0088 authored by Chris Cantwell's avatar Chris Cantwell
Browse files

Updated output, switched PPF tests to use Eigenvalue metric.

parent 5ff0db5b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 17 additions and 42 deletions
library/SolverUtils/DriverArpack.cpp
+ 4
− 6
View file @ f21b0088
......@@ -221,8 +221,6 @@ void DriverArpack::v_Execute(ostream &out)
out << endl;
for(int k = 0; k < m_kdim; ++k)
{
// write m_kdim eigs to screen
WriteEvs(out, k, workl[ipntr[5]-1+k],workl[ipntr[6]-1+k]);
// write m_kdim eigs to screen
WriteEvs(pFile,k, workl[ipntr[5]-1+k],workl[ipntr[6]-1+k]);
}
......@@ -344,8 +342,8 @@ void DriverArpack::v_Execute(ostream &out)
if(m_timeSteppingAlgorithm)
{
out << "EV Magnitude Angle Growth Frequency" << endl;
pFile << "EV Magnitude Angle Growth Frequency" << endl;
out << " Magnitude Angle Growth Frequency" << endl;
pFile << " Magnitude Angle Growth Frequency" << endl;
for(int i= 0; i< nconv; ++i)
{
WriteEvs(out,i,dr[i],di[i]);
......@@ -359,8 +357,8 @@ void DriverArpack::v_Execute(ostream &out)
}
else
{
out << "EV Real Imaginary " << endl;
pFile << "EV Real Imaginary " << endl;
out << " Real Imaginary " << endl;
pFile << " Real Imaginary " << endl;
for(int i= 0; i< nconv; ++i)
{
WriteEvs(out,i,dr[i],di[i],
......
library/SolverUtils/DriverModifiedArnoldi.cpp
+ 2
− 2
View file @ f21b0088
......@@ -423,12 +423,12 @@ int DriverModifiedArnoldi::EV_test(
evlout.setf(ios::scientific, ios::floatfield);
if(m_timeSteppingAlgorithm)
{
evlout << "EV Magnitude Angle Growth "
evlout << " Magnitude Angle Growth "
<< "Frequency Residual" << endl;
}
else
{
evlout << "EV Real Imaginary inverse real "
evlout << " Real Imaginary inverse real "
<< "inverse imag Residual" << endl;
}
......
solvers/IncNavierStokesSolver/Tests/PPF_R10000_Arpack_LM.tst
+ 3
− 7
View file @ f21b0088
......@@ -7,13 +7,9 @@
<file description="Session File">PPF_R10000.xml</file>
</files>
<metrics>
<metric type="L2" id="2">
<value variable="u" tolerance="0.00001">0.0409899</value>
<value variable="v" tolerance="0.00001">0.0168088</value>
</metric>
<metric type="Linf" id="1">
<value variable="u" tolerance="0.0001">0.0275149</value>
<value variable="v" tolerance="0.0001">0.0119663</value>
<metric type="Eigenvalue" id="0">
<value index="0" tolerance="0.001">-0.00024674,0</value>
<value index="1" tolerance="0.001">-0.00098696,0</value>
</metric>
</metrics>
</test>
......
solvers/IncNavierStokesSolver/Tests/PPF_R10000_ModifiedArnoldi_Shift.tst
+ 3
− 9
View file @ f21b0088
......@@ -7,15 +7,9 @@
<file description="Session File">PPF_R10000_3D.xml</file>
</files>
<metrics>
<metric type="L2" id="2">
<value variable="u" tolerance="0.0001">3.01846</value>
<value variable="v" tolerance="0.0001">1.8469</value>
<value variable="w" tolerance="0.0001">5.31914e-06</value>
</metric>
<metric type="Linf" id="1">
<value variable="u" tolerance="0.0001">2.25648</value>
<value variable="v" tolerance="0.0001">0.985804</value>
<value variable="w" tolerance="0.0001">1.08038e-05</value>
<metric type="Eigenvalue" id="0">
<value index="0" tolerance="0.001">0.518448,-26.6405</value>
<value index="1" tolerance="0.001">0.518448,26.6405</value>
</metric>
</metrics>
</test>
......
solvers/IncNavierStokesSolver/Tests/PPF_R15000_Arpack_NoImagShift.tst
+ 2
− 9
View file @ f21b0088
......@@ -7,15 +7,8 @@
<file description="Session File">PPF_R15000_3D.xml</file>
</files>
<metrics>
<metric type="L2" id="2">
<value variable="u" tolerance="0.0001">0.481905</value>
<value variable="v" tolerance="0.0001">0.231467</value>
<value variable="w" tolerance="0.0001">0.628925</value>
</metric>
<metric type="Linf" id="1">
<value variable="u" tolerance="0.0001">0.0901151</value>
<value variable="v" tolerance="0.0001">0.0507247</value>
<value variable="w" tolerance="0.0001">0.117699</value>
<metric type="Eigenvalue" id="0">
<value index="0" tolerance="0.001">-0.016749,0</value>
</metric>
</metrics>
</test>
......
solvers/IncNavierStokesSolver/Tests/PPF_R15000_Arpack_Shift.tst
+ 3
− 9
View file @ f21b0088
......@@ -7,15 +7,9 @@
<file description="Session File">PPF_R15000_3D.xml</file>
</files>
<metrics>
<metric type="L2" id="2">
<value variable="u" tolerance="0.0001">0.836151</value>
<value variable="v" tolerance="0.0001">0.283706</value>
<value variable="w" tolerance="0.0001">0.473301</value>
</metric>
<metric type="Linf" id="1">
<value variable="u" tolerance="0.0001">0.1450440</value>
<value variable="v" tolerance="0.0001">0.0463947</value>
<value variable="w" tolerance="0.0001">0.10873</value>
<metric type="Eigenvalue" id="0">
<value index="0" tolerance="0.001">-0.0339756,-0.184554</value>
<value index="1" tolerance="0.001">-0.0339756,-0.215446</value>
</metric>
</metrics>
</test>
......
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