Improve error message of ascii data plugin while loading file #2755
Conversation
gassmoeller
force-pushed
the
fix_ascii_data_wrong_entry_detection
branch
2 times, most recently
from
b534a38
to
f3d7b48
Compare
source/utilities.cc
Outdated
| } | ||
| else | ||
| { | ||
| AssertThrow(field_index == (components + dim) * data_table.n_elements(), |
There was a problem hiding this comment.
This does not cover the case where you have a number of valid data points that's exactly the same as the POINTS value, and then a line that contains NaN.
There was a problem hiding this comment.
In addition, I find this logic a bit difficult to follow, so if you don't find a different way to write this, maybe you can add a comment that explains what happens in each case.
gassmoeller
force-pushed
the
fix_ascii_data_wrong_entry_detection
branch
from
f3d7b48
to
2ce9260
Compare
|
I simplified the logic and improved the error message. Is this more clear? This should also cover the corner case you mentioned above. We now enforce the loop to read until the end of the file, otherwise it will throw an exception. |
source/utilities.cc
Outdated
|
|
||
| AssertThrow(field_index == (components + dim) * data_table.n_elements(), | ||
| ExcMessage (std::string("Number of read in points does not match number of expected points. File corrupted?"))); | ||
| ExcMessage (std::string("While reading the data file '" + filename + "' the ascii data " |
There was a problem hiding this comment.
I think @jdannberg wants this assert() condition (which appears in the output) to be easier to understand (right?). Maybe we can do
| ExcMessage (std::string("While reading the data file '" + filename + "' the ascii data " | |
| const n_total_values = (components + dim) * data_table.n_elements(); | |
| AssertThrow(field_index == n_total_values, |
and ... expected number of floating point values based on the dimension, the number of components, and the number of lines given by POINTS in the header of the file.
source/utilities.cc
Outdated
| @@ -1643,9 +1643,17 @@ namespace aspect | |||
| } | |||
| while (in >> temp_data); | |||
|
|
|||
| AssertThrow(in.eof(), | |||
| ExcMessage (std::string("While reading the data file '" + filename + "' the ascii data " | |||
There was a problem hiding this comment.
no need for the explicit conversion to std::string. The addition of "..." + std::string already does that.
gassmoeller
force-pushed
the
fix_ascii_data_wrong_entry_detection
branch
from
2ce9260
to
85c2e69
Compare
|
Is this better? I renamed the variables to make the condition easier to understand. |
|
Looks good to me! |
…rong_entry_detection Improve error message of ascii data plugin while loading file
Fix #2753.