Merge remote-tracking branch 'upstream/develop' into cpp_tallies

This commit is contained in:
Sterling Harper 2019-02-12 12:35:32 -05:00
commit 08e50977f0
44 changed files with 1038 additions and 1679 deletions

View file

@ -30,12 +30,6 @@ namespace openmc {
extern "C" void accumulate_tallies();
extern "C" void allocate_tally_results();
extern "C" void init_tally_routines();
extern "C" void load_state_point();
extern "C" void print_batch_keff();
extern "C" void print_columns();
extern "C" void print_generation();
extern "C" void print_results();
extern "C" void print_runtime();
extern "C" void setup_active_tallies();
extern "C" void simulation_init_f();
extern "C" void simulation_finalize_f();