diff --git a/Makefile b/Makefile index ec4e042ea..c6ea4c473 100644 --- a/Makefile +++ b/Makefile @@ -286,7 +286,7 @@ endif ifeq ($(ENABLE_OPENMC), yes) ADDITIONAL_LIBS += -L$(OPENMC_LIBDIR) -lopenmc -lhdf5_hl ifeq ($(ENABLE_DAGMC), ON) - ADDITIONAL_LIBS += -luwuw -ldagmc -lpyne_dagmc -lMOAB + ADDITIONAL_LIBS += -ldagmc -lMOAB endif ADDITIONAL_LIBS += $(CC_LINKER_SLFLAG)$(OPENMC_LIBDIR) endif @@ -318,7 +318,7 @@ endif ifeq ($(ENABLE_OPENMC), yes) CARDINAL_EXTERNAL_FLAGS += -L$(OPENMC_LIBDIR) -L$(HDF5_LIBDIR) -lopenmc ifeq ($(ENABLE_DAGMC), ON) - CARDINAL_EXTERNAL_FLAGS += -luwuw -ldagmc -lpyne_dagmc -lMOAB + CARDINAL_EXTERNAL_FLAGS += -ldagmc -lMOAB endif CARDINAL_EXTERNAL_FLAGS += $(CC_LINKER_SLFLAG)$(OPENMC_LIBDIR) \ $(CC_LINKER_SLFLAG)$(HDF5_LIBDIR) diff --git a/config/dagmc.mk b/config/dagmc.mk index 0b4bbecdf..c30db6523 100644 --- a/config/dagmc.mk +++ b/config/dagmc.mk @@ -7,6 +7,7 @@ $(DAGMC_BUILDDIR)/Makefile: build_moab | $(DAGMC_DIR)/CMakeLists.txt -DBUILD_CI_TESTS=OFF \ -DBUILD_STATIC_LIBS=OFF \ -DBUILD_STATIC_EXE=OFF \ + -DBUILD_UWUW=OFF \ -DEigen3_DIR=$(EIGEN3_DIR) \ -DMOAB_DIR=$(MOAB_INSTALL_DIR) \ -DCMAKE_BUILD_TYPE=$(BUILD_TYPE) \ diff --git a/src/base/OpenMCCellAverageProblem.C b/src/base/OpenMCCellAverageProblem.C index 8a5be10de..18d896986 100644 --- a/src/base/OpenMCCellAverageProblem.C +++ b/src/base/OpenMCCellAverageProblem.C @@ -505,8 +505,6 @@ OpenMCCellAverageProblem::OpenMCCellAverageProblem(const InputParameters & param const openmc::Universe * u = openmc::model::universes.at(_dagmc_universe_index).get(); const openmc::DAGUniverse * dag = dynamic_cast(u); - if (dag->uses_uwuw()) // TODO: test - mooseError("The 'skinner' does not currently support the UWUW workflow."); // The newly-generated DAGMC cells could be disjoint in space, in which case // it is impossible for us to know with 100% certainty a priori how many materials diff --git a/unit/Makefile b/unit/Makefile index 4fd44a8d8..0f5a79a6b 100644 --- a/unit/Makefile +++ b/unit/Makefile @@ -283,7 +283,7 @@ endif ifeq ($(ENABLE_OPENMC), yes) ADDITIONAL_LIBS += -L$(OPENMC_LIBDIR) -lopenmc -lhdf5_hl ifeq ($(ENABLE_DAGMC), ON) - ADDITIONAL_LIBS += -luwuw -ldagmc -lpyne_dagmc -lMOAB + ADDITIONAL_LIBS += -ldagmc -lMOAB endif ADDITIONAL_LIBS += $(CC_LINKER_SLFLAG)$(OPENMC_LIBDIR) endif @@ -319,7 +319,7 @@ endif ifeq ($(ENABLE_OPENMC), yes) CARDINAL_EXTERNAL_FLAGS += -L$(OPENMC_LIBDIR) -L$(HDF5_LIBDIR) -lopenmc ifeq ($(ENABLE_DAGMC), ON) - CARDINAL_EXTERNAL_FLAGS += -luwuw -ldagmc -lpyne_dagmc -lMOAB + CARDINAL_EXTERNAL_FLAGS += -ldagmc -lMOAB endif CARDINAL_EXTERNAL_FLAGS += $(CC_LINKER_SLFLAG)$(OPENMC_LIBDIR) \ $(CC_LINKER_SLFLAG)$(HDF5_LIBDIR)