Merge branch 'develop' into develop

parthenon-hpc-lab · Nov 1, 2023 · 0eb31d1 · 0eb31d1
2 parents a282606 + 2857394
commit 0eb31d1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,7 @@
 - [[PR 868]](https://github.com/parthenon-hpc-lab/parthenon/pull/868) Add block-local face, edge, and nodal fields and allow for packing
 
 ### Changed (changing behavior/API/variables/...)
+- [[PR 965]](https://github.com/parthenon-hpc-lab/parthenon/pull/965) Allow leading whitespace in input parameters
 - [[PR 926]](https://github.com/parthenon-hpc-lab/parthenon/pull/926) Internal refinement op registration
 - [[PR 897]](https://github.com/parthenon-hpc-lab/parthenon/pull/897) Deflate compression filter is not called any more if compression is soft disabled
 - [[PR 896]](https://github.com/parthenon-hpc-lab/parthenon/pull/896) Update Kokkos integration to support installed version. Use `serial` (flat MPI) host parallelization by default (instead of OpenMP)

diff --git a/src/parameter_input.cpp b/src/parameter_input.cpp
@@ -315,7 +315,7 @@ bool ParameterInput::ParseLine(InputBlock *pib, std::string line, std::string &n
     name.assign(line, first_char, len);
     last_char = name.find_last_not_of(" ");
     name.erase(last_char + 1, std::string::npos);
-    line.erase(0, len + 1);
+    line.erase(0, equal_char + 1);
   }
 
   cont_char = line.find_first_of("&"); // find "&" continuation character

diff --git a/tst/regression/test_suites/advection_performance/parthinput.advection_performance b/tst/regression/test_suites/advection_performance/parthinput.advection_performance
@@ -49,8 +49,8 @@ nx2 = 64
 nx3 = 64
 
 <parthenon/time>
-tlim = 1.0
-nlim = 20
+ tlim = 1.0 # Test that leading whitespace is correctly sanitized
+	nlim = 20 # Test that leading tab is correctly sanitized
 integrator = rk2
 perf_cycle_offset = 2