From 0c1299fbe0cf7a5f597c26cf93c0c62f855b1d57 Mon Sep 17 00:00:00 2001 From: John Tramm Date: Mon, 2 Dec 2019 21:49:19 +0000 Subject: [PATCH] removed ifdef guard for openmp when populating fission bank --- src/simulation.cpp | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/simulation.cpp b/src/simulation.cpp index 179d7ea950..a162de8a84 100644 --- a/src/simulation.cpp +++ b/src/simulation.cpp @@ -1216,27 +1216,9 @@ void finalize_generation() for( int i = 0; i < shared_fission_bank_length; i++ ) simulation::fission_bank.push_back(shared_fission_bank[i]); shared_fission_bank_length = 0; -<<<<<<< HEAD //Sorts the fission bank so as to allow for reproducibility std::stable_sort(simulation::fission_bank.begin(), simulation::fission_bank.end()); -======= -#endif - // Sorts the fission bank so as to allow for reproducibility - //std::sort(simulation::fission_bank.begin(), simulation::fission_bank.end(), bank_site_comparator()); - //std::sort(simulation::fission_bank.begin(), simulation::fission_bank.end()); - std::stable_sort(simulation::fission_bank.begin(), simulation::fission_bank.end()); - /* - std::cout << "Fission bank on rank " << mpi::rank << " is of length " << simulation::fission_bank.size() << std::endl; - for (Particle::Bank p : simulation::fission_bank ) - { - std::cout << "E = " << p.E << std::endl; - } -<<<<<<< HEAD ->>>>>>> added some print statements -======= - */ ->>>>>>> finally reproducible. Change was to the XS lookups. Old way was doing something different I guess, so reverting to original code fixed it all // Distribute fission bank across processors evenly synchronize_bank();