diff --git a/src/initialize.F90 b/src/initialize.F90 index 258ac3b30d..c3fc6b0e84 100644 --- a/src/initialize.F90 +++ b/src/initialize.F90 @@ -14,7 +14,6 @@ module initialize use error, only: fatal_error, warning use geometry_header, only: Cell, Universe, Lattice, RectLattice, HexLattice,& root_universe - use global use hdf5_interface, only: file_open, read_attribute, file_close, & hdf5_bank_t, hdf5_integer8_t use input_xml, only: read_input_xml @@ -23,9 +22,12 @@ module initialize use mgxs_data, only: read_mgxs, create_macro_xs use output, only: print_version, write_message, print_usage use random_lcg, only: initialize_prng + use settings + use simulation_header, only: n_threads use string, only: to_str, starts_with, ends_with, str_to_int use tally_header, only: TallyObject use tally_filter + use timer_header implicit none diff --git a/src/input_xml.F90 b/src/input_xml.F90 index 0ef4d2b306..7bc345da4d 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -13,12 +13,11 @@ module input_xml use error, only: fatal_error, warning use geometry, only: calc_offsets, maximum_levels, count_instance, & neighbor_lists - use geometry_header, only: Cell, Lattice, RectLattice, HexLattice, & - get_temperatures, root_universe - use global + use geometry_header use hdf5_interface use list_header, only: ListChar, ListInt, ListReal - use mesh_header, only: RegularMesh + use material_header + use mesh_header use message_passing use mgxs_data, only: create_macro_xs, read_mgxs use mgxs_header @@ -28,15 +27,21 @@ module input_xml use random_lcg, only: prn, seed, initialize_prng use surface_header use set_header, only: SetChar + use settings + use source_header use stl_vector, only: VectorInt, VectorReal, VectorChar use string, only: to_lower, to_str, str_to_int, str_to_real, & starts_with, ends_with, tokenize, split_string, & zero_padded, to_c_string use summary, only: write_summary - use tally, only: openmc_tally_set_type + use tally use tally_header, only: openmc_extend_tallies - use tally_filter_header, only: TallyFilterContainer + use tally_derivative_header + use tally_filter_header use tally_filter + use timer_header, only: time_read_xs + use trigger_header + use volume_header use xml_interface implicit none diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90 index a111bc1c48..00b5fc46ad 100644 --- a/src/mgxs_data.F90 +++ b/src/mgxs_data.F90 @@ -2,14 +2,16 @@ module mgxs_data use constants use algorithm, only: find + use dict_header, only: DictCharInt use error, only: fatal_error - use geometry_header, only: get_temperatures - use global + use geometry_header, only: get_temperatures, cells use hdf5_interface - use material_header, only: Material + use material_header, only: Material, materials, n_materials use mgxs_header + use nuclide_header, only: n_nuclides use output, only: write_message use set_header, only: SetChar + use settings use stl_vector, only: VectorReal use string, only: to_lower implicit none diff --git a/src/physics.F90 b/src/physics.F90 index b57ac292ea..cb309f93ac 100644 --- a/src/physics.F90 +++ b/src/physics.F90 @@ -5,9 +5,9 @@ module physics use cross_section, only: elastic_xs_0K use endf, only: reaction_name use error, only: fatal_error, warning - use global - use material_header, only: Material + use material_header, only: Material, materials use math + use mesh_header, only: meshes use message_passing use nuclide_header use output, only: write_message @@ -16,8 +16,12 @@ module physics use physics_common use random_lcg, only: prn, advance_prn_seed, prn_set_stream use reaction_header, only: Reaction + use sab_header, only: sab_tables use secondary_uncorrelated, only: UncorrelatedAngleEnergy + use settings + use simulation_header use string, only: to_str + use tally_header implicit none diff --git a/src/physics_mg.F90 b/src/physics_mg.F90 index 29cdc447f2..ecf6980e30 100644 --- a/src/physics_mg.F90 +++ b/src/physics_mg.F90 @@ -2,20 +2,25 @@ module physics_mg ! This module contains the multi-group specific physics routines so as to not ! hinder performance of the CE versions with multiple if-thens. + use bank_header use constants use error, only: fatal_error, warning - use global - use material_header, only: Material + use material_header, only: Material, materials use math, only: rotate_angle - use mgxs_header, only: Mgxs, MgxsContainer + use mesh_header, only: meshes + use mgxs_header use message_passing + use nuclide_header, only: material_xs use output, only: write_message use particle_header, only: Particle use particle_restart_write, only: write_particle_restart use physics_common use random_lcg, only: prn use scattdata_header + use settings + use simulation_header use string, only: to_str + use tally_header implicit none diff --git a/src/source.F90 b/src/source.F90 index fe7a451cbb..0689cb4035 100644 --- a/src/source.F90 +++ b/src/source.F90 @@ -6,20 +6,23 @@ module source #endif use algorithm, only: binary_search - use bank_header, only: Bank + use bank_header, only: Bank, source_bank use constants use distribution_univariate, only: Discrete use distribution_multivariate, only: SpatialBox use error, only: fatal_error use geometry, only: find_cell - use global use hdf5_interface, only: file_create, file_open, file_close, read_dataset + use math use message_passing, only: rank + use mgxs_header, only: energy_bins, num_energy_groups use output, only: write_message use particle_header, only: Particle use random_lcg, only: prn, set_particle_seed, prn_set_stream + use settings + use simulation_header + use source_header, only: external_source use string, only: to_str - use math use state_point, only: read_source_bank, write_source_bank implicit none diff --git a/src/track_output.F90 b/src/track_output.F90 index bdef9579c2..244bf182e0 100644 --- a/src/track_output.F90 +++ b/src/track_output.F90 @@ -5,13 +5,15 @@ module track_output - use global + use hdf5 + + use constants use hdf5_interface use particle_header, only: Particle + use settings, only: path_output + use simulation_header use string, only: to_str - use hdf5 - implicit none private diff --git a/src/tracking.F90 b/src/tracking.F90 index 90dd9c35ee..518a97f7c3 100644 --- a/src/tracking.F90 +++ b/src/tracking.F90 @@ -1,18 +1,23 @@ module tracking - use constants, only: MODE_EIGENVALUE + use constants use cross_section, only: calculate_xs use error, only: fatal_error, warning + use geometry_header, only: cells use geometry, only: find_cell, distance_to_boundary, cross_surface, & cross_lattice, check_cell_overlap - use global use output, only: write_message use message_passing + use mgxs_header + use nuclide_header use particle_header, only: LocalCoord, Particle use physics, only: collision use physics_mg, only: collision_mg use random_lcg, only: prn + use settings + use simulation_header use string, only: to_str + use tally_header use tally, only: score_analog_tally, score_tracklength_tally, & score_collision_tally, score_surface_current, & score_track_derivative, score_surface_tally, &