Changed material.xml to materials.xml to be consistent.

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
 

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

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

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( &
        '</' //trim(tag) // '>'
 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