From c24d9772ac5069b324b3e77456e1d956f46f5fa3 Mon Sep 17 00:00:00 2001 From: jwhite Date: Tue, 3 Dec 2024 14:29:19 +0800 Subject: [PATCH] revised fixed instruction to allow trailing whitespace - j doh says this is allowed... --- benchmarks/basic_tests.py | 3 ++- benchmarks/tplins_test_1/template/out1.dat.ins | 2 +- src/libs/run_managers/abstract_base/model_interface.cpp | 5 ++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/benchmarks/basic_tests.py b/benchmarks/basic_tests.py index 7f7084666..9b24842ae 100644 --- a/benchmarks/basic_tests.py +++ b/benchmarks/basic_tests.py @@ -1800,7 +1800,8 @@ def tenpar_uniform_invest(): if __name__ == "__main__": - mf6_v5_sen_test() + tplins1_test() + #mf6_v5_sen_test() #tenpar_uniform_invest() #tenpar_collapse_invest() #plot_collapse_invest() diff --git a/benchmarks/tplins_test_1/template/out1.dat.ins b/benchmarks/tplins_test_1/template/out1.dat.ins index 96ff5cace..ee41af084 100644 --- a/benchmarks/tplins_test_1/template/out1.dat.ins +++ b/benchmarks/tplins_test_1/template/out1.dat.ins @@ -3,7 +3,7 @@ l1 ~,~ ~,~ ~,~ ~,~ ~,~ ~,~ ~,~ ~,~ !h02_09! ~ primary ~ !h01_10! ~ secondary ~ [h01_09]45:54 l3 l1 !h01_01! ~secondary~ !h01_02! !h01_03! !h01_04! !h01_05! !h01_06! !h01_07! (h01_08)107:114 -l1 [h02_01]1:8 [h02_02]9:16 [h02_03]17:24 !h02_04! !h02_05! !h02_06! !h02_07! !h02_08! +l1 [h02_01]1:8 [h02_02]9:16 [h02_03]17:26 !h02_04! !h02_05! !h02_06! !h02_07! !h02_08! l1 [h02_10]1:5 l1 ~dummy_obs~ !dummy_obs! diff --git a/src/libs/run_managers/abstract_base/model_interface.cpp b/src/libs/run_managers/abstract_base/model_interface.cpp index 285a70027..2b55bc684 100644 --- a/src/libs/run_managers/abstract_base/model_interface.cpp +++ b/src/libs/run_managers/abstract_base/model_interface.cpp @@ -1557,7 +1557,10 @@ pair InstructionFile::execute_fixed(const string& token, string& } if ((info.first != "DUM") && (idx != temp.size())) { - throw_ins_error("error converting '" + temp + "' to double on output line '" + last_out_line + "' for fixed instruciton: '" + token + "', left-over chars: '" + temp.substr(idx, temp.size()) + "'", ins_line_num, out_line_num); + string leftover = temp.substr(idx, temp.size()); + pest_utils::strip_ip(leftover); + if (leftover.size() > 0) + throw_ins_error("error converting '" + temp + "' to double on output line '" + last_out_line + "' for fixed instruciton: '" + token + "', left-over chars: '" + leftover + "'", ins_line_num, out_line_num); } int pos = line.find(temp); if (pos == string::npos)