Fix for UWUW Macro Conflict

CMakeLists.txt

@@ -34,7 +34,7 @@ option(OPENMC_USE_LIBMESH     "Enable support for libMesh unstructured mesh tall
 option(OPENMC_USE_MPI         "Enable MPI"                                           OFF)
 option(OPENMC_USE_MCPL        "Enable MCPL"                                          OFF)
 option(OPENMC_USE_NCRYSTAL    "Enable support for NCrystal scattering"               OFF)
-option(OPENMC_USE_UWUW        "Enable UWUW"                                          OFF)
+option(OPENMC_USE_UWUW        "Enable UWUW"                                          ON)
 
 # Warnings for deprecated options
 foreach(OLD_OPT IN ITEMS "openmp" "profile" "coverage" "dagmc" "libmesh")
@@ -509,6 +509,14 @@ endif()
 if(OPENMC_USE_DAGMC)
   target_compile_definitions(libopenmc PRIVATE DAGMC)
   target_link_libraries(libopenmc dagmc-shared)
+
+  if(OPENMC_USE_UWUW)
+    target_compile_definitions(libopenmc PRIVATE OPENMC_UWUW)
+    target_link_libraries(libopenmc uwuw-shared)
+  endif()
+elseif(OPENMC_USE_UWUW)
+  set(OPENMC_USE_UWUW OFF)
+  message(WARNING "UWUW is enabled but DAGMC was not found. Disabling.")
 endif()
 
 if(OPENMC_USE_LIBMESH)
@@ -545,11 +553,6 @@ if(OPENMC_USE_NCRYSTAL)
   target_link_libraries(libopenmc NCrystal::NCrystal)
 endif()
 
-if (OPENMC_USE_UWUW)
-  target_compile_definitions(libopenmc PRIVATE UWUW)
-  target_link_libraries(libopenmc uwuw-shared)
-endif()
-
 #===============================================================================
 # Log build info that this executable can report later
 #===============================================================================

cmake/OpenMCConfig.cmake.in

@@ -40,5 +40,5 @@ if(@OPENMC_USE_MCPL@)
 endif()
 
 if(@OPENMC_USE_UWUW@)
-  find_package(UWUW REQUIRED)
+  find_package(OPEMC_UWUW REQUIRED)
 endif()

include/openmc/dagmc.h

@@ -125,7 +125,7 @@ class DAGUniverse : public Universe {
   //! \param[in] vol_handle The DAGMC material assignment string
   //! \param[in] c The OpenMC cell to which the material is assigned
   void uwuw_assign_material(
-    moab::EntityHandle vol_handle, std::unique_ptr<DAGCell>& c) const;
+    moab::EntityHandle vol_handle, std::unique_ptr<DAGCell>& c);
 
   //! Assign a material to a cell based
   //! \param[in] mat_string The DAGMC material assignment string

src/dagmc.cpp

@@ -11,7 +11,7 @@
 #include "openmc/settings.h"
 #include "openmc/string_utils.h"
 
-#ifdef UWUW
+#ifdef OPENMC_UWUW
 #include "uwuw.hpp"
 #endif
 #include <fmt/core.h>
@@ -29,7 +29,7 @@ const bool DAGMC_ENABLED = true;
 const bool DAGMC_ENABLED = false;
 #endif
 
-#ifdef UWUW
+#ifdef OPENMC_UWUW
 const bool UWUW_ENABLED = true;
 #else
 const bool UWUW_ENABLED = false;
@@ -431,16 +431,16 @@ void DAGUniverse::to_hdf5(hid_t universes_group) const
 
 bool DAGUniverse::uses_uwuw() const
 {
-#ifdef UWUW
+#ifdef OPENMC_UWUW
   return uwuw_ && !uwuw_->material_library.empty();
 #else
   return false;
-#endif // UWUW
+#endif // OPENMC_UWUW
 }
 
 std::string DAGUniverse::get_uwuw_materials_xml() const
 {
-#ifdef UWUW
+#ifdef OPENMC_UWUW
   if (!uses_uwuw()) {
     throw std::runtime_error("This DAGMC Universe does not use UWUW materials");
   }
@@ -460,12 +460,12 @@ std::string DAGUniverse::get_uwuw_materials_xml() const
   return ss.str();
 #else
   fatal_error("DAGMC was not configured with UWUW.");
-#endif // UWUW
+#endif // OPENMC_UWUW
 }
 
 void DAGUniverse::write_uwuw_materials_xml(const std::string& outfile) const
 {
-#ifdef UWUW
+#ifdef OPENMC_UWUW
   if (!uses_uwuw()) {
     throw std::runtime_error(
       "This DAGMC universe does not use UWUW materials.");
@@ -478,7 +478,7 @@ void DAGUniverse::write_uwuw_materials_xml(const std::string& outfile) const
   mats_xml.close();
 #else
   fatal_error("DAGMC was not configured with UWUW.");
-#endif
+#endif // OPENMC_UWUW
 }
 
 void DAGUniverse::legacy_assign_material(
@@ -540,7 +540,7 @@ void DAGUniverse::legacy_assign_material(
 
 void DAGUniverse::read_uwuw_materials()
 {
-#ifdef UWUW
+#ifdef OPENMC_UWUW
   // If no filename was provided, don't read UWUW materials
   if (filename_ == "")
     return;
@@ -580,13 +580,13 @@ void DAGUniverse::read_uwuw_materials()
   }
 #else
   fatal_error("DAGMC was not configured with UWUW.");
-#endif
+#endif // OPENMC_UWUW
 }
 
 void DAGUniverse::uwuw_assign_material(
-  moab::EntityHandle vol_handle, std::unique_ptr<DAGCell>& c) const
+  moab::EntityHandle vol_handle, std::unique_ptr<DAGCell>& c)
 {
-#ifdef UWUW
+#ifdef OPENMC_UWUW
   // read materials from uwuw material file
   read_uwuw_materials();
 
@@ -601,11 +601,11 @@ void DAGUniverse::uwuw_assign_material(
   } else {
     fatal_error(fmt::format("Material with value '{}' not found in the "
                             "UWUW material library",
-      mat_str));
+      uwuw_mat));
   }
 #else
   fatal_error("DAGMC was not configured with UWUW.");
-#endif
+#endif // OPENMC_UWUW
 }
 //==============================================================================
 // DAGMC Cell implementation

src/output.cpp

@@ -347,7 +347,7 @@ void print_build_info()
 #ifdef COVERAGEBUILD
   coverage = y;
 #endif
-#ifdef UWUW
+#ifdef OPENMC_UWUW
   uwuw = y;
 #endif