Merge pull request #53 from aurora-multiphysics/alexanderianblair/moo…

…se-update Update MOOSE with WASP support and update PETSc
aurora-multiphysics · Nov 20, 2023 · 5bc3268 · 5bc3268
2 parents fbf9809 + b8a153b
commit 5bc3268
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/contrib/hephaestus b/contrib/hephaestus
diff --git a/docker/apollo-deps/Dockerfile b/docker/apollo-deps/Dockerfile
@@ -24,6 +24,10 @@ RUN export MOOSE_JOBS="$compile_cores" && \
     METHODS='opt' ./scripts/update_and_rebuild_libmesh.sh --with-mpi && \
     ./configure --with-derivative-size=200 --with-ad-indexing-type=global
 
+# Build WASP
+RUN cd /$WORKDIR/moose/scripts && \
+    METHODS='opt' ./update_and_rebuild_wasp.sh
+
 # Build MOOSE
 RUN cd /$WORKDIR/moose/framework && \
     METHOD=opt make -j"$compile_cores"

diff --git a/include/problem/MFEMProblem.h b/include/problem/MFEMProblem.h
@@ -41,7 +41,7 @@ class MFEMProblem : public ExternalProblem
   virtual void externalSolve() override;
   virtual void outputStep(ExecFlagType type) override;
 
-  virtual bool converged() override { return true; };
+  virtual bool nlConverged(const unsigned int nl_sys_num) override { return true; };
 
   virtual void syncSolutions(Direction direction) override;
+49 −45		docker/hephaestus-deps/Dockerfile
+235 −0		test/unit/test_nlintegrators.cpp