diff --git a/Makefile b/Makefile index 85b774a7a..73b7d7c0e 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,9 @@ # * POTASSIUM_DIR : Top-level potassium dir (default: $(CONTRIB_DIR)/potassium) # * IAPWS95_DIR : Top-level iapws95 dir (default: $(CONTRIB_DIR)/iapws95) +# * EIGEN3_DIR : Top-level eigen3 dir (should contain FindEigen3.cmake). This +# is only needed if enabling DagMC. + # To control where OpenMC grabs HDF5 from; you don't need to set any of these unless # you don't want to use the HDF5 that comes with PETSc @@ -57,6 +60,12 @@ SOCKEYE_DIR ?= $(CONTRIB_DIR)/sockeye SODIUM_DIR ?= $(CONTRIB_DIR)/sodium POTASSIUM_DIR ?= $(CONTRIB_DIR)/potassium IAPWS95_DIR ?= $(CONTRIB_DIR)/iapws95 + +# This is the Eigen3 location on CIVET. If you are using MOOSE's conda environment, +# you don't need to set these variables, because conda sets them for you. The only +# scenario where you might need to manually set these is if you're not using the +# conda environment. You will get a compile error about FindEigen3.cmake if you +# do indeed need to set these. EIGEN3_DIR ?= $(LIBMESH_DIR)/include Eigen3_DIR ?= $(EIGEN3_DIR) @@ -254,7 +263,6 @@ ifeq ($(ENABLE_OPENMC), yes) endif ifeq ($(ENABLE_DAGMC), yes) - ADDITIONAL_CPPFLAGS += $(DAGMC_INCLUDES) libmesh_CXXFLAGS += -DENABLE_DAGMC endif diff --git a/doc/content/compiletime.md b/doc/content/compiletime.md index 04b06d50a..2ef9fa6cd 100644 --- a/doc/content/compiletime.md +++ b/doc/content/compiletime.md @@ -2,7 +2,7 @@ This page collects some common issues encountered when compiling Cardinal. -## Switching 3-rd Party Options +## Switching 3rd Party Options If you are toggling `ENABLE_NEK`, `ENABLE_OPENMC` and/or `ENABLE_DAGMC`, you may need to clear out the `build/` and `install/` directories in-between diff --git a/tutorials/dagmc/openmc.i b/tutorials/dagmc/openmc.i index f0f9c10f3..16220f8cf 100644 --- a/tutorials/dagmc/openmc.i +++ b/tutorials/dagmc/openmc.i @@ -33,6 +33,7 @@ type = OpenMCCellAverageProblem verbose = true tally_type = mesh + mesh_template = mesh_in.e tally_name = 'heat_source' solid_cell_level = 0 solid_blocks = '2 3' diff --git a/tutorials/dagmc/tests b/tutorials/dagmc/tests index 29a93dfaf..9af18e02b 100644 --- a/tutorials/dagmc/tests +++ b/tutorials/dagmc/tests @@ -12,7 +12,6 @@ cli_args = 'Executioner/num_steps=2' min_parallel = 2 prereq = mesh - mesh_mode = 'replicated' requirement = 'The system shall couple DAGMC OpenMC models to MOOSE.' required_objects = 'DagMCPostprocessor' []