Skip to content
Snippets Groups Projects
Commit 69096174 authored by Oliver Sander's avatar Oliver Sander Committed by sander
Browse files

.

[[Imported from SVN: r588]]
parent 47270eff
No related branches found
No related tags found
No related merge requests found
......@@ -32,11 +32,11 @@ namespace Dune
typedef FieldMatrix<double, blocksize, blocksize> MatrixBlock;
//! ???
typedef typename FunctionSpaceType::JacobianRange JacobianRange;
typedef typename FunctionSpaceType::JacobianRangeType JacobianRange;
//! ???
typedef typename FunctionSpaceType::RangeField RangeFieldType;
typedef typename FunctionSpaceType::Range RangeType;
typedef typename FunctionSpaceType::RangeFieldType RangeFieldType;
typedef typename FunctionSpaceType::RangeType RangeType;
/** \todo Does actually belong into the base class */
const GridType* grid_;
......@@ -55,7 +55,7 @@ namespace Dune
RodAssembler(const FunctionSpaceType &f) :
functionSpace_(f)
{
grid_ = &f.getGrid();
grid_ = &f.grid();
B = 1;
A1 = 1;
A3 = 1;
......
......@@ -3,6 +3,7 @@
#include <dune/grid/onedgrid.hh>
#include <dune/fem/lagrangebase.hh>
#include <dune/grid/common/gridpart.hh>
#include <dune/istl/io.hh>
......@@ -94,15 +95,15 @@ int main (int argc, char *argv[]) try
// //////////////////////////////////////////////////////////
typedef FunctionSpace < double , double, 1, 1 > RodFuncSpace;
typedef DefaultGridIndexSet<RodGridType,LevelIndex> RodIndexSet;
typedef LagrangeDiscreteFunctionSpace < RodFuncSpace, RodGridType,RodIndexSet, 1> RodFuncSpaceType;
typedef LevelGridPart<RodGridType> RodGridPartType;
typedef LagrangeDiscreteFunctionSpace < RodFuncSpace, RodGridPartType, 1> RodFuncSpaceType;
Array<RodIndexSet*> rodIndexSet(maxlevel+1);
Array<RodGridPartType*> rodGridPart(maxlevel+1);
Array<const RodFuncSpaceType*> rodFuncSpace(maxlevel+1);
for (int i=0; i<maxlevel+1; i++) {
rodIndexSet[i] = new RodIndexSet(rod, i);
rodFuncSpace[i] = new RodFuncSpaceType(rod, *rodIndexSet[i], i);
rodGridPart[i] = new RodGridPartType(rod, i);
rodFuncSpace[i] = new RodFuncSpaceType(*rodGridPart[i]);
}
......@@ -160,6 +161,7 @@ int main (int argc, char *argv[]) try
for (int i=0; i<obstacles[maxlevel].size(); i++) {
obstacles[maxlevel][i].clear();
obstacles[maxlevel][i].val[0] = - x[i][0];
obstacles[maxlevel][i].val[1] = 0.1 - x[i][0];
}
......
# Number of grid levels
minLevel = 0
maxLevel = 0
# Number of uniform grid refinement steps
maxLevel = 4
# Initial load increment
loadIncrement = 1
loadIncrement = 0.01
# Max number of steps of the Newton solver
maxNewtonSteps = 10
maxNewtonSteps = 30
# Number of multigrid iterations per time step
numIt = 100
......@@ -25,7 +23,7 @@ mu = 1
baseIt = 100
# Tolerance of the solver
tolerance = -1
tolerance = 1e-10
# Tolerance of the base grid solver
baseTolerance = -1
......@@ -35,4 +33,4 @@ baseTolerance = -1
############################
# Number of elements of the rod grid
numRodElements = 40
numRodBaseElements = 5
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