Commit 3fcf881
committed
fix: strip inline SMV comments (from vent parser, improve log_error
_load_vents failed with 'could not convert string to float: !' on FDS
6.9.0+ output. Starting with FDS 6.9.0, the SMV writer appends an inline
obstruction reference as a comment to non-dummy vent lines in the second
pass (e.g. '13 15 0 0 99 0 ! 3'). Fixed by stripping everything from '!'
onward before tokenizing in read_common_info and read_common_info2.
Also improved log_error decorator: full traceback is now included in the
warning output (exc_info=True) so errors are no longer silently swallowed.
Removed unused sys import.
Fixes #109, #90, #82.1 parent f111bea commit 3fcf881
2 files changed
Lines changed: 13 additions & 11 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
475 | 475 | | |
476 | 476 | | |
477 | 477 | | |
478 | | - | |
| 478 | + | |
| 479 | + | |
479 | 480 | | |
480 | 481 | | |
481 | 482 | | |
482 | | - | |
| 483 | + | |
| 484 | + | |
483 | 485 | | |
484 | 486 | | |
485 | 487 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | 2 | | |
4 | 3 | | |
5 | 4 | | |
| |||
14 | 13 | | |
15 | 14 | | |
16 | 15 | | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | | - | |
24 | | - | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
0 commit comments