GreenPolyProducts/cantera
5
0
Fork 0
mirror of https://github.com/Cantera/cantera.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

[oneD] Improve exception messages for Sim1D::restore

Browse Source
This commit is contained in:
Ingmar Schoegl 2023-08-11 11:10:06 -05:00 committed by Ray Speth
parent 55290ee8b6
commit e3ff737a72
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/oneD/Sim1D.cpp
View File

@ -308,7 +308,13 @@ AnyMap Sim1D::restore(const string& fname, const string& name)
for (auto dom : m_dom) { for (auto dom : m_dom) {
auto arr = SolutionArray::create(dom->solution()); auto arr = SolutionArray::create(dom->solution());
arr->readEntry(fname, name, dom->id()); try {
arr->readEntry(fname, name, dom->id());
} catch (CanteraError& err) {
throw CanteraError("Sim1D::restore",
"Encountered exception when reading entry '{}' from '{}':\n{}",
name, fname, err.getMessage());
}
dom->resize(dom->nComponents(), arr->size()); dom->resize(dom->nComponents(), arr->size());
if (!header.hasKey("generator")) { if (!header.hasKey("generator")) {
arr->meta() = legacyH5(arr, header); arr->meta() = legacyH5(arr, header);
@ -318,7 +324,13 @@ AnyMap Sim1D::restore(const string& fname, const string& name)
resize(); resize();
m_xlast_ts.clear(); m_xlast_ts.clear();
for (auto dom : m_dom) { for (auto dom : m_dom) {
dom->fromArray(*arrs[dom->id()], m_state->data() + dom->loc()); try {
dom->fromArray(*arrs[dom->id()], m_state->data() + dom->loc());
} catch (CanteraError& err) {
throw CanteraError("Sim1D::restore",
"Encountered exception when restoring domain '{}' from HDF:\n{}",
dom->id(), err.getMessage());
}
} }
finalize(); finalize();
} else if (extension == "yaml" || extension == "yml") { } else if (extension == "yaml" || extension == "yml") {
@ -328,14 +340,26 @@ AnyMap Sim1D::restore(const string& fname, const string& name)
for (auto dom : m_dom) { for (auto dom : m_dom) {
auto arr = SolutionArray::create(dom->solution()); auto arr = SolutionArray::create(dom->solution());
arr->readEntry(root, name, dom->id()); try {
arr->readEntry(root, name, dom->id());
} catch (CanteraError& err) {
throw CanteraError("Sim1D::restore",
"Encountered exception when reading entry '{}' from '{}':\n{}",
name, fname, err.getMessage());
}
dom->resize(dom->nComponents(), arr->size()); dom->resize(dom->nComponents(), arr->size());
arrs[dom->id()] = arr; arrs[dom->id()] = arr;
} }
resize(); resize();
m_xlast_ts.clear(); m_xlast_ts.clear();
for (auto dom : m_dom) { for (auto dom : m_dom) {
dom->fromArray(*arrs[dom->id()], m_state->data() + dom->loc()); try {
dom->fromArray(*arrs[dom->id()], m_state->data() + dom->loc());
} catch (CanteraError& err) {
throw CanteraError("Sim1D::restore",
"Encountered exception when restoring domain '{}' from YAML:\n{}",
dom->id(), err.getMessage());
}
} }
finalize(); finalize();
} else { } else {