Commit a7ef121d authored by Chris Cantwell's avatar Chris Cantwell

Reverted command-line argument changes to time-int demo for consistency.

parent e17121e2
Pipeline #1257 failed with stage
in 0 seconds
......@@ -2,7 +2,7 @@
<test>
<description>Test for time integration schemes</description>
<executable>TimeIntegrationDemo</executable>
<parameters>--Npoints 100 --Ntimesteps 100 --TimeIntegrationMethod 8</parameters>
<parameters>--points 100 --timesteps 100 --method 8</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.10135</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Test for time integration schemes</description>
<executable>TimeIntegrationDemo</executable>
<parameters>--Npoints 100 --Ntimesteps 100 --TimeIntegrationMethod 5</parameters>
<parameters>--points 100 --timesteps 100 --method 5</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.0616905</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Test for time integration schemes</description>
<executable>TimeIntegrationDemo</executable>
<parameters>--Npoints 100 --Ntimesteps 100 --TimeIntegrationMethod 6</parameters>
<parameters>--points 100 --timesteps 100 --method 6</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.061634</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Test for time integration schemes</description>
<executable>TimeIntegrationDemo</executable>
<parameters>--Npoints 100 --Ntimesteps 100 --TimeIntegrationMethod 7</parameters>
<parameters>--points 100 --timesteps 100 --method 7</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.499518</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Test for time integration schemes</description>
<executable>TimeIntegrationDemo</executable>
<parameters>--Npoints 100 --Ntimesteps 100 --TimeIntegrationMethod 1</parameters>
<parameters>--points 100 --timesteps 100 --method 1</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.224678</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Test for time integration schemes</description>
<executable>TimeIntegrationDemo</executable>
<parameters>--Npoints 100 --Ntimesteps 100 --TimeIntegrationMethod 2</parameters>
<parameters>--points 100 --timesteps 100 --method 2</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.0789181</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Test for time integration schemes</description>
<executable>TimeIntegrationDemo</executable>
<parameters>--Npoints 100 --Ntimesteps 100 --TimeIntegrationMethod 3</parameters>
<parameters>--points 100 --timesteps 100 --method 3</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.0610636</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Test for time integration schemes</description>
<executable>TimeIntegrationDemo</executable>
<parameters>--Npoints 100 --Ntimesteps 100 --TimeIntegrationMethod 4</parameters>
<parameters>--points 100 --timesteps 100 --method 4</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.0615357</value>
......
......@@ -2,7 +2,7 @@
<test>
<description>Test for time integration schemes</description>
<executable>TimeIntegrationDemo</executable>
<parameters>--Npoints 100 --Ntimesteps 100 --TimeIntegrationMethod 9</parameters>
<parameters>--points 100 --timesteps 100 --method 9</parameters>
<metrics>
<metric type="L2" id="1">
<value tolerance="1e-12">0.134315</value>
......
......@@ -193,12 +193,12 @@ int main( int argc, char *argv[] )
po::options_description desc("Usage:");
desc.add_options()
("help,h", "Produce this help message.")
("Npoints,p", po::value<int>(),
("points,p", po::value<int>(),
"Number of grid points to be used.")
("Ntimesteps,t", po::value<int>(),
("timesteps,t", po::value<int>(),
"Number of timesteps to be used.")
("TimeIntegrationMethod,m", po::value<int>(),
"TimeIntegrationMethod is a number in the range [1,8].\n"
("method,m", po::value<int>(),
"TimeIntegrationMethod is a number in the range [1,9].\n"
"It defines the time-integration method to be used:\n"
"- 1: 1st order multi-step IMEX scheme\n"
" (Euler Backwards/Euler Forwards)\n"
......@@ -226,16 +226,16 @@ int main( int argc, char *argv[] )
return 1;
}
if( !vm.count("Npoints") || !vm.count("Ntimesteps") || !vm.count("TimeIntegrationMethod") || vm.count("help") )
if( !vm.count("points") || !vm.count("timesteps") || !vm.count("method") || vm.count("help") )
{
cout << "Please specify points, timesteps and method.\n\n";
cout << desc;
return 1;
}
int nPoints = vm["Npoints"].as<int>();
int nTimesteps = vm["Ntimesteps"].as<int>();
int nMethod = vm["TimeIntegrationMethod"].as<int>();
int nPoints = vm["points"].as<int>();
int nTimesteps = vm["timesteps"].as<int>();
int nMethod = vm["method"].as<int>();
// Open a file for writing the solution
ofstream outfile;
......
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