Skip to content
Snippets Groups Projects
Commit 62410230 authored by Dmitri Naumov's avatar Dmitri Naumov
Browse files

Merge pull request #690 from rinkk/TwoMoreWarnings

Fixed two more warnings
parents 083413a3 e8142e21
No related branches found
No related tags found
No related merge requests found
...@@ -56,7 +56,7 @@ bool FixedTimeStepping::next() ...@@ -56,7 +56,7 @@ bool FixedTimeStepping::next()
double FixedTimeStepping::computeEnd(double t_initial, double t_end, const std::vector<double> &dt_vector) double FixedTimeStepping::computeEnd(double t_initial, double t_end, const std::vector<double> &dt_vector)
{ {
double t_sum = t_initial + std::accumulate(dt_vector.begin(), dt_vector.end(), 0); double t_sum = t_initial + std::accumulate(dt_vector.begin(), dt_vector.end(), 0.);
return std::min(t_end, t_sum); return std::min(t_end, t_sum);
} }
......
...@@ -182,7 +182,7 @@ TEST_F(InSituMesh, MappedMeshSourceRoundtrip) ...@@ -182,7 +182,7 @@ TEST_F(InSituMesh, MappedMeshSourceRoundtrip)
if(dataMode == vtkXMLWriter::Ascii && compressed) if(dataMode == vtkXMLWriter::Ascii && compressed)
continue; continue;
FileIO::VtuInterface vtuInterface(mesh, dataMode, compressed); FileIO::VtuInterface vtuInterface(mesh, dataMode, compressed);
ASSERT_EQ(vtuInterface.writeToFile(test_data_file), 1); ASSERT_TRUE(vtuInterface.writeToFile(test_data_file));
// -- Read back VTK mesh // -- Read back VTK mesh
vtkSmartPointer<vtkXMLUnstructuredGridReader> reader = vtkSmartPointer<vtkXMLUnstructuredGridReader> reader =
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment