diff --git a/src/DEPENDENCIES b/src/DEPENDENCIES index 8190c78b61..f385b0b940 100644 --- a/src/DEPENDENCIES +++ b/src/DEPENDENCIES @@ -1,18 +1,18 @@ -cross_section.o: constants.o -cross_section.o: cross_section_header.o -cross_section.o: datatypes.o -cross_section.o: datatypes_header.o -cross_section.o: endf.o -cross_section.o: error.o -cross_section.o: fileio.o -cross_section.o: fission.o -cross_section.o: global.o -cross_section.o: material_header.o -cross_section.o: output.o -cross_section.o: string.o +ace.o: ace_header.o +ace.o: constants.o +ace.o: datatypes.o +ace.o: datatypes_header.o +ace.o: endf.o +ace.o: error.o +ace.o: fileio.o +ace.o: fission.o +ace.o: global.o +ace.o: material_header.o +ace.o: output.o +ace.o: string.o -cross_section_header.o: constants.o -cross_section_header.o: endf_header.o +ace_header.o: constants.o +ace_header.o: endf_header.o datatypes.o: datatypes_header.o @@ -33,8 +33,8 @@ fileio.o: constants.o fileio.o: global.o fileio.o: string.o +fission.o: ace_header.o fission.o: constants.o -fission.o: cross_section_header.o fission.o: error.o fission.o: global.o fission.o: interpolation.o @@ -50,9 +50,9 @@ geometry.o: particle_header.o geometry.o: string.o geometry.o: tally.o +global.o: ace_header.o global.o: bank_header.o global.o: constants.o -global.o: cross_section_header.o global.o: datatypes_header.o global.o: geometry_header.o global.o: material_header.o @@ -62,8 +62,8 @@ global.o: source_header.o global.o: tally_header.o global.o: timing.o +initialize.o: ace.o initialize.o: constants.o -initialize.o: cross_section.o initialize.o: datatypes.o initialize.o: datatypes_header.o initialize.o: energy_grid.o @@ -145,8 +145,8 @@ output.o: tally_header.o particle_header.o: constants.o particle_header.o: geometry_header.o +physics.o: ace_header.o physics.o: constants.o -physics.o: cross_section_header.o physics.o: endf.o physics.o: error.o physics.o: fission.o @@ -172,9 +172,9 @@ search.o: constants.o search.o: error.o search.o: global.o +source.o: ace_header.o source.o: bank_header.o source.o: constants.o -source.o: cross_section_header.o source.o: error.o source.o: global.o source.o: output.o diff --git a/src/OBJECTS b/src/OBJECTS index 09f29ba6f8..6703d72439 100644 --- a/src/OBJECTS +++ b/src/OBJECTS @@ -1,7 +1,7 @@ objects = \ +ace.o \ +ace_header.o \ bank_header.o \ -cross_section_header.o \ -cross_section.o \ datatypes.o \ datatypes_header.o \ doppler.o \ diff --git a/src/cross_section.F90 b/src/ace.F90 similarity index 99% rename from src/cross_section.F90 rename to src/ace.F90 index 4332615abf..fe85df6aae 100644 --- a/src/cross_section.F90 +++ b/src/ace.F90 @@ -1,8 +1,8 @@ -module cross_section +module ace - use constants - use cross_section_header, only: Nuclide, Reaction, SAB_Table, XsListing, & + use ace_header, only: Nuclide, Reaction, SAB_Table, XsListing, & DistEnergy + use constants use datatypes, only: dict_create, dict_add_key, dict_get_key, & dict_has_key, dict_delete, dict_keys use datatypes_header, only: DictionaryCI, ListKeyValueCI @@ -1312,4 +1312,4 @@ contains end function get_real -end module cross_section +end module ace diff --git a/src/cross_section_header.F90 b/src/ace_header.F90 similarity index 99% rename from src/cross_section_header.F90 rename to src/ace_header.F90 index 2cc7b481c7..0c14a1ca5f 100644 --- a/src/cross_section_header.F90 +++ b/src/ace_header.F90 @@ -1,4 +1,4 @@ -module cross_section_header +module ace_header use constants, only: MAX_FILE_LEN use endf_header, only: Tab1 @@ -209,4 +209,4 @@ module cross_section_header real(8) :: nu_fission ! macroscopic production xs end type MaterialMacroXS -end module cross_section_header +end module ace_header diff --git a/src/fission.F90 b/src/fission.F90 index c544385361..f82bcf3540 100644 --- a/src/fission.F90 +++ b/src/fission.F90 @@ -1,11 +1,11 @@ module fission + use ace_header, only: Nuclide use constants - use cross_section_header, only: Nuclide - use error, only: fatal_error - use global, only: message - use interpolation, only: interpolate_tab1 - use search, only: binary_search + use error, only: fatal_error + use global, only: message + use interpolation, only: interpolate_tab1 + use search, only: binary_search implicit none diff --git a/src/global.F90 b/src/global.F90 index 9c65efaf8a..e904f64a29 100644 --- a/src/global.F90 +++ b/src/global.F90 @@ -1,17 +1,17 @@ module global - use bank_header, only: Bank + use ace_header, only: Nuclide, SAB_Table, xsListing, NuclideMicroXS, & + MaterialMacroXS + use bank_header, only: Bank use constants - use cross_section_header, only: Nuclide, SAB_Table, xsListing, & - NuclideMicroXS, MaterialMacroXS - use datatypes_header, only: DictionaryII, DictionaryCI - use geometry_header, only: Cell, Universe, Lattice, Surface - use material_header, only: Material - use mesh_header, only: StructuredMesh - use particle_header, only: Particle - use source_header, only: ExtSource - use tally_header, only: TallyObject, TallyMap - use timing, only: Timer + use datatypes_header, only: DictionaryII, DictionaryCI + use geometry_header, only: Cell, Universe, Lattice, Surface + use material_header, only: Material + use mesh_header, only: StructuredMesh + use particle_header, only: Particle + use source_header, only: ExtSource + use tally_header, only: TallyObject, TallyMap + use timing, only: Timer #ifdef MPI use mpi diff --git a/src/initialize.F90 b/src/initialize.F90 index 621df2c649..220c2a6809 100644 --- a/src/initialize.F90 +++ b/src/initialize.F90 @@ -1,7 +1,7 @@ module initialize + use ace, only: read_xs use constants - use cross_section, only: read_xs use datatypes, only: dict_create, dict_add_key, dict_get_key, & dict_has_key, dict_keys use datatypes_header, only: ListKeyValueII, DictionaryII diff --git a/src/output.F90 b/src/output.F90 index 8ebf16d846..32e964123c 100644 --- a/src/output.F90 +++ b/src/output.F90 @@ -2,16 +2,16 @@ module output use ISO_FORTRAN_ENV + use ace_header, only: Nuclide, Reaction, UrrData use constants - use cross_section_header, only: Nuclide, Reaction, UrrData - use datatypes, only: dict_get_key - use endf, only: reaction_name - use geometry_header, only: Cell, Universe, Surface + use datatypes, only: dict_get_key + use endf, only: reaction_name + use geometry_header, only: Cell, Universe, Surface use global - use mesh_header, only: StructuredMesh - use particle_header, only: Particle, LocalCoord - use string, only: upper_case, int_to_str, real_to_str - use tally_header, only: TallyObject + use mesh_header, only: StructuredMesh + use particle_header, only: Particle, LocalCoord + use string, only: upper_case, int_to_str, real_to_str + use tally_header, only: TallyObject implicit none diff --git a/src/physics.F90 b/src/physics.F90 index f4dcbd28dd..e9e86a862b 100644 --- a/src/physics.F90 +++ b/src/physics.F90 @@ -1,21 +1,21 @@ module physics + use ace_header, only: Nuclide, Reaction, DistEnergy, UrrData use constants - use cross_section_header, only: Nuclide, Reaction, DistEnergy, UrrData - use endf, only: reaction_name, is_fission, is_scatter - use error, only: fatal_error, warning - use fission, only: nu_total, nu_prompt, nu_delayed - use geometry, only: find_cell, distance_to_boundary, & - cross_surface, cross_lattice - use geometry_header, only: Universe, BASE_UNIVERSE + use endf, only: reaction_name, is_fission, is_scatter + use error, only: fatal_error, warning + use fission, only: nu_total, nu_prompt, nu_delayed + use geometry, only: find_cell, distance_to_boundary, cross_surface, & + cross_lattice + use geometry_header, only: Universe, BASE_UNIVERSE use global - use interpolation, only: interpolate_tab1 - use output, only: write_message - use particle_header, only: Particle, LocalCoord - use random_lcg, only: prn - use search, only: binary_search - use string, only: int_to_str, real_to_str - use tally, only: score_tally, score_surface_current + use interpolation, only: interpolate_tab1 + use output, only: write_message + use particle_header, only: Particle, LocalCoord + use random_lcg, only: prn + use search, only: binary_search + use string, only: int_to_str, real_to_str + use tally, only: score_tally, score_surface_current implicit none diff --git a/src/source.F90 b/src/source.F90 index dae40548a7..f296c2c5b6 100644 --- a/src/source.F90 +++ b/src/source.F90 @@ -1,15 +1,15 @@ module source - use bank_header, only: Bank - use constants, only: ONE, MAX_LINE_LEN - use cross_section_header, only: Nuclide - use error, only: fatal_error + use ace_header, only: Nuclide + use bank_header, only: Bank + use constants, only: ONE, MAX_LINE_LEN + use error, only: fatal_error use global - use output, only: write_message - use particle_header, only: Particle, initialize_particle - use physics, only: watt_spectrum - use random_lcg, only: prn, set_particle_seed - use string, only: int_to_str + use output, only: write_message + use particle_header, only: Particle, initialize_particle + use physics, only: watt_spectrum + use random_lcg, only: prn, set_particle_seed + use string, only: int_to_str implicit none