diff --git a/include/openmc.h b/include/openmc.h index 991efb2c71..07f53cd632 100644 --- a/include/openmc.h +++ b/include/openmc.h @@ -47,6 +47,7 @@ extern "C" { int openmc_get_nuclide_index(const char name[], int* index); int64_t openmc_get_seed(); int openmc_get_tally_index(int32_t id, int32_t* index); + void openmc_get_tally_next_id(int32_t* id); int openmc_hard_reset(); int openmc_init(int argc, char* argv[], const void* intracomm); int openmc_init_f(const int* intracomm); @@ -72,6 +73,9 @@ extern "C" { int openmc_meshsurface_filter_get_mesh(int32_t index, int32_t* index_mesh); int openmc_meshsurface_filter_set_mesh(int32_t index, int32_t index_mesh); int openmc_next_batch(int* status); + int openmc_next_batch_before_cmfd_init(); + int openmc_next_batch_between_cmfd_init_execute(int* status); + int openmc_next_batch_after_cmfd_execute(int* status); int openmc_nuclide_name(int index, char** name); int openmc_particle_restart(); int openmc_plot_geometry(); diff --git a/src/api.F90 b/src/api.F90 index cc9120c7b9..66a0b8d83e 100644 --- a/src/api.F90 +++ b/src/api.F90 @@ -62,6 +62,7 @@ module openmc_api public :: openmc_get_nuclide_index public :: openmc_get_seed public :: openmc_get_tally_index + public :: openmc_get_tally_next_id public :: openmc_global_tallies public :: openmc_hard_reset public :: openmc_init_f @@ -77,6 +78,9 @@ module openmc_api public :: openmc_mesh_filter_set_mesh public :: openmc_meshsurface_filter_set_mesh public :: openmc_next_batch + public :: openmc_next_batch_before_cmfd_init + public :: openmc_next_batch_between_cmfd_init_execute + public :: openmc_next_batch_after_cmfd_execute public :: openmc_nuclide_name public :: openmc_plot_geometry public :: openmc_reset @@ -85,17 +89,21 @@ module openmc_api public :: openmc_simulation_init public :: openmc_source_bank public :: openmc_source_set_strength + public :: openmc_tally_get_estimator public :: openmc_tally_get_id public :: openmc_tally_get_filters public :: openmc_tally_get_n_realizations public :: openmc_tally_get_nuclides public :: openmc_tally_get_scores + public :: openmc_tally_get_type public :: openmc_tally_results + public :: openmc_tally_set_estimator public :: openmc_tally_set_filters public :: openmc_tally_set_id public :: openmc_tally_set_nuclides public :: openmc_tally_set_scores public :: openmc_tally_set_type + public :: openmc_tally_update_type contains diff --git a/src/tallies/tally_header.F90 b/src/tallies/tally_header.F90 index d106e76b8e..c0d5a04894 100644 --- a/src/tallies/tally_header.F90 +++ b/src/tallies/tally_header.F90 @@ -22,6 +22,7 @@ module tally_header public :: free_memory_tally public :: openmc_extend_tallies public :: openmc_get_tally_index + public :: openmc_get_tally_next_id public :: openmc_global_tallies public :: openmc_tally_get_active public :: openmc_tally_get_estimator @@ -34,11 +35,12 @@ module tally_header public :: openmc_tally_reset public :: openmc_tally_results public :: openmc_tally_set_active + public :: openmc_tally_set_estimator public :: openmc_tally_set_filters public :: openmc_tally_set_id public :: openmc_tally_set_nuclides public :: openmc_tally_set_scores - public :: openmc_get_tally_next_id + public :: openmc_tally_update_type !=============================================================================== ! TALLYOBJECT describes a user-specified tally. The region of phase space to @@ -1037,7 +1039,6 @@ contains integer(C_INT32_T), intent(out) :: id id = largest_tally_id + 1 - print *, id end subroutine openmc_get_tally_next_id end module tally_header