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
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Container registry
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
Patrick Jaap
dune-solvers
Commits
d49b1348
"src/utils/tobool.hh" did not exist on "b81d75b43f0c2d563bbf25bc527a5480f74bbd82"
Commit
d49b1348
authored
6 years ago
by
podlesny
Browse files
Options
Downloads
Patches
Plain Diff
init public members with nullptr for more meaningful fault messages if not set
parent
9788b61b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
dune/solvers/iterationsteps/projectedblockgsstep.cc
+4
-0
4 additions, 0 deletions
dune/solvers/iterationsteps/projectedblockgsstep.cc
dune/solvers/iterationsteps/projectedblockgsstep.hh
+2
-2
2 additions, 2 deletions
dune/solvers/iterationsteps/projectedblockgsstep.hh
with
6 additions
and
2 deletions
dune/solvers/iterationsteps/projectedblockgsstep.cc
+
4
−
0
View file @
d49b1348
...
...
@@ -5,6 +5,8 @@ template<class MatrixType, class VectorType>
inline
void
ProjectedBlockGSStep
<
MatrixType
,
VectorType
>::
iterate
()
{
assert
(
hasObstacle_
!=
nullptr
);
if
(
hasObstacle_
->
size
()
!=
(
unsigned
int
)
this
->
x_
->
size
())
DUNE_THROW
(
SolverError
,
"Size of hasObstacle ("
<<
hasObstacle_
->
size
()
<<
") doesn't match solution vector ("
<<
this
->
x_
->
size
()
<<
")"
);
...
...
@@ -46,6 +48,8 @@ void ProjectedBlockGSStep<MatrixType, VectorType>::iterate()
// Solve the local constraint minimization problem
// We use a projected Gauss-Seidel, for lack of anything better
assert
(
obstacles_
!=
nullptr
);
Obstacle
defectObstacle
=
(
*
obstacles_
)[
i
];
defectObstacle
-=
x
;
...
...
This diff is collapsed.
Click to expand it.
dune/solvers/iterationsteps/projectedblockgsstep.hh
+
2
−
2
View file @
d49b1348
...
...
@@ -48,8 +48,8 @@ public:
using
HasObstacle
=
Dune
::
BitSetVector
<
BlockSize
>
;
using
Obstacle
=
BoxConstraint
<
Field
,
BlockSize
>
;
const
HasObstacle
*
hasObstacle_
;
const
std
::
vector
<
Obstacle
>*
obstacles_
;
const
HasObstacle
*
hasObstacle_
=
nullptr
;
const
std
::
vector
<
Obstacle
>*
obstacles_
=
nullptr
;
};
#include
"projectedblockgsstep.cc"
...
...
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