revised fixed instruction to allow trailing whitespace - j doh says t…

…his is allowed...
jtwhite79 · Dec 3, 2024 · c24d977 · c24d977
1 parent 5e36ab8
commit c24d977
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -1557,7 +1557,10 @@ pair<string, double> 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)