Skip to content

Commit

Permalink
C++ format updates
Browse files Browse the repository at this point in the history
  • Loading branch information
pshriwise committed Feb 28, 2025
1 parent aab8966 commit 037573d
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 36 deletions.
48 changes: 24 additions & 24 deletions include/openmc/settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,30 +44,30 @@ extern "C" bool entropy_on; //!< calculate Shannon entropy?
extern "C" bool
event_based; //!< use event-based mode (instead of history-based)
extern bool legendre_to_tabular; //!< convert Legendre distributions to tabular?
extern bool material_cell_offsets; //!< create material cells offsets?
extern "C" bool output_summary; //!< write summary.h5?
extern bool output_tallies; //!< write tallies.out?
extern bool particle_restart_run; //!< particle restart run?
extern "C" bool photon_transport; //!< photon transport turned on?
extern "C" bool reduce_tallies; //!< reduce tallies at end of batch?
extern bool res_scat_on; //!< use resonance upscattering method?
extern "C" bool restart_run; //!< restart run?
extern "C" bool run_CE; //!< run with continuous-energy data?
extern bool source_latest; //!< write latest source at each batch?
extern bool source_separate; //!< write source to separate file?
extern bool source_write; //!< write source in HDF5 files?
extern bool source_mcpl_write; //!< write source in mcpl files?
extern bool surf_source_write; //!< write surface source file?
extern bool surf_mcpl_write; //!< write surface mcpl file?
extern bool surf_source_read; //!< read surface source file?
extern bool survival_biasing; //!< use survival biasing?
extern bool survival_normalization;//!< use survival normalization?
extern bool temperature_multipole; //!< use multipole data?
extern "C" bool trigger_on; //!< tally triggers enabled?
extern bool trigger_predict; //!< predict batches for triggers?
extern bool ufs_on; //!< uniform fission site method on?
extern bool urr_ptables_on; //!< use unresolved resonance prob. tables?
extern "C" bool weight_windows_on; //!< are weight windows are enabled?
extern bool material_cell_offsets; //!< create material cells offsets?
extern "C" bool output_summary; //!< write summary.h5?
extern bool output_tallies; //!< write tallies.out?
extern bool particle_restart_run; //!< particle restart run?
extern "C" bool photon_transport; //!< photon transport turned on?
extern "C" bool reduce_tallies; //!< reduce tallies at end of batch?
extern bool res_scat_on; //!< use resonance upscattering method?
extern "C" bool restart_run; //!< restart run?
extern "C" bool run_CE; //!< run with continuous-energy data?
extern bool source_latest; //!< write latest source at each batch?
extern bool source_separate; //!< write source to separate file?
extern bool source_write; //!< write source in HDF5 files?
extern bool source_mcpl_write; //!< write source in mcpl files?
extern bool surf_source_write; //!< write surface source file?
extern bool surf_mcpl_write; //!< write surface mcpl file?
extern bool surf_source_read; //!< read surface source file?
extern bool survival_biasing; //!< use survival biasing?
extern bool survival_normalization; //!< use survival normalization?
extern bool temperature_multipole; //!< use multipole data?
extern "C" bool trigger_on; //!< tally triggers enabled?
extern bool trigger_predict; //!< predict batches for triggers?
extern bool ufs_on; //!< uniform fission site method on?
extern bool urr_ptables_on; //!< use unresolved resonance prob. tables?
extern "C" bool weight_windows_on; //!< are weight windows are enabled?
extern bool weight_window_checkpoint_surface; //!< enable weight window check
//!< upon surface crossing?
extern bool weight_window_checkpoint_collision; //!< enable weight window check
Expand Down
11 changes: 6 additions & 5 deletions src/physics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -152,13 +152,14 @@ void sample_neutron_reaction(Particle& p)

// Play russian roulette if survival biasing is turned on
if (settings::survival_biasing) {
// if survival normalization is on, use normalized weight cutoff and normalized weight survive
// if survival normalization is on, use normalized weight cutoff and
// normalized weight survive
if (settings::survival_normalization) {
if (p.wgt() < settings::weight_cutoff*p.wgt0()) {
russian_roulette(p, settings::weight_survive*p.wgt0());
}
if (p.wgt() < settings::weight_cutoff * p.wgt0()) {
russian_roulette(p, settings::weight_survive * p.wgt0());
}
} else if (p.wgt() < settings::weight_cutoff) {
russian_roulette(p, settings::weight_survive);
russian_roulette(p, settings::weight_survive);
}
}
}
Expand Down
11 changes: 6 additions & 5 deletions src/physics_mg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,14 @@ void sample_reaction(Particle& p)

// Play Russian roulette if survival biasing is turned on
if (settings::survival_biasing) {
// if survival normalization is applicable, use normalized weight cutoff and normalized weight survive
// if survival normalization is applicable, use normalized weight cutoff and
// normalized weight survive
if (settings::survival_normalization) {
if (p.wgt() < settings::weight_cutoff*p.wgt0()) {
russian_roulette(p, settings::weight_survive*p.wgt0());
}
if (p.wgt() < settings::weight_cutoff * p.wgt0()) {
russian_roulette(p, settings::weight_survive * p.wgt0());
}
} else if (p.wgt() < settings::weight_cutoff) {
russian_roulette(p, settings::weight_survive);
russian_roulette(p, settings::weight_survive);
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -567,8 +567,9 @@ void read_settings_xml(pugi::xml_node root)
if (check_for_node(node_cutoff, "weight_avg")) {
weight_survive = std::stod(get_node_value(node_cutoff, "weight_avg"));
}
if (check_for_node(node_cutoff, "survival_normalization")){
survival_normalization = get_node_value_bool(node_cutoff, "survival_normalization");
if (check_for_node(node_cutoff, "survival_normalization")) {
survival_normalization =
get_node_value_bool(node_cutoff, "survival_normalization");
}
if (check_for_node(node_cutoff, "energy_neutron")) {
energy_cutoff[0] =
Expand Down

0 comments on commit 037573d

Please sign in to comment.