Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-elasticity
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
agnumpde
dune-elasticity
Commits
6cccee3a
Commit
6cccee3a
authored
17 years ago
by
Oliver Sander
Committed by
sander@PCPOOL.MI.FU-BERLIN.DE
17 years ago
Browse files
Options
Downloads
Patches
Plain Diff
compile with recent changes in ag-common
[[Imported from SVN: r9918]]
parent
f2085316
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
linelast.cc
+5
-3
5 additions, 3 deletions
linelast.cc
nonlinelast.cc
+40
-3
40 additions, 3 deletions
nonlinelast.cc
with
45 additions
and
6 deletions
linelast.cc
+
5
−
3
View file @
6cccee3a
...
@@ -15,13 +15,15 @@
...
@@ -15,13 +15,15 @@
#include
<dune/ag-common/sampleonbitfield.hh>
#include
<dune/ag-common/sampleonbitfield.hh>
#include
<dune/ag-common/prolongboundarypatch.hh>
#include
<dune/ag-common/prolongboundarypatch.hh>
#include
<dune/ag-common/readbitfield.hh>
#include
<dune/ag-common/readbitfield.hh>
#include
<dune/ag-common/linearipopt.hh>
#ifdef HAVE_IPOPT_CPP
#include
<dune/ag-common/quadraticipopt.hh>
#endif
#include
<dune/ag-common/blockgsstep.hh>
#include
<dune/ag-common/blockgsstep.hh>
#include
<dune/ag-common/multigridstep.hh>
#include
<dune/ag-common/multigridstep.hh>
#include
<dune/ag-common/multigridtransfer.hh>
#include
<dune/ag-common/multigridtransfer.hh>
#include
<dune/ag-common/iterativesolver.hh>
#include
<dune/ag-common/iterativesolver.hh>
#include
<dune/ag-common/energynorm.hh>
#include
<dune/ag-common/
norm/
energynorm.hh>
#include
<dune/ag-common/hierarchicestimator.hh>
#include
<dune/ag-common/hierarchicestimator.hh>
...
@@ -139,7 +141,7 @@ int main (int argc, char *argv[]) try
...
@@ -139,7 +141,7 @@ int main (int argc, char *argv[]) try
// First create a base solver
// First create a base solver
#ifdef IPOPT_BASE
#ifdef IPOPT_BASE
Linear
IPOptSolver
<
VectorType
>
baseSolver
;
Quadratic
IPOptSolver
<
OperatorType
,
VectorType
>
baseSolver
;
#else // Gauss-Seidel is the base solver
#else // Gauss-Seidel is the base solver
...
...
This diff is collapsed.
Click to expand it.
nonlinelast.cc
+
40
−
3
View file @
6cccee3a
...
@@ -16,8 +16,8 @@
...
@@ -16,8 +16,8 @@
#include
<dune/ag-common/readbitfield.hh>
#include
<dune/ag-common/readbitfield.hh>
#include
<dune/ag-common/quadraticipopt.hh>
#include
<dune/ag-common/quadraticipopt.hh>
#include
<dune/ag-common/iterativesolver.hh>
#include
<dune/ag-common/iterativesolver.hh>
#include
<dune/ag-common/energynorm.hh>
#include
<dune/ag-common/
norm/
energynorm.hh>
#include
<dune/ag-common/mmgstep.hh>
#include
<dune/ag-common/
solver/
mmgstep.hh>
// Choose a solver
// Choose a solver
#define IPOPT
#define IPOPT
...
@@ -94,8 +94,45 @@ int main (int argc, char *argv[]) try
...
@@ -94,8 +94,45 @@ int main (int argc, char *argv[]) try
}
}
// hack Dirichlet data
dirichletNodes
[
numLevels
-
1
][
2
*
61
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
61
+
1
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
62
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
62
+
1
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
56
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
56
+
1
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
58
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
58
+
1
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
79
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
79
+
1
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
74
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
74
+
1
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
76
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
76
+
1
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
73
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
73
+
1
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
4
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
4
+
1
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
1
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
1
+
1
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
11
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
11
+
1
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
9
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
9
+
1
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
27
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
27
+
1
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
25
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
25
+
1
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
33
]
=
false
;
dirichletNodes
[
numLevels
-
1
][
2
*
33
+
1
]
=
false
;
sampleOnBitField
(
grid
,
dirichletValues
,
dirichletNodes
);
sampleOnBitField
(
grid
,
dirichletValues
,
dirichletNodes
);
dirichletValues
[
numLevels
-
1
][
0
][
1
]
=
0.2
;
dirichletValues
[
numLevels
-
1
][
31
][
1
]
=
0.2
;
int
maxlevel
=
grid
.
maxLevel
();
int
maxlevel
=
grid
.
maxLevel
();
// Determine Dirichlet dofs
// Determine Dirichlet dofs
...
@@ -241,7 +278,7 @@ int main (int argc, char *argv[]) try
...
@@ -241,7 +278,7 @@ int main (int argc, char *argv[]) try
LeafAmiraMeshWriter
<
GridType
>
amiramesh
;
LeafAmiraMeshWriter
<
GridType
>
amiramesh
;
amiramesh
.
addLeafGrid
(
grid
,
true
);
amiramesh
.
addLeafGrid
(
grid
,
true
);
amiramesh
.
addVertexData
(
x
,
grid
.
leafIndexSet
());
amiramesh
.
addVertexData
(
x
,
grid
.
leafIndexSet
());
amiramesh
.
write
(
"resultGrid"
);
amiramesh
.
write
(
"resultGrid"
,
true
);
}
catch
(
Exception
e
)
{
}
catch
(
Exception
e
)
{
...
...
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