Merge branch 'master' into fix/xml-output

CHANGELOG.md

@@ -24,6 +24,9 @@ v4.4.1
   when some part of the system fails (!756)
 - Add manifold meshing option (!756)
 
+**FieldConvert:**
+- Fix issue with field ordering in the interppointdatatofld module (!754)
+
 v4.4.0
 ------
 **Library**:

library/FieldUtils/ProcessModules/ProcessInterpPointDataToFld.cpp

@@ -91,7 +91,7 @@ void ProcessInterpPointDataToFld::Process(po::variables_map &vm)
     ASSERTL0(nFields > 0, "No field values provided in input");
 
     // assume one field is already defined from input file.
-    m_f->m_exp.resize(nFields + 1);
+    m_f->m_exp.resize(nFields);
     for (i = 1; i < nFields; ++i)
     {
         m_f->m_exp[i] = m_f->AppendExpList(0);
@@ -128,7 +128,7 @@ void ProcessInterpPointDataToFld::Process(po::variables_map &vm)
     {
         for (j = 0; j < nFields; ++j)
         {
-            m_f->m_exp[j]->SetPhys(i, outPts->GetPointVal(j, i));
+            m_f->m_exp[j]->SetPhys(i, outPts->GetPointVal(3 + j, i));
         }
     }
 

utilities/FieldConvert/CMakeLists.txt

@@ -31,6 +31,7 @@ ADD_NEKTAR_TEST(chan3D_isocontour)
 ADD_NEKTAR_TEST(interpfield)
 ADD_NEKTAR_TEST(naca0012_bnd_equispacedoutput)
 ADD_NEKTAR_TEST(smallmesh_isocontour)
+ADD_NEKTAR_TEST(chan3D_interppointdatatofld)
 
 IF (NEKTAR_USE_MPI)
     ADD_NEKTAR_TEST(chan3D_tec_par)

utilities/FieldConvert/Tests/chan3D_interppointdatatofld.tst

+<?xml version="1.0" encoding="utf-8"?>
+<test>
+    <description> Convert a .pts file to .fld </description>
+    <executable>FieldConvert</executable>
+    <parameters>-e -m interppointdatatofld chan3D.xml chan3D_pts.pts chan3D_pts.fld</parameters>
+    <files>
+        <file description="Session File">chan3D.xml</file>
+	<file description="Session File">chan3D_pts.pts</file>
+    </files>
+    <metrics>
+        <metric type="L2" id="1">
+            <value variable="p" tolerance="10">385033</value>
+        </metric>
+        <metric type="Linf" id="2">
+            <value variable="p" tolerance="10">175442</value>
+        </metric>
+    </metrics>
+</test>
+