Skip to content
Snippets Groups Projects
Commit a8bb15e1 authored by Elias Pipping's avatar Elias Pipping
Browse files

[Cleanup] Extract type from Assembler

parent b39bc45b
No related branches found
No related tags found
No related merge requests found
...@@ -93,14 +93,6 @@ int main(int argc, char *argv[]) { ...@@ -93,14 +93,6 @@ int main(int argc, char *argv[]) {
parset); parset);
Dune::ParameterTreeParser::readOptions(argc, 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 youngModulus = parset.get<double>("body.youngModulus");
auto const poissonRatio = parset.get<double>("body.poissonRatio"); auto const poissonRatio = parset.get<double>("body.poissonRatio");
auto const shearViscosity = parset.get<double>("body.shearViscosity"); auto const shearViscosity = parset.get<double>("body.shearViscosity");
...@@ -125,7 +117,7 @@ int main(int argc, char *argv[]) { ...@@ -125,7 +117,7 @@ int main(int argc, char *argv[]) {
grid = Dune::StructuredGridFactory<Grid>::createSimplexGrid( grid = Dune::StructuredGridFactory<Grid>::createSimplexGrid(
lowerLeft, upperRight, elements); lowerLeft, upperRight, elements);
} }
LocalVector zenith(0); Dune::FieldVector<double, dims> zenith(0);
zenith[1] = 1; zenith[1] = 1;
auto const refinements = parset.get<size_t>("grid.refinements"); auto const refinements = parset.get<size_t>("grid.refinements");
...@@ -207,6 +199,12 @@ int main(int argc, char *argv[]) { ...@@ -207,6 +199,12 @@ int main(int argc, char *argv[]) {
normalStress); normalStress);
using MyAssembler = MyAssembler<GridView, dims>; 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); MyAssembler myAssembler(leafView);
......
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