Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-tectonic
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Container registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
podlesny
dune-tectonic
Commits
fa958556
Commit
fa958556
authored
13 years ago
by
Elias Pipping
Committed by
Elias Pipping
13 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Do away with dummy nonlinearities
parent
b75bc87e
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dune/tectonic/myblockproblem.hh
+0
-2
0 additions, 2 deletions
dune/tectonic/myblockproblem.hh
dune/tectonic/myconvexproblem.hh
+4
-10
4 additions, 10 deletions
dune/tectonic/myconvexproblem.hh
src/one-body-sample.cc
+3
-8
3 additions, 8 deletions
src/one-body-sample.cc
with
7 additions
and
20 deletions
dune/tectonic/myblockproblem.hh
+
0
−
2
View file @
fa958556
...
...
@@ -7,7 +7,6 @@
#include
<dune/common/bitsetvector.hh>
#include
<dune/tnnmg/problem-classes/bisection.hh>
#include
<dune/tnnmg/problem-classes/nonlinearity.hh>
#include
<dune/tnnmg/problem-classes/onedconvexfunction.hh>
#include
"mynonlinearity.hh"
...
...
@@ -20,7 +19,6 @@ template <class MyConvexProblemTypeTEMPLATE> class MyBlockProblem {
public:
typedef
MyConvexProblemTypeTEMPLATE
MyConvexProblemType
;
typedef
typename
MyConvexProblemType
::
FunctionType
FunctionType
;
typedef
typename
MyConvexProblemType
::
NonlinearityType
NonlinearityType
;
typedef
typename
MyConvexProblemType
::
VectorType
VectorType
;
typedef
typename
MyConvexProblemType
::
MatrixType
MatrixType
;
typedef
typename
MyConvexProblemType
::
LocalVectorType
LocalVectorType
;
...
...
This diff is collapsed.
Click to expand it.
dune/tectonic/myconvexproblem.hh
+
4
−
10
View file @
fa958556
...
...
@@ -3,19 +3,15 @@
#ifndef MY_CONVEX_PROBLEM_HH
#define MY_CONVEX_PROBLEM_HH
#include
<dune/tnnmg/problem-classes/nonlinearity.hh>
/** \brief TODO
\tparam NonlinearityTypeTEMPLATE The type used to implement the nonlinearity
\tparam MatrixTypeTEMPLATE The type used for the matrix of the quadratic
part
*/
template
<
class
Nonlinearity
TypeTEMPLATE
,
class
Matrix
TypeTEMPLATE
,
class
VectorTypeTEMPLATE
,
class
FunctionTypeTEMPLATE
>
template
<
class
Matrix
TypeTEMPLATE
,
class
Vector
TypeTEMPLATE
,
class
FunctionTypeTEMPLATE
>
class
MyConvexProblem
{
public:
typedef
NonlinearityTypeTEMPLATE
NonlinearityType
;
typedef
FunctionTypeTEMPLATE
FunctionType
;
typedef
VectorTypeTEMPLATE
VectorType
;
typedef
MatrixTypeTEMPLATE
MatrixType
;
...
...
@@ -27,17 +23,15 @@ class MyConvexProblem {
/** \brief Constructor with the problem components
\param A The matrix of the quadratic part
\param phi The nonlinearity
\param f The linear functional
\param u The solution vector
*/
MyConvexProblem
(
MatrixType
const
&
A
,
Dune
::
MyGlobalNonlinearity
<
block_size
,
FunctionType
>
&
newphi
,
NonlinearityType
&
phi
,
VectorType
const
&
f
,
VectorType
&
u
)
:
A
(
A
),
newphi
(
newphi
),
phi
(
phi
),
f
(
f
),
u
(
u
)
{};
VectorType
const
&
f
,
VectorType
&
u
)
:
A
(
A
),
newphi
(
newphi
),
f
(
f
),
u
(
u
)
{};
MatrixType
const
&
A
;
NonlinearityType
&
phi
;
Dune
::
MyGlobalNonlinearity
<
block_size
,
FunctionType
>
const
&
newphi
;
VectorType
const
&
f
;
...
...
This diff is collapsed.
Click to expand it.
src/one-body-sample.cc
+
3
−
8
View file @
fa958556
...
...
@@ -28,8 +28,6 @@
#include
<dune/fufem/functionspacebases/p1nodalbasis.hh>
#include
<dune/tnnmg/iterationsteps/genericnonlineargs.hh>
#include
<dune/tnnmg/problem-classes/nonlinearity.hh>
#include
<dune/tnnmg/nonlinearities/zerononlinearity.hh>
#include
<dune/solvers/common/numproc.hh>
// Solver::FULL
#include
<dune/solvers/iterationsteps/blockgsstep.hh>
...
...
@@ -207,14 +205,11 @@ int main() {
// experiment with convex problems and the like
typedef
ZeroNonlinearity
<
SmallVector
,
SmallMatrix
>
NonlinearityType
;
NonlinearityType
phi
;
typedef
MyConvexProblem
<
NonlinearityType
,
OperatorType
,
VectorType
,
Dune
::
LinearFunction
>
MyConvexProblemType
;
typedef
MyConvexProblem
<
OperatorType
,
VectorType
,
Dune
::
LinearFunction
>
MyConvexProblemType
;
MyConvexProblemType
myConvexProblem
(
stiffnessMatrix
,
myGlobalNonlinearity
,
phi
,
f
,
u1
);
f
,
u1
);
typedef
MyBlockProblem
<
MyConvexProblemType
>
MyBlockProblemType
;
MyBlockProblemType
myBlockProblem
(
myConvexProblem
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment