Skip to content

Commit cc43db8

Browse files
Further bug fixes after rebase
1 parent 9327a58 commit cc43db8

File tree

6 files changed

+10
-8
lines changed

6 files changed

+10
-8
lines changed

palace/linalg/distrelaxation.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include "distrelaxation.hpp"
55

66
#include <mfem.hpp>
7-
#include <general/forall.hpp>
7+
#include <mfem/general/forall.hpp>
88
#include "linalg/chebyshev.hpp"
99
#include "linalg/rap.hpp"
1010

palace/linalg/jacobi.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "jacobi.hpp"
55

6-
#include <general/forall.hpp>
6+
#include <mfem/general/forall.hpp>
77

88
namespace palace
99
{

palace/linalg/operator.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "operator.hpp"
55

6-
#include <general/forall.hpp>
6+
#include <mfem/general/forall.hpp>
77
#include "linalg/slepc.hpp"
88
#include "utils/communication.hpp"
99

palace/linalg/rap.cpp

+5-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include "rap.hpp"
55

6-
#include <general/forall.hpp>
6+
#include <mfem/general/forall.hpp>
77

88
namespace palace
99
{
@@ -152,6 +152,7 @@ mfem::HypreParMatrix &ParOperator::ParallelAssemble()
152152
{
153153
MFEM_ABORT("Unable to assemble the local operator for parallel assembly of "
154154
"BilinearForm!");
155+
lA = nullptr;
155156
}
156157
#else
157158
MFEM_VERIFY(bfA->HasSpMat(),
@@ -191,15 +192,16 @@ mfem::HypreParMatrix &ParOperator::ParallelAssemble()
191192
{
192193
lA = &mbfA->SpMat();
193194
}
194-
else if (bfA->HasExt())
195+
else if (mbfA->HasExt())
195196
{
196-
lA = mfem::ceed::CeedOperatorFullAssemble(*bfA);
197+
lA = mfem::ceed::CeedOperatorFullAssemble(*mbfA);
197198
own_lA = true;
198199
}
199200
else
200201
{
201202
MFEM_ABORT("Unable to assemble the local operator for parallel assembly of "
202203
"MixedBilinearForm!");
204+
lA = nullptr;
203205
}
204206
#else
205207
MFEM_VERIFY(

palace/linalg/strumpack.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ StrumpackSolverBase<StrumpackSolverType>::StrumpackSolverBase(
101101
this->SetCompressionRelTol(lr_tol);
102102
break;
103103
case config::LinearSolverData::CompressionType::NONE:
104-
default:
104+
case config::LinearSolverData::CompressionType::INVALID:
105105
break;
106106
}
107107
}

palace/linalg/vector.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <cstdint>
77
#include <random>
8-
#include <general/forall.hpp>
8+
#include <mfem/general/forall.hpp>
99

1010
namespace palace
1111
{

0 commit comments

Comments
 (0)