Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-common
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
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
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
Core Modules
dune-common
Commits
62ac1e52
Commit
62ac1e52
authored
12 years ago
by
Markus Blatt
Browse files
Options
Downloads
Patches
Plain Diff
reverted patch because of wrong commit message
[[Imported from SVN: r6979]]
parent
9e68c5d2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dune/common/fassign.hh
+16
-29
16 additions, 29 deletions
dune/common/fassign.hh
with
16 additions
and
29 deletions
dune/common/fassign.hh
+
16
−
29
View file @
62ac1e52
...
...
@@ -38,11 +38,12 @@ namespace Dune {
/**
* @brief Marker class for next row
*
* overload operator <<= for Fi
e
ldMatrix assignment
* overload operator <<= for Fil
e
dMatrix assignment
*/
struct
NextRow
{
explicit
NextRow
(
int
)
{};
}
nextRow
(
0
);
}
// end empty namespace
/**
...
...
@@ -148,22 +149,22 @@ namespace Dune {
}
/**
* @brief f
matrix
assignment operator
* @brief f
vector
assignment operator
*
* overload operator <<= for f
matrix
assignment from Dune::Zero
* overload operator <<= for f
vector
assignment from Dune::Zero
*
* after including fassing.hh you can easily assign data to a Field
Matrix
* after including fassing.hh you can easily assign data to a Field
Vector
* using
*
* @code
* Field
Matrix
<double,
2,2
> x; x <<= 1.0, 4.0,
nextRow,
10.0, 11.0;
* Field
Vector
<double,
4
> x; x <<= 1.0, 4.0, 10.0, 11.0;
* @endcode
*
* The operator checks that the whole
matrix
is initalized.
* In case you know that all following entries
of a row
will be zero padded, you can use
* The operator checks that the whole
vector
is initalized.
* In case you know that all following entries will be zero padded, you can use
*
* @code
* Field
Matrix
<double, 4
, 4
> x; x <<= 1.0,
zero, nextRow
, 10.0, 11.0;
* Field
Vector
<double, 4
0
> x; x <<= 1.0,
4.0
, 10.0, 11.0
, zero
;
* @endcode
*
*/
...
...
@@ -175,27 +176,22 @@ namespace Dune {
int
c
;
int
r
;
bool
temporary
;
bool
thrown
;
void
end_row
()
{
if
(
!
temporary
&&
c
!=
m
&&
!
thrown
)
{
thrown
=
true
;
if
(
!
temporary
&&
c
!=
m
)
DUNE_THROW
(
MathError
,
"Trying to assign "
<<
c
<<
" entries to a FieldMatrix row of size "
<<
m
);
}
c
=
0
;
}
public
:
/*! @brief Copy Constructor */
fmatrix_assigner
(
fmatrix_assigner
&
a
)
:
A
(
a
.
A
),
c
(
a
.
c
),
r
(
a
.
r
),
temporary
(
false
)
,
thrown
(
a
.
thrown
)
fmatrix_assigner
(
fmatrix_assigner
&
a
)
:
A
(
a
.
A
),
c
(
a
.
c
),
r
(
a
.
r
),
temporary
(
false
)
{}
/*! @brief Constructor from matrix and temporary flag
\param _A matrix which should be initialized
\param t bool indicating, that this is a temporary object (see ~fmatrix_assigner)
*/
fmatrix_assigner
(
FieldMatrix
<
T
,
n
,
m
>
&
_A
,
bool
t
)
:
A
(
_A
),
c
(
0
),
r
(
0
),
temporary
(
t
),
thrown
(
false
)
fmatrix_assigner
(
FieldMatrix
<
T
,
n
,
m
>
&
_A
,
bool
t
)
:
A
(
_A
),
c
(
0
),
r
(
0
),
temporary
(
t
)
{};
/*! @brief Destructor
checks for complete initialization of the matrix.
...
...
@@ -204,21 +200,13 @@ namespace Dune {
~
fmatrix_assigner
()
{
end_row
();
if
(
!
temporary
&&
r
!=
n
-
1
&&
!
thrown
)
{
thrown
=
true
;
if
(
!
temporary
&&
r
!=
n
-
1
)
DUNE_THROW
(
MathError
,
"Trying to assign "
<<
r
<<
" rows to a FieldMatrix of size "
<<
n
<<
" x "
<<
m
);
}
}
/*! @brief append data to this matrix */
fmatrix_assigner
&
append
(
const
T
&
t
)
{
// Check whether we have passed the last row
if
(
r
>=
m
)
{
thrown
=
true
;
DUNE_THROW
(
MathError
,
"Trying to assign more than "
<<
m
<<
" rows to a FieldMatrix of size "
<<
n
<<
" x "
<<
m
);
}
A
[
r
][
c
++
]
=
t
;
return
*
this
;
}
...
...
@@ -229,7 +217,7 @@ namespace Dune {
while
(
c
!=
m
)
A
[
r
][
c
++
]
=
0
;
return
*
this
;
}
/*! @brief
move to next row of
th
e
matrix
/*! @brief
append zeros to
th
is
matrix
*/
fmatrix_assigner
&
append
(
NextRow
nr
)
{
...
...
@@ -255,8 +243,7 @@ namespace Dune {
}
/*! @brief append zeros to this matrix
the overloaded comma operator is used to stop the assign of values
to the current row, it will be checked whether all entries have been
assigned values.
to the matrix, all remaining entries are assigned 0.
*/
fmatrix_assigner
&
operator
,
(
NextRow
nr
)
{
...
...
@@ -277,7 +264,7 @@ namespace Dune {
}
/**
* @brief Fie
ld
Matrix assignment operator
* @brief
f
Fi
l
eMatrix assignment operator
*
* overload operator <<= for FieldMatrix row assignment from Dune::Zero
*/
...
...
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