Reading text files created on windows 349 (SimVascular#374)

* Change file name.

* Add removing esc r when reading text files.

Author: ktbolt

Code/Source/solver/read_files.cpp

@@ -1571,6 +1571,7 @@ void read_fiber_temporal_values_file(FiberReinforcementStressParameters& fiber_p
   std::string line;
 
   while (std::getline(temporal_values_file, line)) { 
+    line.erase(std::remove(line.begin(), line.end(), '\r'), line.end());
     if (line == "") {
       continue;
     }
@@ -1859,6 +1860,7 @@ void read_fourier_coeff_values_file(const std::string& file_name, bcType& lBc)
   int n = 0;
 
   while (std::getline(temporal_values_file, line)) { 
+    line.erase(std::remove(line.begin(), line.end(), '\r'), line.end());
     if (line == "") {
       continue;
     }
@@ -1884,6 +1886,7 @@ void read_fourier_coeff_values_file(const std::string& file_name, bcType& lBc)
   int j = 0;
 
   while (std::getline(temporal_values_file, line)) { 
+    line.erase(std::remove(line.begin(), line.end(), '\r'), line.end());
     if (line == "") {
       continue;
     }
@@ -1926,6 +1929,7 @@ void read_fourier_coeff_values_file(const std::string& file_name, bfType& lBf)
   int n = 0;
 
   while (std::getline(temporal_values_file, line)) { 
+    line.erase(std::remove(line.begin(), line.end(), '\r'), line.end());
     if (line == "") {
       continue;
     }
@@ -1951,6 +1955,7 @@ void read_fourier_coeff_values_file(const std::string& file_name, bfType& lBf)
   int j = 0;
 
   while (std::getline(temporal_values_file, line)) { 
+    line.erase(std::remove(line.begin(), line.end(), '\r'), line.end());
     if (line == "") {
       continue;
     }
@@ -2600,6 +2605,7 @@ void read_temporal_values(const std::string& file_name, bcType& lBc)
   std::string line;
 
   while (std::getline(temporal_values_file, line)) { 
+    line.erase(std::remove(line.begin(), line.end(), '\r'), line.end());
     if (line == "") {
       continue;
     }
@@ -2608,14 +2614,15 @@ void read_temporal_values(const std::string& file_name, bcType& lBc)
 
     while (!line_input.eof()) {
       line_input >> value;
+
       if (line_input.fail()) { 
-        throw std::runtime_error("Error reading values for the temporal values file '" + file_name + "' for line '" + line + "'.");
+        throw std::runtime_error("1: Error reading values for the temporal values file '" + file_name + "' for line '" + line + "'.");
       }
       values.push_back(value);
     }
 
     if (values.size() != 2) { 
-      throw std::runtime_error("Error reading values for the temporal values file '" + file_name + "' for line '" + line + "'.");
+      throw std::runtime_error("2: Error reading values for the temporal values file '" + file_name + "' for line '" + line + "'.");
     }
 
     temporal_values.push_back(values);
@@ -2657,6 +2664,7 @@ void read_temporal_values(const std::string& file_name, bfType& lBf)
   std::string line;
 
   while (std::getline(temporal_values_file, line)) { 
+    line.erase(std::remove(line.begin(), line.end(), '\r'), line.end());
     if (line == "") {
       continue;
     }