fixed ug in reading statobs

diyabc · Jan 18, 2021 · 6724608 · 6724608
1 parent c038715
commit 6724608
Show file tree

Hide file tree

Showing 5 changed files with 91 additions and 7 deletions.
diff --git a/src/readstatobs.hpp b/src/readstatobs.hpp
@@ -13,7 +13,7 @@ vector<double> readStatObs(const std::string &path) {
  ifstream statobsStream(path,ios::in);
  statobsStream >> noskipws;
  const std::string sS(istream_iterator<char>{statobsStream}, {});
- const regex stat_re(R"#((-?\d+\.\d+)\w)#"); 
+ const regex stat_re(R"#(\s(-?\d+\.\d+)\s)#"); 
  sregex_token_iterator itstat(begin(sS), end(sS), stat_re, {1});
  vector<double> statobs;
  auto it = itstat;

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -13,7 +13,8 @@ add_definitions(-DRFTEST_TOLERANCE=${RFTEST_TOLERANCE})
 
 ### HDF5 et HighFive
 ### HDF5
-find_package(hdf5 CONFIG REQUIRED)
+# find_package(hdf5 CONFIG REQUIRED)
+find_package(HDF5 COMPONENTS CXX)
 find_package(HighFive CONFIG REQUIRED)
 
 find_package(Catch2 CONFIG REQUIRED)