Further bug fixes after rebase

awslabs · Jul 14, 2023 · cc43db8 · cc43db8
1 parent 9327a58
commit cc43db8
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 8 deletions.
diff --git a/palace/linalg/distrelaxation.cpp b/palace/linalg/distrelaxation.cpp
@@ -4,7 +4,7 @@
 #include "distrelaxation.hpp"
 
 #include <mfem.hpp>
-#include <general/forall.hpp>
+#include <mfem/general/forall.hpp>
 #include "linalg/chebyshev.hpp"
 #include "linalg/rap.hpp"
 

diff --git a/palace/linalg/jacobi.cpp b/palace/linalg/jacobi.cpp
@@ -3,7 +3,7 @@
 
 #include "jacobi.hpp"
 
-#include <general/forall.hpp>
+#include <mfem/general/forall.hpp>
 
 namespace palace
 {

diff --git a/palace/linalg/operator.cpp b/palace/linalg/operator.cpp
@@ -3,7 +3,7 @@
 
 #include "operator.hpp"
 
-#include <general/forall.hpp>
+#include <mfem/general/forall.hpp>
 #include "linalg/slepc.hpp"
 #include "utils/communication.hpp"
 

diff --git a/palace/linalg/rap.cpp b/palace/linalg/rap.cpp
@@ -3,7 +3,7 @@
 
 #include "rap.hpp"
 
-#include <general/forall.hpp>
+#include <mfem/general/forall.hpp>
 
 namespace palace
 {
@@ -152,6 +152,7 @@ mfem::HypreParMatrix &ParOperator::ParallelAssemble()
       {
         MFEM_ABORT("Unable to assemble the local operator for parallel assembly of "
                    "BilinearForm!");
+        lA = nullptr;
       }
 #else
       MFEM_VERIFY(bfA->HasSpMat(),
@@ -191,15 +192,16 @@ mfem::HypreParMatrix &ParOperator::ParallelAssemble()
       {
         lA = &mbfA->SpMat();
       }
-      else if (bfA->HasExt())
+      else if (mbfA->HasExt())
       {
-        lA = mfem::ceed::CeedOperatorFullAssemble(*bfA);
+        lA = mfem::ceed::CeedOperatorFullAssemble(*mbfA);
         own_lA = true;
       }
       else
       {
         MFEM_ABORT("Unable to assemble the local operator for parallel assembly of "
                    "MixedBilinearForm!");
+        lA = nullptr;
       }
 #else
       MFEM_VERIFY(

diff --git a/palace/linalg/strumpack.cpp b/palace/linalg/strumpack.cpp
@@ -101,7 +101,7 @@ StrumpackSolverBase<StrumpackSolverType>::StrumpackSolverBase(
       this->SetCompressionRelTol(lr_tol);
       break;
     case config::LinearSolverData::CompressionType::NONE:
-    default:
+    case config::LinearSolverData::CompressionType::INVALID:
       break;
   }
 }

diff --git a/palace/linalg/vector.cpp b/palace/linalg/vector.cpp
@@ -5,7 +5,7 @@
 
 #include <cstdint>
 #include <random>
-#include <general/forall.hpp>
+#include <mfem/general/forall.hpp>
 
 namespace palace
 {