crp/OpenMC
1
0
Fork 0
mirror of https://github.com/openmc-dev/openmc.git synced 2026-07-21 06:25:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Updates to simplify model filename checking

Browse source
This commit is contained in:
Patrick Shriwise 2022-12-06 14:40:02 -06:00
parent 270331aff9
commit bc1791d367
2 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/openmc/initialize.h
View file

@ -21,8 +21,6 @@ void read_separate_xml_files();
//! Write some output that occurs right after initialization
void initial_output();
std::string args_xml_filename {};
} // namespace openmc
#endif // OPENMC_INITIALIZE_H

30
src/initialize.cpp
View file

@ -282,7 +282,12 @@ int parse_command_line(int argc, char* argv[])
if (argc > 1 && last_flag < argc - 1) {
settings::path_input = std::string(argv[last_flag + 1]);
// Add slash at end of directory if it isn't there
// check that the path is either a valid directory or file
if (!is_dir(settings::path_input) && !file_exists(settings::path_input)) {
fatal_error(fmt::format("The specified path '{}' does not exist.", settings::path_input));
}
// Add slash at end of directory if it isn't the
if (!ends_with(settings::path_input, "/")) {
settings::path_input += "/";
}
@ -294,13 +299,17 @@ int parse_command_line(int argc, char* argv[])
bool read_model_xml() {
std::string model_filename = settings::path_input;
// if the path input isn't an existing file, assume its a directory
// and append the default model.xml filename
if (!file_exists(settings::path_input)) {
model_filename += "/model.xml";
if (!file_exists(model_filename))
return false;
}
// some string cleanup
// a trailing "/" is applied to path_input if it's present,
// remove it for the first attempt at reading the input file
if (ends_with(model_filename, "/")) model_filename.pop_back();
if (model_filename.length() == 0) model_filename = ".";
// if the current filename is a directory, append the default model filename
if (is_dir(model_filename)) model_filename += "/model.xml";
// if this file doesn't exist, stop here
if (!file_exists(model_filename)) return false;
// try to process the path input as an XML file
pugi::xml_document doc;
@ -330,10 +339,7 @@ bool read_model_xml() {
title();
}
if (!args_xml_filename.empty())
write_message(fmt::format("Reaging user-specified input '{}'...", args_xml_filename), 5);
else
write_message("Reading model XML file...", 5);
write_message(fmt::format("Reading model XML file '{}' ...", model_filename), 5);
read_settings_xml(settings_root);