Fix AdaptiveSFD for MPI

CHANGELOG.md

@@ -7,6 +7,7 @@ v5.7.0
 - Fix memory-leak with LowEnergyBlock preconditioner for time-updated matrices (!1627)
 - Fix Fourier expansion integration weights are related test (!1803)
 - Separate MeshGraph input/output functions into a new class (!1778)
+- Fix AdaptiveSFD for MPI (!1821)
 
 **IncNavierStokesSolver**
 - Fix initial and boundary conditions in the moving reference frame (!1692)

library/SolverUtils/Driver.cpp

@@ -150,30 +150,39 @@ void Driver::v_InitObject(ostream &out)
                 break;
             case eAdaptiveSFD:
             {
-                // Coupling SFD method and Arnoldi algorithm
-                // For having 2 equation systems defined into 2 different
-                // session files (with the mesh into a file named 'session'.gz)
-                string LinNSCondFile;
-                vector<string> LinNSFilename;
-
-                // assume that the conditions file is the last
-                // filename on intiialisation and so copy all other
-                // files to new session. This will include the mesh
-                // file and possibly the optimsaiton file
-                for (int i = 0; i < m_session->GetFilenames().size() - 1; ++i)
+                // use-opt-file
+                bool useOptFile =
+                    m_session->DefinesCmdLineArgument("use-opt-file");
+                std::string optfilename =
+                    useOptFile ? m_session->GetFilenames()[0] : "";
+
+                char *argv[] = {const_cast<char *>("IncNavierStokesSolver"),
+                                const_cast<char *>("--use-opt-file"),
+                                const_cast<char *>(optfilename.c_str()),
+                                nullptr};
+
+                size_t argc = useOptFile ? 3 : 1;
+
+                std::vector<std::string> LinNSFilename;
+                if (m_comm->GetSize() == 1)
                 {
-                    LinNSFilename.push_back(m_session->GetFilenames()[i]);
+                    // Use .xml.gz file for serial case
+                    LinNSFilename.push_back(m_session->GetSessionName() +
+                                            ".xml.gz");
                 }
+                else
+                {
+                    // Use previous partition for parallel case
+                    LinNSFilename.push_back(m_session->GetSessionName() +
+                                            "_xml");
+                }
+                LinNSFilename.push_back(m_session->GetSessionName() +
+                                        "_LinNS.xml");
 
-                LinNSCondFile = m_session->GetSessionName();
-                LinNSCondFile += "_LinNS.xml";
-                LinNSFilename.push_back(LinNSCondFile);
-
-                char *argv[]  = {const_cast<char *>("IncNavierStokesSolver"),
-                                 nullptr};
                 session_LinNS = LibUtilities::SessionReader::CreateInstance(
-                    1, argv, LinNSFilename, m_comm);
+                    argc, argv, LinNSFilename, m_comm);
 
+                // Set graph for LinNs solver.
                 SpatialDomains::MeshGraphSharedPtr graph_linns =
                     SpatialDomains::MeshGraphIO::Read(session_LinNS);
 

solvers/IncNavierStokesSolver/CMakeLists.txt

@@ -262,6 +262,7 @@ IF( NEKTAR_SOLVER_INCNAVIERSTOKES )
         ADD_NEKTAR_TEST(FlapAirfoil_3DH1D_par LENGTHY)
         ADD_NEKTAR_TEST(PlungingAirfoil_3DH1D_parBCs LENGTHY)
         ADD_NEKTAR_TEST(ChanFlow_m8_BodyForce_par LENGTHY)
+        ADD_NEKTAR_TEST(Cyl_AdaptiveSFD_par)
 
         IF(NOT WIN32)
             ADD_NEKTAR_TEST(KovaFlow_expFromFile_par)

solvers/IncNavierStokesSolver/Tests/Cyl_AdaptiveSFD_LinNS.xml

@@ -52,7 +52,8 @@
             </REGION>
         </BOUNDARYCONDITIONS>
         <FUNCTION NAME="InitialConditions">
-            <F VAR="u,v,p" FILE="Cyl_AdaptiveSFD_Eig.rst"/>
+            <F VAR="u,v" FILE="Cyl_AdaptiveSFD_Eig.rst"/>
+            <E VAR="p" VALUE="0.0"/>
         </FUNCTION>
         <FUNCTION NAME="BaseFlow">
             <E VAR="u" VALUE="1.0"/>

solvers/IncNavierStokesSolver/Tests/Cyl_AdaptiveSFD_par.tst

+<?xml version="1.0" encoding="utf-8"?>
+<test>
+    <description>2D cylinder flow, mixed elements, P=5</description>
+    <executable>IncNavierStokesSolver</executable>
+    <parameters>Cyl_AdaptiveSFD.xml.gz Cyl_AdaptiveSFD.xml</parameters>
+    <processes> 2 </processes>
+    <files>
+        <file description="Session File">Cyl_AdaptiveSFD.xml.gz</file>
+        <file description="Session File">Cyl_AdaptiveSFD.xml</file>
+        <file description="Session File">Cyl_AdaptiveSFD_LinNS.xml</file>
+        <file description="Session File">Cyl_AdaptiveSFD.rst</file>
+        <file description="Session File">Cyl_AdaptiveSFD_Eig.rst</file>
+    </files>
+    <metrics>
+        <metric type="L2" id="1">
+            <value variable="u" tolerance="1e-8">0.241485</value>
+            <value variable="v" tolerance="1e-8">0.254726</value>
+            <value variable="p" tolerance="1e-4">0.0726467</value>
+        </metric>
+        <metric type="Linf" id="2">
+            <value variable="u" tolerance="1e-8">0.0829632</value>
+            <value variable="v" tolerance="1e-8">0.0752455</value>
+            <value variable="p" tolerance="1e-8">0.0251153</value>
+        </metric>
+    </metrics>
+</test>