From 5379b1c29185645c041f732d8b4a86b02647c866 Mon Sep 17 00:00:00 2001 From: John Tramm Date: Tue, 26 Nov 2019 20:47:36 +0000 Subject: [PATCH] changed particle init index to match history based method (1 vs. 0-based). Also added some print statements etc. --- src/random_lcg.cpp | 2 ++ src/simulation.cpp | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/random_lcg.cpp b/src/random_lcg.cpp index 48c6b5a61b..227b5a1b70 100644 --- a/src/random_lcg.cpp +++ b/src/random_lcg.cpp @@ -1,6 +1,7 @@ #include "openmc/random_lcg.h" #include +//#include namespace openmc { @@ -57,6 +58,7 @@ uint64_t init_seed(int64_t id, int offset) void init_particle_seeds(int64_t id, uint64_t* seeds) { + //std::cout << "Master seed = " << master_seed << " id = " << id << std::endl; for (int i = 0; i < N_STREAMS; i++) { seeds[i] = future_seed(static_cast(id) * prn_stride, master_seed + i); } diff --git a/src/simulation.cpp b/src/simulation.cpp index 5b2b7f0752..375713c3fd 100644 --- a/src/simulation.cpp +++ b/src/simulation.cpp @@ -421,6 +421,7 @@ void process_collision_events() // Reset banked weight during collision p->n_bank_ = 0; + p->n_bank_second_ = 0; p->wgt_bank_ = 0.0; for (int& v : p->n_delayed_bank_) v = 0; @@ -547,7 +548,7 @@ void transport() // Initialize all histories // TODO: Parallelize for (int i = 0; i < n_particles; i++) { - initialize_history(particles + i, source_offset + i); + initialize_history(particles + i, source_offset + i + 1); } //std::cout << "Enqueing particles for XS Lookups..." << std::endl; @@ -568,7 +569,7 @@ void transport() std::cout << "Collisions = " << collision_queue_length << std::endl; */ int max = std::max({calculate_fuel_xs_queue_length, calculate_nonfuel_xs_queue_length, advance_particle_queue_length, surface_crossing_queue_length, collision_queue_length}); - check_energies(); + //check_energies(); if (max == 0) { break; } else if (max == calculate_fuel_xs_queue_length) {