Skip to content

A few improvements related to the Model class #2465

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jtramm merged 4 commits into from
Apr 12, 2023
Merged

A few improvements related to the Model class #2465

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
44a57b9
Improve error message about missing settings.xml
paulromano Apr 8, 2023
d103656
Make clear that passing model XML is valid on command line
paulromano Apr 8, 2023
35ef5b0
Allow plots.xml to be read if model.xml doesn't contain plots
paulromano Apr 8, 2023
f5ad046
Allow Model.run to pass kwargs to export methods
paulromano Apr 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Allow plots.xml to be read if model.xml doesn't contain plots
  • Loading branch information
@paulromano
paulromano committed Apr 11, 2023
commit 35ef5b06f847d43dc0cbebb62c7f42927b2b1fa6
12 changes: 10 additions & 2 deletions src/initialize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ bool read_model_xml()
for (const auto& input : other_inputs) {
if (file_exists(settings::path_input + input)) {
warning((fmt::format("Other XML file input(s) are present. These files "
"will be ignored in favor of the {} file.",
"may be ignored in favor of the {} file.",
model_filename)));
break;
}
Expand Down Expand Up @@ -392,8 +392,16 @@ bool read_model_xml()
// Initialize distribcell_filters
prepare_distribcell();

if (check_for_node(root, "plots"))
if (check_for_node(root, "plots")) {
read_plots_xml(root.child("plots"));
} else {
// When no <plots> element is present in the model.xml file, check for a
// regular plots.xml file
std::string filename = settings::path_input + "plots.xml";
if (file_exists(filename)) {
read_plots_xml();
}
}

return true;
}
Expand Down