Commit d89a1f8c authored by Kilian Lackhove's avatar Kilian Lackhove
Browse files

Merge branch 'fix/InputPts' into 'master'

Fix InputPts

See merge request !906
parents 150681e2 a79ae520
......@@ -14,7 +14,7 @@ v5.0.0
functionality in FUNCTIONs defined for forcings (!759)
- Add patch to tinyxml to fix size_t vs int bug (!820)
- Add ARPACK thirdparty build capabilities (!828)
- Added native support for csv files in addititon to pts (!760 !835)
- Added native support for csv files in addititon to pts (!760, !835, !906)
- Utilize LAPACK_DIR env variable to find the native blas/lapack install (!827)
- Remove StdExpansion use from MultiRegion (use Expansions instead). (!831)
- Move steady state check and CFL output from solvers to SolverUtils (!832)
......
......@@ -86,13 +86,13 @@ void InputPts::Process(po::variables_map &vm)
string inFile = m_config["infile"].as<string>();
// Determine appropriate field input
if (m_f->m_inputfiles.count("pts") != 0)
if (m_f->m_inputfiles.count("csv") != 0)
{
LibUtilities::CsvIOSharedPtr csvIO =
MemoryManager<LibUtilities::CsvIO>::AllocateSharedPtr(m_f->m_comm);
csvIO->Import(inFile, m_f->m_fieldPts);
}
else if (m_f->m_inputfiles.count("csv") != 0)
else if (m_f->m_inputfiles.count("pts") != 0)
{
LibUtilities::PtsIOSharedPtr ptsIO =
MemoryManager<LibUtilities::PtsIO>::AllocateSharedPtr(m_f->m_comm);
......
......@@ -32,6 +32,8 @@ ADD_NEKTAR_TEST(naca0012_bnd_equispacedoutput)
ADD_NEKTAR_TEST(smallmesh_isocontour)
ADD_NEKTAR_TEST(kovas2)
ADD_NEKTAR_TEST(chan3D_interppointdatatofld)
ADD_NEKTAR_TEST(chan3D_ptsTocsv)
ADD_NEKTAR_TEST(chan3D_csvTopts)
IF (NEKTAR_USE_MPI)
ADD_NEKTAR_TEST(chan3D_tec_par)
......
<?xml version="1.0" encoding="utf-8"?>
<test>
<description> Convert csv to pts </description>
<executable>FieldConvert</executable>
<parameters> -f -e chan3D_pts.csv chan3D_pts.pts</parameters>
<files>
<file description="Session File">chan3D_pts.csv</file>
</files>
<metrics>
<metric type="L2" id="1">
<value variable="x" tolerance="1e-6">1</value>
<value variable="y" tolerance="1e-6">1</value>
<value variable="z" tolerance="1e-6">1</value>
</metric>
</metrics>
</test>
<?xml version="1.0" encoding="utf-8"?>
<test>
<description> Convert pts to csv </description>
<executable>FieldConvert</executable>
<parameters> -f -e chan3D_pts.pts chan3D_pts.csv</parameters>
<files>
<file description="Session File">chan3D_pts.pts</file>
</files>
<metrics>
<metric type="L2" id="1">
<value variable="x" tolerance="1e-6">1</value>
<value variable="y" tolerance="1e-6">1</value>
<value variable="z" tolerance="1e-6">1</value>
<value variable="p" tolerance="1e-6">136931</value>
</metric>
</metrics>
</test>
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