various fixes

Author: GuySten

include/openmc/constants.h

@@ -301,10 +301,10 @@ enum class TallyType {
   MESH_SURFACE,
   SURFACE,
   PULSE_HEIGHT,
-  NEXT_EVENT
+  POINT
 };
 
-enum class TallyEstimator { ANALOG, TRACKLENGTH, COLLISION, POINT };
+enum class TallyEstimator { ANALOG, TRACKLENGTH, COLLISION, NEXT_EVENT };
 
 enum class TallyEvent { SURFACE, LATTICE, KILL, SCATTER, ABSORB };
 

include/openmc/particle.h

@@ -66,12 +66,10 @@ class Particle : public ParticleData {
   //! \param src Source site data
   void from_source(const SourceSite* src);
 
-  void initialize_pseudoparticle(Particle& p, Direction u, double E);
-
   // Coarse-grained particle events
-  void event_calculate_xs(bool is_pseudo = false);
+  void event_calculate_xs();
   void event_advance();
-  void event_cross_surface(bool is_pseudo = false);
+  void event_cross_surface();
   void event_collide();
   void event_revive_from_secondary();
   void event_death();

include/openmc/random_lcg.h

@@ -9,12 +9,11 @@ namespace openmc {
 // Module constants.
 //==============================================================================
 
-constexpr int N_STREAMS {5};
+constexpr int N_STREAMS {4};
 constexpr int STREAM_TRACKING {0};
 constexpr int STREAM_SOURCE {1};
 constexpr int STREAM_URR_PTABLE {2};
 constexpr int STREAM_VOLUME {3};
-constexpr int STREAM_NEXT_EVENT {4};
 constexpr int64_t DEFAULT_SEED {1};
 constexpr uint64_t DEFAULT_STRIDE {152917ULL};
 

include/openmc/secondary_correlated.h

@@ -40,9 +40,6 @@ class CorrelatedAngleEnergy : public AngleEnergy {
   //! \param[inout] seed Pseudorandom seed pointer
   void sample(
     double E_in, double& E_out, double& mu, uint64_t* seed) const override;
-  Distribution& sample_dist(double E_in, double& E_out, uint64_t* seed) const;
-  double sample_energy_and_pdf(
-    double E_in, double mu, double& E_out, uint64_t* seed) const override;
 
   //! Sample the outgoing energy and return the angular distribution
   //! \param[in] E_in Incoming energy in [eV]

include/openmc/secondary_kalbach.h

@@ -31,10 +31,6 @@ class KalbachMann : public AngleEnergy {
   //! \param[inout] seed Pseudorandom seed pointer
   void sample(
     double E_in, double& E_out, double& mu, uint64_t* seed) const override;
-  void sample_params(double E_in, double& E_out, double& km_a, double& km_r,
-    uint64_t* seed) const;
-  double sample_energy_and_pdf(
-    double E_in, double mu, double& E_out, uint64_t* seed) const override;
 
   //! Sample outgoing energy and Kalbach-Mann parameters
   //! \param[in] E_in Incoming energy in [eV]

include/openmc/secondary_nbody.h

@@ -27,9 +27,6 @@ class NBodyPhaseSpace : public AngleEnergy {
   //! \param[inout] seed Pseudorandom seed pointer
   void sample(
     double E_in, double& E_out, double& mu, uint64_t* seed) const override;
-  double sample_energy(double E_in, uint64_t* seed) const;
-  double sample_energy_and_pdf(
-    double E_in, double mu, double& E_out, uint64_t* seed) const override;
 
   //! Sample an outgoing energy from the N-body phase space distribution
   //! \param[in] E_in Incoming energy in [eV]

include/openmc/secondary_uncorrelated.h

@@ -31,8 +31,6 @@ class UncorrelatedAngleEnergy : public AngleEnergy {
   //! \param[inout] seed Pseudorandom seed pointer
   void sample(
     double E_in, double& E_out, double& mu, uint64_t* seed) const override;
-  double sample_energy_and_pdf(
-    double E_in, double mu, double& E_out, uint64_t* seed) const override;
 
   //! Sample an outgoing energy and evaluate the angular PDF
   //! \param[in] E_in Incoming energy in [eV]

include/openmc/simulation.h

@@ -94,9 +94,6 @@ void broadcast_results();
 
 void free_memory_simulation();
 
-//! Simulate a single pseudoparticle history
-double transport_pseudoparticle(Particle& p, double total_distance);
-
 //! Simulate a single particle history (and all generated secondary particles,
 //!  if enabled), from birth to death
 void transport_history_based_single_particle(Particle& p);

include/openmc/tallies/tally_scoring.h

@@ -9,11 +9,6 @@
 
 namespace openmc {
 
-namespace simulation {
-extern thread_local Particle pseudoparticle;
-extern thread_local int i_det;
-} // namespace simulation
-
 //==============================================================================
 //! An iterator over all combinations of a tally's matching filter bins.
 //

src/physics.cpp

@@ -838,12 +838,13 @@ void sab_scatter(int i_nuclide, int i_sab, Particle& p)
   // Sample energy and angle
   double E_out;
   auto& sab = data::thermal_scatt[i_sab]->data_[i_temp];
-  sab.sample(micro, p.E(), &E_out, &p.mu(), p.current_seed());
 
   if (!model::active_point_tallies.empty()) {
     score_point_tally(p, i_nuclide, sab, micro);
   }
 
+  sab.sample(micro, p.E(), &E_out, &p.mu(), p.current_seed());
+
   // Set energy to outgoing, change direction of particle
   p.E() = E_out;
   p.u() = rotate_angle(p.u(), p.mu(), nullptr, p.current_seed());