From a8bb15e19b13f37eab8c2f074b0ccb1bb6f19f55 Mon Sep 17 00:00:00 2001
From: Elias Pipping <elias.pipping@fu-berlin.de>
Date: Sat, 14 Dec 2013 15:25:25 +0100
Subject: [PATCH] [Cleanup] Extract type from Assembler
---
src/one-body-sample.cc | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/one-body-sample.cc b/src/one-body-sample.cc
index 49e101b7..36959563 100644
--- a/src/one-body-sample.cc
+++ b/src/one-body-sample.cc
@@ -93,14 +93,6 @@ int main(int argc, char *argv[]) {
parset);
Dune::ParameterTreeParser::readOptions(argc, argv, parset);
- using LocalMatrix = Dune::FieldMatrix<double, dims, dims>;
- using LocalScalarMatrix = Dune::FieldMatrix<double, 1, 1>;
- using LocalVector = Dune::FieldVector<double, dims>;
- using Matrix = Dune::BCRSMatrix<LocalMatrix>;
- using ScalarMatrix = Dune::BCRSMatrix<LocalScalarMatrix>;
- using ScalarVector = Dune::BlockVector<Dune::FieldVector<double, 1>>;
- using Vector = Dune::BlockVector<LocalVector>;
-
auto const youngModulus = parset.get<double>("body.youngModulus");
auto const poissonRatio = parset.get<double>("body.poissonRatio");
auto const shearViscosity = parset.get<double>("body.shearViscosity");
@@ -125,7 +117,7 @@ int main(int argc, char *argv[]) {
grid = Dune::StructuredGridFactory<Grid>::createSimplexGrid(
lowerLeft, upperRight, elements);
}
- LocalVector zenith(0);
+ Dune::FieldVector<double, dims> zenith(0);
zenith[1] = 1;
auto const refinements = parset.get<size_t>("grid.refinements");
@@ -207,6 +199,12 @@ int main(int argc, char *argv[]) {
normalStress);
using MyAssembler = MyAssembler<GridView, dims>;
+ using Matrix = MyAssembler::Matrix;
+ using LocalMatrix = Matrix::block_type;
+ using Vector = MyAssembler::Vector;
+ using LocalVector = Vector::block_type;
+ using ScalarMatrix = MyAssembler::ScalarMatrix;
+ using ScalarVector = MyAssembler::ScalarVector;
MyAssembler myAssembler(leafView);
--
GitLab