crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-28 06:05:58 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

removed ifdef guard for openmp when populating fission bank

Browse source
This commit is contained in:
John Tramm 2019-12-02 21:49:19 +00:00
parent 25eb7edffd
commit 0c1299fbe0
1 changed files with 0 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/simulation.cpp
View file

@ -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();