From 3aabf8b1075bbaeef5237979f8a649a9dc0fe482 Mon Sep 17 00:00:00 2001
From: Oliver Sander <oliver.sander@tu-dresden.de>
Date: Wed, 30 May 2018 16:06:15 +0200
Subject: [PATCH] Modernize two unit tests
---
test/frameinvariancetest.cc | 19 ++++++++-----------
test/globalgfetestfunctionbasistest.cc | 14 ++++++--------
2 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/test/frameinvariancetest.cc b/test/frameinvariancetest.cc
index 95180a69..f9a355a8 100644
--- a/test/frameinvariancetest.cc
+++ b/test/frameinvariancetest.cc
@@ -23,8 +23,6 @@ using std::string;
int main (int argc, char *argv[]) try
{
// Some types that I need
- typedef BCRSMatrix<FieldMatrix<double, blocksize, blocksize> > MatrixType;
- typedef BlockVector<FieldVector<double, blocksize> > CorrectionType;
typedef std::vector<RigidBodyMotion<double,3> > SolutionType;
// Problem settings
@@ -35,8 +33,10 @@ int main (int argc, char *argv[]) try
// ///////////////////////////////////////
typedef OneDGrid GridType;
GridType grid(numRodBaseElements, 0, 1);
+ using GridView = GridType::LeafGridView;
+ GridView gridView = grid.leafGridView();
- SolutionType x(grid.size(1));
+ SolutionType x(gridView.size(1));
// //////////////////////////
// Initial solution
@@ -57,10 +57,7 @@ int main (int argc, char *argv[]) try
// Create a second, rotated copy of the configuration
// /////////////////////////////////////////////////////////////////////
- FieldVector<double,3> displacement;
- displacement[0] = 0;
- displacement[1] = 0;
- displacement[2] = 0;
+ FieldVector<double,3> displacement {0, 0, 0};
FieldVector<double,3> axis(0); axis[0]=1;
Rotation<double,3> rotation(axis,M_PI/2);
@@ -88,20 +85,20 @@ int main (int argc, char *argv[]) try
writeRod(x,"rod");
writeRod(rotatedX, "rotated");
- RodLocalStiffness<GridType::LeafGridView,double> assembler(grid.leafGridView(),
+ RodLocalStiffness<GridView,double> assembler(gridView,
1,1,1,1e6,0.3);
for (int i=1; i<2; i++) {
double p = double(i)/2;
- assembler.getStrain(x,*grid.lbegin<0>(0), p);
- assembler.getStrain(rotatedX,*grid.lbegin<0>(0), p);
+ assembler.getStrain(x,*gridView.begin<0>(), p);
+ assembler.getStrain(rotatedX,*gridView.begin<0>(), p);
}
} catch (Exception e) {
- std::cout << e << std::endl;
+ std::cout << e.what() << std::endl;
}
diff --git a/test/globalgfetestfunctionbasistest.cc b/test/globalgfetestfunctionbasistest.cc
index beb1d719..16e8cc53 100644
--- a/test/globalgfetestfunctionbasistest.cc
+++ b/test/globalgfetestfunctionbasistest.cc
@@ -41,19 +41,17 @@ void test()
typedef GlobalGFETestFunctionBasis<P1Basis,TargetSpace> GlobalBasis;
GlobalBasis basis(p1Basis,testPoints);
- typedef typename OneDGrid::Codim<0>::LeafIterator ElementIterator;
- ElementIterator eIt = grid.leafbegin<0>();
- ElementIterator eEndIt = grid.leafend<0>();
-
- for (; eIt != eEndIt; ++eIt) {
-
- const typename GlobalBasis::LocalFiniteElement& lfe = basis.getLocalFiniteElement(*eIt);
+ for (const auto element : elements(grid.leafGridView()))
+ {
+ const typename GlobalBasis::LocalFiniteElement& lfe = basis.getLocalFiniteElement(element);
FieldVector<double,1> stupidTestPoint(0);
std::vector<std::array<typename TargetSpace::EmbeddedTangentVector, TargetSpace::TangentVector::dimension> > values;
lfe.localBasis().evaluateFunction(stupidTestPoint, values);
for(size_t i=0;i<values.size();i++) {
- std::cout<<values[i]<<std::endl;
+ for (auto v : values[i])
+ std::cout << v << " ";
+ std::cout << std::endl;
std::cout<<lfe.localCoefficients().localKey(i)<<std::endl;
}
//int i = basis.index(*eIt,1);
--
GitLab