From c3a4cf23a9ae333478b74dcc7a5fc44b36bbb3bc Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Tue, 28 Feb 2012 18:37:24 -0500 Subject: [PATCH] Changed plot.xml to plots.xml and renamed root element accordingly. --- src/input_xml.F90 | 24 +++++++++---------- .../templates/{plot_t.xml => plots_t.xml} | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) rename src/xml-fortran/templates/{plot_t.xml => plots_t.xml} (95%) diff --git a/src/input_xml.F90 b/src/input_xml.F90 index b72f115e0e..fad53be3ea 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -32,7 +32,7 @@ contains call read_geometry_xml() call read_materials_xml() call read_tallies_xml() - if (plotting) call read_plot_xml() + if (plotting) call read_plots_xml() end subroutine read_input_xml @@ -1104,23 +1104,23 @@ contains end subroutine read_tallies_xml !=============================================================================== -! READ_PLOT_XML reads data from a plot.xml file +! READ_PLOTS_XML reads data from a plots.xml file !=============================================================================== - subroutine read_plot_xml + subroutine read_plots_xml - use xml_data_plot_t + use xml_data_plots_t integer i - logical :: file_exists ! does plot.xml file exist? - character(MAX_LINE_LEN) :: filename ! absolute path to plot.xml + logical :: file_exists ! does plots.xml file exist? + character(MAX_LINE_LEN) :: filename ! absolute path to plots.xml type(Plot), pointer :: pl => null() - ! Check if plot.xml exists - filename = trim(path_input) // "plot.xml" + ! Check if plots.xml exists + filename = trim(path_input) // "plots.xml" inquire(FILE=filename, EXIST=file_exists) if (.not. file_exists) then - message = "Plot XML file '" // trim(filename) // "' does not exist!" + message = "Plots XML file '" // trim(filename) // "' does not exist!" call fatal_error() end if @@ -1128,8 +1128,8 @@ contains message = "Reading plot XML file..." call write_message(5) - ! Parse plot.xml file - call read_xml_file_plot_t(filename) + ! Parse plots.xml file + call read_xml_file_plots_t(filename) ! Allocate plots array n_plots = size(plot_) @@ -1208,7 +1208,7 @@ contains end do - end subroutine read_plot_xml + end subroutine read_plots_xml !=============================================================================== ! READ_CROSS_SECTIONS_XML reads information from a cross_sections.xml file. This diff --git a/src/xml-fortran/templates/plot_t.xml b/src/xml-fortran/templates/plots_t.xml similarity index 95% rename from src/xml-fortran/templates/plot_t.xml rename to src/xml-fortran/templates/plots_t.xml index d0bd38cef4..af8f2c6e27 100644 --- a/src/xml-fortran/templates/plot_t.xml +++ b/src/xml-fortran/templates/plots_t.xml @@ -1,7 +1,7 @@