Merge pull request #1255 from pshriwise/dagmc_rayhist

Adding RayHistory to DagMC

include/openmc/cell.h

@@ -10,9 +10,7 @@
 
 #include "hdf5.h"
 #include "pugixml.hpp"
-#ifdef DAGMC
-#include "DagMC.hpp"
-#endif
+#include "dagmc.h"
 
 #include "openmc/constants.h"
 #include "openmc/neighbor_list.h"

include/openmc/dagmc.h

@@ -9,11 +9,19 @@ extern "C" const bool dagmc_enabled;
 #ifdef DAGMC
 
 #include "DagMC.hpp"
-#include "openmc/cell.h"
-#include "openmc/surface.h"
+#include "openmc/xml_interface.h"
+#include "openmc/position.h"
 
 namespace openmc {
 
+namespace simulation {
+
+extern moab::DagMC::RayHistory history; //!< facet history for DagMC particles
+extern Direction last_dir; //!< last direction passed to DagMC's ray_fire
+#pragma omp threadprivate(history, last_dir)
+
+}
+
 namespace model {
   extern moab::DagMC* DAG;
 }

include/openmc/surface.h

@@ -12,10 +12,7 @@
 
 #include "openmc/constants.h"
 #include "openmc/position.h"
-
-#ifdef DAGMC
-#include "DagMC.hpp"
-#endif
+#include "dagmc.h"
 
 namespace openmc {
 
@@ -82,7 +79,7 @@ public:
   //! \param[in] r The point at which the ray is incident.
   //! \param[in] u Incident direction of the ray
   //! \return Outgoing direction of the ray
-  Direction reflect(Position r, Direction u) const;
+  virtual Direction reflect(Position r, Direction u) const;
 
   //! Evaluate the equation describing the surface.
   //!
@@ -136,6 +133,7 @@ public:
   double evaluate(Position r) const;
   double distance(Position r, Direction u, bool coincident) const;
   Direction normal(Position r) const;
+  Direction reflect(Position r, Direction u) const;
   //! Get the bounding box of this surface.
   BoundingBox bounding_box() const;