From 6a3cef406bead161dcb03d93a9b1733d2f6f53b0 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Wed, 6 Dec 2017 10:53:42 +0100
Subject: [PATCH] Use Generic::readBinary from dune-matrix-vector
---
src/compute-disc-error.cc | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/compute-disc-error.cc b/src/compute-disc-error.cc
index f20f327c..9f57695c 100644
--- a/src/compute-disc-error.cc
+++ b/src/compute-disc-error.cc
@@ -11,6 +11,8 @@
#include <dune/functions/functionspacebases/pqknodalbasis.hh>
+#include <dune/matrix-vector/genericvectortools.hh>
+
#include <dune/fufem/discretizationerror.hh>
#include <dune/fufem/dunepython.hh>
@@ -57,7 +59,7 @@ void measureDiscreteEOC(const GridView gridView,
std::ifstream inFile(parameterSet.get<std::string>("simulationData"), std::ios_base::binary);
if (not inFile)
DUNE_THROW(IOError, "File " << parameterSet.get<std::string>("simulationData") << " could not be opened.");
- GenericVector::readBinary(inFile, embeddedX);
+ MatrixVector::Generic::readBinary(inFile, embeddedX);
inFile.peek(); // try to advance beyond the end of the file
if (not inFile.eof())
DUNE_THROW(IOError, "File '" << parameterSet.get<std::string>("simulationData") << "' does not have the correct size!");
@@ -77,7 +79,7 @@ void measureDiscreteEOC(const GridView gridView,
inFile.open(parameterSet.get<std::string>("referenceData"), std::ios_base::binary);
if (not inFile)
DUNE_THROW(IOError, "File " << parameterSet.get<std::string>("referenceData") << " could not be opened.");
- GenericVector::readBinary(inFile, embeddedReferenceX);
+ MatrixVector::Generic::readBinary(inFile, embeddedReferenceX);
inFile.peek(); // try to advance beyond the end of the file
if (not inFile.eof())
DUNE_THROW(IOError, "File '" << parameterSet.get<std::string>("referenceData") << "' does not have the correct size!");
@@ -212,7 +214,7 @@ void measureAnalyticalEOC(const GridView gridView,
std::ifstream inFile(parameterSet.get<std::string>("simulationData"), std::ios_base::binary);
if (not inFile)
DUNE_THROW(IOError, "File " << parameterSet.get<std::string>("simulationData") << " could not be opened.");
- GenericVector::readBinary(inFile, embeddedX);
+ MatrixVector::Generic::readBinary(inFile, embeddedX);
inFile.peek(); // try to advance beyond the end of the file
if (not inFile.eof())
DUNE_THROW(IOError, "File '" << parameterSet.get<std::string>("simulationData") << "' does not have the correct size!");
--
GitLab