From e8cff2565d7650ded27dd754a05b39f59814e3ba Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Sun, 11 Sep 2011 14:44:19 -0400 Subject: [PATCH] Added output messages for reading input files. --- src/DEPENDENCIES | 1 + src/input_xml.f90 | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/src/DEPENDENCIES b/src/DEPENDENCIES index 68f788e2b2..11214eed2a 100644 --- a/src/DEPENDENCIES +++ b/src/DEPENDENCIES @@ -72,6 +72,7 @@ input_xml.o: datatypes.o input_xml.o: error.o input_xml.o: geometry_header.o input_xml.o: global.o +input_xml.o: output.o input_xml.o: string.o input_xml.o: xml_geometry.o input_xml.o: xml_materials.o diff --git a/src/input_xml.f90 b/src/input_xml.f90 index 459a6c90e1..3993e9e394 100644 --- a/src/input_xml.f90 +++ b/src/input_xml.f90 @@ -6,6 +6,7 @@ module input_xml use error, only: fatal_error use geometry_header, only: Cell, Surface, Lattice use global + use output, only: message use string, only: lower_case, int_to_str implicit none @@ -43,6 +44,11 @@ contains character(MAX_LINE_LEN) :: msg character(MAX_LINE_LEN) :: filename + ! Display output message + msg = "Reading settings XML file..." + call message(msg, 5) + + ! Parse settings.xml file filename = trim(path_input) // "settings.xml" call read_xml_file_settings_t(filename) @@ -112,9 +118,14 @@ contains type(Surface), pointer :: s => null() type(Lattice), pointer :: l => null() + ! Display output message + msg = "Reading geometry XML file..." + call message(msg, 5) + ! ========================================================================== ! READ CELLS FROM GEOMETRY.XML + ! Parse geometry.xml file filename = trim(path_input) // "geometry.xml" call read_xml_file_geometry_t(filename) @@ -368,6 +379,11 @@ contains type(Material), pointer :: m => null() type(nuclide_xml), pointer :: nuc => null() + ! Display output message + msg = "Reading materials XML file..." + call message(msg, 5) + + ! Parse materials.xml file filename = trim(path_input) // "materials.xml" call read_xml_file_materials_t(filename) @@ -462,6 +478,11 @@ contains character(MAX_LINE_LEN) :: msg type(Tally), pointer :: t => null() + ! Display output message + msg = "Reading tallies XML file..." + call message(msg, 5) + + ! Parse tallies.xml file filename = trim(path_input) // "tallies.xml" call read_xml_file_tallies_t(filename)