Commit 9d5566d9 authored by Timo Koch's avatar Timo Koch
Browse files

[cleanup] Use the tuples and get from std instead of dune in the rest of

dumux
reviewed by grueninger


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@15054 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent c71276db
......@@ -25,7 +25,6 @@
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
#include <dune/common/tuples.hh>
#include <dune/istl/btdmatrix.hh>
#include "splinecommon_.hh"
......@@ -185,8 +184,8 @@ public:
* This method uses a single STL-compatible container of sampling
* points, which are assumed to be tuple-like objects storing the
* X and Y coordinates. "tuple-like" means that the objects
* provide access to the x values via Dune::get<0>(obj) and to the
* y value via Dune::get<1>(obj) (e.g. std::tuple or
* provide access to the x values via std::get<0>(obj) and to the
* y value via std::get<1>(obj) (e.g. std::tuple or
* std::pair). "STL-compatible" means that the container provides
* access to iterators using the begin(), end() methods and also
* provides a size() method. Also, the number of entries in the X
......@@ -202,8 +201,8 @@ public:
typename XYContainer::const_iterator it = points.begin();
typename XYContainer::const_iterator endIt = points.end();
for (int i = 0; it != endIt; ++i, ++it) {
xPos_[i] = Dune::get<0>(*it);
yPos_[i] = Dune::get<1>(*it);
xPos_[i] = std::get<0>(*it);
yPos_[i] = std::get<1>(*it);
}
// make a full spline
......@@ -326,8 +325,8 @@ public:
* This method uses a single STL-compatible container of sampling
* points, which are assumed to be tuple-like objects storing the
* X and Y coordinates. "tuple-like" means that the objects
* provide access to the x values via Dune::get<0>(obj) and to the
* y value via Dune::get<1>(obj) (e.g. std::tuple or
* provide access to the x values via std::get<0>(obj) and to the
* y value via std::get<1>(obj) (e.g. std::tuple or
* std::pair). "STL-compatible" means that the container provides
* access to iterators using the begin(), end() methods and also
* provides a size() method. Also, the number of entries in the X
......@@ -341,8 +340,8 @@ public:
typename XYContainer::const_iterator it = points.begin();
typename XYContainer::const_iterator endIt = points.end();
for (int i = 0; it != endIt; ++i, ++it) {
xPos_[i] = Dune::get<0>(*it);
yPos_[i] = Dune::get<1>(*it);
xPos_[i] = std::get<0>(*it);
yPos_[i] = std::get<1>(*it);
}
// make a natural spline
......
......@@ -475,10 +475,10 @@ public:
typename TupleContainer::const_iterator it1 = it0;
++it1;
set(Dune::get<0>(*it0),
Dune::get<1>(*it0),
Dune::get<0>(*it1),
Dune::get<1>(*it1),
set(std::get<0>(*it0),
std::get<1>(*it0),
std::get<0>(*it1),
std::get<1>(*it1),
m0, m1);
}
......
......@@ -27,7 +27,6 @@
#include <cassert>
#include <dune/common/exceptions.hh>
#include <dune/common/tuples.hh>
#include <dune/common/float_cmp.hh>
#include "valgrind.hh"
......@@ -366,7 +365,7 @@ protected:
ListIterator it = srcBegin;
++it;
bool reverse = false;
if (Dune::get<0>(*srcBegin) > Dune::get<0>(*it))
if (std::get<0>(*srcBegin) > std::get<0>(*it))
reverse = true;
--it;
......@@ -375,8 +374,8 @@ protected:
int idx = i;
if (reverse)
idx = numSamples - i - 1;
destX[i] = Dune::get<0>(*it);
destY[i] = Dune::get<1>(*it);
destX[i] = std::get<0>(*it);
destY[i] = std::get<1>(*it);
}
}
......
......@@ -25,7 +25,6 @@
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
#include <dune/common/tuples.hh>
#include <dune/istl/bvector.hh>
#include <dune/istl/btdmatrix.hh>
......@@ -187,8 +186,8 @@ public:
* This method uses a single STL-compatible container of sampling
* points, which are assumed to be tuple-like objects storing the
* X and Y coordinates. "tuple-like" means that the objects
* provide access to the x values via Dune::get<0>(obj) and to the
* y value via Dune::get<1>(obj) (e.g. std::tuple or
* provide access to the x values via std::get<0>(obj) and to the
* y value via std::get<1>(obj) (e.g. std::tuple or
* std::pair). "STL-compatible" means that the container provides
* access to iterators using the begin(), end() methods and also
* provides a size() method. Also, the number of entries in the X
......@@ -204,8 +203,8 @@ public:
typename XYContainer::const_iterator it = points.begin();
typename XYContainer::const_iterator endIt = points.end();
for (int i = 0; it != endIt; ++i, ++it) {
xPos_[i] = Dune::get<0>(*it);
yPos_[i] = Dune::get<1>(*it);
xPos_[i] = std::get<0>(*it);
yPos_[i] = std::get<1>(*it);
}
// make a full spline
......@@ -334,8 +333,8 @@ public:
* This method uses a single STL-compatible container of sampling
* points, which are assumed to be tuple-like objects storing the
* X and Y coordinates. "tuple-like" means that the objects
* provide access to the x values via Dune::get<0>(obj) and to the
* y value via Dune::get<1>(obj) (e.g. std::tuple or
* provide access to the x values via std::get<0>(obj) and to the
* y value via std::get<1>(obj) (e.g. std::tuple or
* std::pair). "STL-compatible" means that the container provides
* access to iterators using the begin(), end() methods and also
* provides a size() method. Also, the number of entries in the X
......@@ -349,8 +348,8 @@ public:
typename XYContainer::const_iterator it = points.begin();
typename XYContainer::const_iterator endIt = points.end();
for (int i = 0; it != endIt; ++i, ++it) {
xPos_[i] = Dune::get<0>(*it);
yPos_[i] = Dune::get<1>(*it);
xPos_[i] = std::get<0>(*it);
yPos_[i] = std::get<1>(*it);
}
// make a natural spline
......
......@@ -314,7 +314,7 @@ private:
typename ForeignOverlapWithPeer::const_iterator endIt = peerOverlap.end();
int i = 0;
for (; it != endIt; ++it, ++i) {
int rowIdx = Dune::get<0>(*it);
int rowIdx = std::get<0>(*it);
assert(overlap_->isDomesticIndexFor(peerRank, rowIdx));
typedef typename BCRSMatrix::ConstColIterator ColIt;
......@@ -342,7 +342,7 @@ private:
i = 0;
it = peerOverlap.begin();
for (; it != endIt; ++it) {
int rowIdx = Dune::get<0>(*it);
int rowIdx = std::get<0>(*it);
assert(overlap_->isDomesticIndexFor(peerRank, rowIdx));
typedef typename BCRSMatrix::ConstColIterator ColIt;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment