Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-fufem
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-fufem
Commits
0e78df1c
Commit
0e78df1c
authored
2 years ago
by
oliver.sander_at_tu-dresden.de
Browse files
Options
Downloads
Patches
Plain Diff
Remove the deprecated file
parent
8455462e
No related branches found
No related tags found
1 merge request
!135
Remove the deprecated file `ulis_tools.hh`
Pipeline
#53966
passed
2 years ago
Stage: test
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+3
-0
3 additions, 0 deletions
CHANGELOG.md
dune/fufem/CMakeLists.txt
+0
-1
0 additions, 1 deletion
dune/fufem/CMakeLists.txt
dune/fufem/ulis_tools.hh
+0
-111
0 additions, 111 deletions
dune/fufem/ulis_tools.hh
with
3 additions
and
112 deletions
CHANGELOG.md
+
3
−
0
View file @
0e78df1c
...
@@ -13,6 +13,9 @@
...
@@ -13,6 +13,9 @@
-
The class
`VTKBasisWriter`
has been removed. It only worked
-
The class
`VTKBasisWriter`
has been removed. It only worked
for old
`dune-fufem`
-style function space bases.
for old
`dune-fufem`
-style function space bases.
-
The deprecated file
`ulis_tools.hh`
has been removed. It contained a short list of
basic linear algebra methods that are now covered by the
`dune-matrix-vector`
module.
# 2.9 Release
# 2.9 Release
...
...
This diff is collapsed.
Click to expand it.
dune/fufem/CMakeLists.txt
+
0
−
1
View file @
0e78df1c
...
@@ -51,5 +51,4 @@ install(FILES
...
@@ -51,5 +51,4 @@ install(FILES
staticmatrixtools.hh
staticmatrixtools.hh
surfmassmatrix.hh
surfmassmatrix.hh
symmetrictensor.hh
symmetrictensor.hh
ulis_tools.hh
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/dune/fufem
)
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/dune/fufem
)
This diff is collapsed.
Click to expand it.
dune/fufem/ulis_tools.hh
deleted
100644 → 0
+
0
−
111
View file @
8455462e
#ifndef ULIS_TOOLS_HH
#define ULIS_TOOLS_HH
#include
<dune/common/fvector.hh>
#include
<dune/common/fmatrix.hh>
#include
<dune/istl/bvector.hh>
#include
<dune/istl/bcrsmatrix.hh>
#include
<dune/istl/matrixindexset.hh>
#include
<vector>
#warning This header is deprecated. Please use Arithmetic::addProduct() in place of multiplyFM() and StaticMatrix::transpose() in place of transpose()
// Multiplies Matrices of Dune::FieldMatrix Type
template
<
class
LeftMatrixType
,
class
RightMatrixType
>
inline
void
multiplyFM
(
const
LeftMatrixType
&
A
,
const
RightMatrixType
&
B
,
Dune
::
FieldMatrix
<
typename
LeftMatrixType
::
field_type
,
LeftMatrixType
::
rows
,
RightMatrixType
::
cols
>&
C
)
{
assert
(
LeftMatrixType
::
cols
==
RightMatrixType
::
rows
);
int
n
=
LeftMatrixType
::
rows
,
m
=
LeftMatrixType
::
cols
,
k
=
RightMatrixType
::
cols
;
C
=
0.0
;
for
(
int
row
=
0
;
row
<
n
;
++
row
)
{
for
(
int
col
=
0
;
col
<
k
;
++
col
)
{
for
(
int
i
=
0
;
i
<
m
;
++
i
)
C
[
row
][
col
]
+=
A
[
row
][
i
]
*
B
[
i
][
col
];
}
}
}
// Transposes Matrices of Dune::FieldMatrix Type
template
<
class
MatrixType
,
class
TransposedMatrixType
>
inline
void
transposeFM
(
const
MatrixType
&
M
,
TransposedMatrixType
&
Mt
)
{
int
nRows
=
MatrixType
::
rows
,
nCols
=
MatrixType
::
cols
;
for
(
int
row
=
0
;
row
<
nRows
;
++
row
)
{
for
(
int
col
=
0
;
col
<
nCols
;
++
col
)
{
Mt
[
col
][
row
]
=
M
[
row
][
col
];
}
}
}
// Transposes Matrices of Dune::BCRSMatrix<FieldMatrix<K,n,m>,?> Type
template
<
class
MatrixType
,
class
TransposedMatrixType
>
void
transpose
(
const
MatrixType
&
A
,
TransposedMatrixType
&
At
)
{
const
int
nRows
=
A
.
N
();
const
int
nCols
=
A
.
M
();
const
int
nBlockRows
=
MatrixType
::
block_type
::
rows
,
nBlockCols
=
MatrixType
::
block_type
::
cols
;
typename
TransposedMatrixType
::
block_type
transposedBlock
;
Dune
::
MatrixIndexSet
idxSetA
(
nRows
,
nCols
);
idxSetA
.
import
<
MatrixType
>
(
A
);
Dune
::
MatrixIndexSet
idxSetAt
(
nCols
,
nRows
);
typedef
typename
MatrixType
::
ConstColIterator
ColIterator
;
for
(
int
row
=
0
;
row
<
nRows
;
++
row
)
{
ColIterator
col
=
A
[
row
].
begin
();
ColIterator
end
=
A
[
row
].
end
();
for
(
;
col
!=
end
;
++
col
)
{
idxSetAt
.
add
(
col
.
index
(),
row
);
}
}
idxSetAt
.
exportIdx
(
At
);
if
(
nBlockRows
+
nBlockCols
>
2
)
{
for
(
int
row
=
0
;
row
<
nRows
;
++
row
)
{
ColIterator
col
=
A
[
row
].
begin
();
ColIterator
end
=
A
[
row
].
end
();
for
(
;
col
!=
end
;
++
col
)
{
transposeFM
<
typename
MatrixType
::
block_type
,
typename
TransposedMatrixType
::
block_type
>
(
A
[
row
][
col
.
index
()],
transposedBlock
);
At
[
col
.
index
()][
row
]
=
transposedBlock
;
}
}
}
else
{
for
(
int
row
=
0
;
row
<
nRows
;
++
row
)
{
ColIterator
col
=
A
[
row
].
begin
();
ColIterator
end
=
A
[
row
].
end
();
for
(
;
col
!=
end
;
++
col
)
{
At
[
col
.
index
()][
row
][
0
][
0
]
=
A
[
row
][
col
.
index
()][
0
][
0
];
}
}
}
}
#endif
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