Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-solvers
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
Show more breadcrumbs
agnumpde
dune-solvers
Commits
884ef870
Commit
884ef870
authored
9 years ago
by
Jonathan Youett
Browse files
Options
Downloads
Patches
Plain Diff
Remove unused and rarely used typedefs
parent
2238bfbc
No related branches found
No related tags found
Loading
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dune/solvers/test/mmgtest.cc
+1
-5
1 addition, 5 deletions
dune/solvers/test/mmgtest.cc
dune/solvers/test/quadraticipoptsolvertest.cc
+1
-4
1 addition, 4 deletions
dune/solvers/test/quadraticipoptsolvertest.cc
with
2 additions
and
9 deletions
dune/solvers/test/mmgtest.cc
+
1
−
5
View file @
884ef870
...
@@ -30,10 +30,6 @@
...
@@ -30,10 +30,6 @@
template
<
class
GridType
,
class
MatrixType
,
class
VectorType
,
class
BitVector
>
template
<
class
GridType
,
class
MatrixType
,
class
VectorType
,
class
BitVector
>
void
solveObstacleProblemByMMGSolver
(
const
GridType
&
grid
,
const
MatrixType
&
mat
,
VectorType
&
x
,
const
VectorType
&
rhs
,
const
BitVector
&
ignore
,
int
maxIterations
=
100
,
double
tolerance
=
1.0e-10
)
void
solveObstacleProblemByMMGSolver
(
const
GridType
&
grid
,
const
MatrixType
&
mat
,
VectorType
&
x
,
const
VectorType
&
rhs
,
const
BitVector
&
ignore
,
int
maxIterations
=
100
,
double
tolerance
=
1.0e-10
)
{
{
typedef
VectorType
Vector
;
typedef
MatrixType
Matrix
;
typedef
EnergyNorm
<
Matrix
,
Vector
>
Norm
;
// create double obstacle constraints
// create double obstacle constraints
const
int
blockSize
=
VectorType
::
block_type
::
dimension
;
const
int
blockSize
=
VectorType
::
block_type
::
dimension
;
...
@@ -68,7 +64,7 @@ void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat
...
@@ -68,7 +64,7 @@ void solveObstacleProblemByMMGSolver(const GridType& grid, const MatrixType& mat
Dune
::
BitSetVector
<
blockSize
>
hasObstacle
(
x
.
size
(),
true
);
Dune
::
BitSetVector
<
blockSize
>
hasObstacle
(
x
.
size
(),
true
);
mmgStep
.
hasObstacle_
=
&
hasObstacle
;
mmgStep
.
hasObstacle_
=
&
hasObstacle
;
std
::
vector
<
BoxConstraint
<
typename
Vector
::
field_type
,
blockSize
>
>
boxConstraints
(
rhs
.
size
());
std
::
vector
<
BoxConstraint
<
typename
Vector
Type
::
field_type
,
blockSize
>
>
boxConstraints
(
rhs
.
size
());
for
(
int
i
=
0
;
i
<
boxConstraints
.
size
();
++
i
)
for
(
int
i
=
0
;
i
<
boxConstraints
.
size
();
++
i
)
{
{
for
(
int
j
=
0
;
j
<
blockSize
;
++
j
)
for
(
int
j
=
0
;
j
<
blockSize
;
++
j
)
...
...
This diff is collapsed.
Click to expand it.
dune/solvers/test/quadraticipoptsolvertest.cc
+
1
−
4
View file @
884ef870
...
@@ -28,15 +28,12 @@
...
@@ -28,15 +28,12 @@
template
<
class
GridType
,
class
MatrixType
,
class
VectorType
,
class
BitVector
>
template
<
class
GridType
,
class
MatrixType
,
class
VectorType
,
class
BitVector
>
void
solveObstacleProblemByQuadraticIPOptSolver
(
const
GridType
&
grid
,
const
MatrixType
&
mat
,
VectorType
&
x
,
const
VectorType
&
rhs
,
const
BitVector
&
ignore
,
int
maxIterations
=
100
,
double
tolerance
=
1.0e-10
)
void
solveObstacleProblemByQuadraticIPOptSolver
(
const
GridType
&
grid
,
const
MatrixType
&
mat
,
VectorType
&
x
,
const
VectorType
&
rhs
,
const
BitVector
&
ignore
,
int
maxIterations
=
100
,
double
tolerance
=
1.0e-10
)
{
{
typedef
VectorType
Vector
;
typedef
MatrixType
Matrix
;
typedef
EnergyNorm
<
Matrix
,
Vector
>
Norm
;
typedef
QuadraticIPOptSolver
<
MatrixType
,
VectorType
>
Solver
;
typedef
QuadraticIPOptSolver
<
MatrixType
,
VectorType
>
Solver
;
const
int
blockSize
=
VectorType
::
block_type
::
dimension
;
const
int
blockSize
=
VectorType
::
block_type
::
dimension
;
// create double obstacle constraints
// create double obstacle constraints
std
::
vector
<
BoxConstraint
<
typename
Vector
::
field_type
,
blockSize
>
>
boxConstraints
(
rhs
.
size
());
std
::
vector
<
BoxConstraint
<
typename
Vector
Type
::
field_type
,
blockSize
>
>
boxConstraints
(
rhs
.
size
());
for
(
int
i
=
0
;
i
<
boxConstraints
.
size
();
++
i
)
for
(
int
i
=
0
;
i
<
boxConstraints
.
size
();
++
i
)
{
{
for
(
int
j
=
0
;
j
<
blockSize
;
++
j
)
for
(
int
j
=
0
;
j
<
blockSize
;
++
j
)
...
...
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