Condensing filter translation into single commit.

include/openmc/mesh.h

@@ -71,18 +71,28 @@ public:
 
   //! Determine which bins were crossed by a particle
   //
-  //! \param[in] p Particle to check
+  //! \param[in] last_r Previous position of the particle
+  //! \param[in] r Current position of the particle
+  //! \param[in] u Particle direction
   //! \param[out] bins Bins that were crossed
   //! \param[out] lengths Fraction of tracklength in each bin
-  virtual void bins_crossed(const Particle& p, std::vector<int>& bins,
+  virtual void bins_crossed(Position last_r,
+                            Position r,
+                            const Direction& u,
+                            std::vector<int>& bins,
                             std::vector<double>& lengths) const = 0;
 
   //! Determine which surface bins were crossed by a particle
   //
-  //! \param[in] p Particle to check
+  //! \param[in] r0 Previous position of the particle
+  //! \param[in] r1 Current position of the particle
+  //! \param[in] u Particle direction
   //! \param[out] bins Surface bins that were crossed
   virtual void
-  surface_bins_crossed(const Particle& p, std::vector<int>& bins) const = 0;
+  surface_bins_crossed(Position r0,
+                       Position r1,
+                       const Direction& u,
+                       std::vector<int>& bins) const = 0;
 
   //! Get bin at a given position in space
   //
@@ -137,7 +147,10 @@ public:
 
   int n_surface_bins() const override;
 
-  void bins_crossed(const Particle& p, std::vector<int>& bins,
+  void bins_crossed(Position last_r,
+                    Position r,
+                    const Direction& u,
+                    std::vector<int>& bins,
                     std::vector<double>& lengths) const override;
 
   //! Count number of bank sites in each mesh bin / energy bin
@@ -219,9 +232,11 @@ public:
   RegularMesh(pugi::xml_node node);
 
   // Overriden methods
-
-  void surface_bins_crossed(const Particle& p, std::vector<int>& bins)
-  const override;
+  void
+  surface_bins_crossed(Position r0,
+                       Position r1,
+                       const Direction& u,
+                       std::vector<int>& bins) const override;
 
   int get_index_in_direction(double r, int i) const override;
 
@@ -259,9 +274,11 @@ public:
   RectilinearMesh(pugi::xml_node node);
 
   // Overriden methods
-
-  void surface_bins_crossed(const Particle& p, std::vector<int>& bins)
-  const override;
+  void
+  surface_bins_crossed(Position r0,
+                       Position r1,
+                       const Direction& u,
+                       std::vector<int>& bins) const override;
 
   int get_index_in_direction(double r, int i) const override;
 
@@ -325,7 +342,7 @@ public:
   std::string bin_label(int bin) const override;
 
   void surface_bins_crossed(const Particle& p,
-                            std::vector<int>& bins) const override;
+                            std::vector<int>& bins) const;
 
   void to_hdf5(hid_t group) const override;
 
@@ -348,10 +365,18 @@ public:
   MOABMesh(pugi::xml_node);
   MOABMesh(const std::string& filename);
 
-  void bins_crossed(const Particle& p,
+  void bins_crossed(Position last_r,
+                    Position r,
+                    const Direction& u,
                     std::vector<int>& bins,
                     std::vector<double>& lengths) const override;
 
+  void
+  surface_bins_crossed(Position r0,
+                       Position r1,
+                       const Direction& u,
+                       std::vector<int>& bins) const override;
+
   int get_bin(Position r) const;
 
   int n_bins() const override;
@@ -496,10 +521,18 @@ public:
   LibMesh(const std::string& filename);
 
   // Methods
-  void bins_crossed(const Particle& p,
+  void bins_crossed(Position last_r,
+                    Position r,
+                    const Direction& u,
                     std::vector<int>& bins,
                     std::vector<double>& lengths) const override;
 
+  void
+  surface_bins_crossed(Position r0,
+                       Position r1,
+                       const Direction& u,
+                       std::vector<int>& bins) const override;
+
   int get_bin(Position r) const override;
 
   int n_bins() const override;

include/openmc/tallies/filter_mesh.h

@@ -4,6 +4,7 @@
 #include <cstdint>
 
 #include "openmc/tallies/filter.h"
+#include "openmc/position.h"
 
 namespace openmc {
 
@@ -42,11 +43,22 @@ public:
 
   virtual void set_mesh(int32_t mesh);
 
+  virtual void set_translation(const Position& translation);
+
+  virtual void set_translation(const double translation[3]);
+
+  virtual const Position& translation() const {return translation_;}
+
+  virtual bool translated() const {return translated_;}
+
+
 protected:
   //----------------------------------------------------------------------------
   // Data members
 
   int32_t mesh_;
+  bool translated_ {false};
+  Position translation_ {0.0, 0.0, 0.0};
 };
 
 } // namespace openmc