Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-gfe
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Sander, Oliver
dune-gfe
Commits
3689cff2
Commit
3689cff2
authored
15 years ago
by
Oliver Sander
Committed by
sander@PCPOOL.MI.FU-BERLIN.DE
15 years ago
Browse files
Options
Downloads
Patches
Plain Diff
run and don't crash
[[Imported from SVN: r5528]]
parent
38f391a9
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
src/targetspacertrsolver.cc
+2
-3
2 additions, 3 deletions
src/targetspacertrsolver.cc
src/targetspacertrsolver.hh
+12
-4
12 additions, 4 deletions
src/targetspacertrsolver.hh
with
14 additions
and
7 deletions
src/targetspacertrsolver.cc
+
2
−
3
View file @
3689cff2
...
@@ -17,7 +17,7 @@ setup(const AverageDistanceAssembler<TargetSpace>* assembler,
...
@@ -17,7 +17,7 @@ setup(const AverageDistanceAssembler<TargetSpace>* assembler,
double
innerTolerance
)
double
innerTolerance
)
{
{
x_
=
x
;
x_
=
x
;
this
->
tolerance_
=
tolerance
;
tolerance_
=
tolerance
;
maxTrustRegionSteps_
=
maxTrustRegionSteps
;
maxTrustRegionSteps_
=
maxTrustRegionSteps
;
initialTrustRegionRadius_
=
initialTrustRegionRadius
;
initialTrustRegionRadius_
=
initialTrustRegionRadius
;
innerIterations_
=
innerIterations
;
innerIterations_
=
innerIterations
;
...
@@ -42,8 +42,7 @@ setup(const AverageDistanceAssembler<TargetSpace>* assembler,
...
@@ -42,8 +42,7 @@ setup(const AverageDistanceAssembler<TargetSpace>* assembler,
// Create obstacles
// Create obstacles
// //////////////////////////////////////////////////////////
// //////////////////////////////////////////////////////////
innerSolverStep
->
obstacle_
->
resize
(
1
);
//innerSolverStep->hasObstacle_ = &dummyObstacle_;
innerSolverStep
->
obstacle_
->
setAll
();
}
}
...
...
This diff is collapsed.
Click to expand it.
src/targetspacertrsolver.hh
+
12
−
4
View file @
3689cff2
...
@@ -18,8 +18,10 @@ class TargetSpaceRiemannianTRSolver
...
@@ -18,8 +18,10 @@ class TargetSpaceRiemannianTRSolver
typedef
double
field_type
;
typedef
double
field_type
;
// Some types that I need
// Some types that I need
typedef
Dune
::
FieldMatrix
<
field_type
,
blocksize
,
blocksize
>
MatrixType
;
// The types have the dynamic outer type because the dune-solvers solvers expect
typedef
Dune
::
FieldVector
<
field_type
,
blocksize
>
CorrectionType
;
// this sort of type.
typedef
Dune
::
Matrix
<
Dune
::
FieldMatrix
<
field_type
,
blocksize
,
blocksize
>
>
MatrixType
;
typedef
Dune
::
BlockVector
<
Dune
::
FieldVector
<
field_type
,
blocksize
>
>
CorrectionType
;
public:
public:
...
@@ -49,6 +51,9 @@ protected:
...
@@ -49,6 +51,9 @@ protected:
/** \brief The solution vector */
/** \brief The solution vector */
TargetSpace
x_
;
TargetSpace
x_
;
/** \brief Tolerance of the solver */
double
tolerance_
;
/** \brief The initial trust-region radius in the maximum-norm */
/** \brief The initial trust-region radius in the maximum-norm */
double
initialTrustRegionRadius_
;
double
initialTrustRegionRadius_
;
...
@@ -61,11 +66,14 @@ protected:
...
@@ -61,11 +66,14 @@ protected:
/** \brief Error tolerance of the multigrid QP solver */
/** \brief Error tolerance of the multigrid QP solver */
double
innerTolerance_
;
double
innerTolerance_
;
/** \brief The assembler for the
material law
*/
/** \brief The assembler for the
average-distance functional
*/
const
AverageDistanceAssembler
<
TargetSpace
>*
assembler_
;
const
AverageDistanceAssembler
<
TargetSpace
>*
assembler_
;
/** \brief The solver for the quadratic inner problems */
/** \brief The solver for the quadratic inner problems */
::
LoopSolver
<
Dune
::
array
<
CorrectionType
,
1
>
>*
innerSolver_
;
::
LoopSolver
<
CorrectionType
>*
innerSolver_
;
// /** \brief Dummy field for the trustregiongsstep */
// Dune::BitSetVector<blocksize> dummyObstacle_;
};
};
...
...
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