diff --git a/benchmarks/pu-met-fast-001/material.xml b/benchmarks/pu-met-fast-001/materials.xml similarity index 100% rename from benchmarks/pu-met-fast-001/material.xml rename to benchmarks/pu-met-fast-001/materials.xml diff --git a/benchmarks/pu-met-fast-002/material.xml b/benchmarks/pu-met-fast-002/materials.xml similarity index 100% rename from benchmarks/pu-met-fast-002/material.xml rename to benchmarks/pu-met-fast-002/materials.xml diff --git a/benchmarks/pu-met-fast-005/material.xml b/benchmarks/pu-met-fast-005/materials.xml similarity index 100% rename from benchmarks/pu-met-fast-005/material.xml rename to benchmarks/pu-met-fast-005/materials.xml diff --git a/examples/basic/material.xml b/examples/basic/materials.xml similarity index 100% rename from examples/basic/material.xml rename to examples/basic/materials.xml diff --git a/examples/lattice/material.xml b/examples/lattice/materials.xml similarity index 100% rename from examples/lattice/material.xml rename to examples/lattice/materials.xml diff --git a/src/DEPENDENCIES b/src/DEPENDENCIES index 50cb4a48bc..68f788e2b2 100644 --- a/src/DEPENDENCIES +++ b/src/DEPENDENCIES @@ -74,7 +74,7 @@ input_xml.o: geometry_header.o input_xml.o: global.o input_xml.o: string.o input_xml.o: xml_geometry.o -input_xml.o: xml_material.o +input_xml.o: xml_materials.o input_xml.o: xml_settings.o input_xml.o: xml_tallies.o diff --git a/src/OBJECTS b/src/OBJECTS index e51045ecbc..cdf0fab349 100644 --- a/src/OBJECTS +++ b/src/OBJECTS @@ -30,6 +30,6 @@ string.o \ tally_header.o \ timing.o \ xml_geometry.o \ -xml_material.o \ +xml_materials.o \ xml_settings.o \ xml_tallies.o \ No newline at end of file diff --git a/src/input_xml.f90 b/src/input_xml.f90 index 663eaf354e..b5e0553cd4 100644 --- a/src/input_xml.f90 +++ b/src/input_xml.f90 @@ -24,7 +24,7 @@ contains call read_settings_xml() call read_geometry_xml() - call read_material_xml() + call read_materials_xml() end subroutine read_input_xml @@ -343,13 +343,13 @@ contains end subroutine read_geometry_xml !=============================================================================== -! READ_MATERIAL_XML reads data from a material.xml file and parses it, checking +! READ_MATERIAL_XML reads data from a materials.xml file and parses it, checking ! for errors and placing properly-formatted data in the right data structures !=============================================================================== - subroutine read_material_xml + subroutine read_materials_xml - use xml_data_material_t + use xml_data_materials_t integer :: i, j integer :: n @@ -361,8 +361,8 @@ contains type(Material), pointer :: m => null() type(nuclide_xml), pointer :: nuc => null() - filename = trim(path_input) // "material.xml" - call read_xml_file_material_t(filename) + filename = trim(path_input) // "materials.xml" + call read_xml_file_materials_t(filename) ! Allocate cells array n_materials = size(material_) @@ -439,7 +439,7 @@ contains end do - end subroutine read_material_xml + end subroutine read_materials_xml !=============================================================================== ! READ_TALLIES_XML reads data from a tallies.xml file and parses it, checking diff --git a/src/xml_material.f90 b/src/xml_materials.f90 similarity index 99% rename from src/xml_material.f90 rename to src/xml_materials.f90 index f86bf024f5..dc5676487c 100644 --- a/src/xml_material.f90 +++ b/src/xml_materials.f90 @@ -1,4 +1,4 @@ -module xml_data_material_t +module xml_data_materials_t use READ_XML_PRIMITIVES use WRITE_XML_PRIMITIVES use XMLPARSE @@ -715,7 +715,7 @@ subroutine write_xml_type_material_xml( & '' end subroutine write_xml_type_material_xml -subroutine read_xml_file_material_t(fname, lurep, errout) +subroutine read_xml_file_materials_t(fname, lurep, errout) character(len=*), intent(in) :: fname integer, intent(in), optional :: lurep logical, intent(out), optional :: errout @@ -733,7 +733,7 @@ subroutine read_xml_file_material_t(fname, lurep, errout) has_material_ = .false. allocate(material_(0)) - call init_xml_file_material_t + call init_xml_file_materials_t call xml_open( info, fname, .true. ) call xml_options( info, report_errors=.true., ignore_whitespace=.true.) lurep_ = 0 @@ -796,7 +796,7 @@ subroutine read_xml_file_material_t(fname, lurep, errout) if ( present(errout) ) errout = error end subroutine -subroutine write_xml_file_material_t(fname, lurep) +subroutine write_xml_file_materials_t(fname, lurep) character(len=*), intent(in) :: fname integer, intent(in), optional :: lurep @@ -815,7 +815,7 @@ subroutine write_xml_file_material_t(fname, lurep) call xml_close(info) end subroutine -subroutine init_xml_file_material_t +subroutine init_xml_file_materials_t end subroutine