Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Jennifer Ryan
Nektar
Commits
f54737fe
Commit
f54737fe
authored
Mar 27, 2017
by
Spencer Sherwin
Browse files
Merge branch 'master' into fix/GetOffsetElmtId
parents
ae57c72d
b1bf964a
Changes
3
Hide whitespace changes
Inline
Side-by-side
CHANGELOG.md
View file @
f54737fe
...
...
@@ -52,6 +52,7 @@ v4.4.0
-
Fix bug in FieldUtils when using half mode expansions (!734)
-
Do not read the same fld/pts files again for every variable (!670)
-
Fix bug in CMake PETSc detection for Ubuntu 16.04/Debian 9 (!735)
-
Fix warnings with Intel compiler (!742)
**ADRSolver:**
-
Add a projection equation system for C^0 projections (!675)
...
...
library/LibUtilities/LinearAlgebra/SparseMatrix.cpp
View file @
f54737fe
...
...
@@ -75,19 +75,19 @@ namespace Nektar
template
<
typename
SparseStorageType
>
const
IndexType
NekSparseMatrix
<
SparseStorageType
>::
GetRows
()
const
IndexType
NekSparseMatrix
<
SparseStorageType
>::
GetRows
()
const
{
return
m_sparseStorage
->
GetRows
();
}
template
<
typename
SparseStorageType
>
const
IndexType
NekSparseMatrix
<
SparseStorageType
>::
GetColumns
()
const
IndexType
NekSparseMatrix
<
SparseStorageType
>::
GetColumns
()
const
{
return
m_sparseStorage
->
GetColumns
();
}
template
<
typename
SparseStorageType
>
const
IndexType
NekSparseMatrix
<
SparseStorageType
>::
GetNumNonZeroEntries
()
const
IndexType
NekSparseMatrix
<
SparseStorageType
>::
GetNumNonZeroEntries
()
const
{
return
m_sparseStorage
->
GetNumNonZeroEntries
();
}
...
...
@@ -137,7 +137,7 @@ namespace Nektar
}
template
<
typename
SparseStorageType
>
const
size_t
NekSparseMatrix
<
SparseStorageType
>::
GetMemoryFootprint
()
const
size_t
NekSparseMatrix
<
SparseStorageType
>::
GetMemoryFootprint
()
const
{
return
m_sparseStorage
->
GetMemoryUsage
(
m_sparseStorage
->
GetNumNonZeroEntries
(),
...
...
@@ -148,7 +148,7 @@ namespace Nektar
}
template
<
typename
SparseStorageType
>
const
unsigned
long
NekSparseMatrix
<
SparseStorageType
>::
GetMulCallsCounter
()
const
unsigned
long
NekSparseMatrix
<
SparseStorageType
>::
GetMulCallsCounter
()
const
{
return
m_mulCallsCounter
;
}
...
...
@@ -161,7 +161,7 @@ namespace Nektar
}
template
<
typename
SparseStorageType
>
const
IndexType
NekSparseMatrix
<
SparseStorageType
>::
GetBandwidth
()
IndexType
NekSparseMatrix
<
SparseStorageType
>::
GetBandwidth
()
{
int
bandwidth
=
0
;
...
...
library/LibUtilities/LinearAlgebra/SparseMatrix.hpp
View file @
f54737fe
...
...
@@ -73,15 +73,15 @@ namespace Nektar
LIB_UTILITIES_EXPORT
NekSparseMatrix
(
const
NekSparseMatrix
&
src
);
LIB_UTILITIES_EXPORT
~
NekSparseMatrix
();
LIB_UTILITIES_EXPORT
const
IndexType
GetRows
()
const
;
LIB_UTILITIES_EXPORT
const
IndexType
GetColumns
()
const
;
LIB_UTILITIES_EXPORT
const
IndexType
GetNumNonZeroEntries
()
const
;
LIB_UTILITIES_EXPORT
IndexType
GetRows
()
const
;
LIB_UTILITIES_EXPORT
IndexType
GetColumns
()
const
;
LIB_UTILITIES_EXPORT
IndexType
GetNumNonZeroEntries
()
const
;
LIB_UTILITIES_EXPORT
const
DataType
GetFillInRatio
()
const
;
LIB_UTILITIES_EXPORT
const
size_t
GetMemoryFootprint
()
const
;
LIB_UTILITIES_EXPORT
const
unsigned
long
GetMulCallsCounter
()
const
;
LIB_UTILITIES_EXPORT
size_t
GetMemoryFootprint
()
const
;
LIB_UTILITIES_EXPORT
unsigned
long
GetMulCallsCounter
()
const
;
LIB_UTILITIES_EXPORT
const
DataType
GetAvgRowDensity
()
const
;
LIB_UTILITIES_EXPORT
const
IndexType
GetBandwidth
();
LIB_UTILITIES_EXPORT
IndexType
GetBandwidth
();
LIB_UTILITIES_EXPORT
COOMatTypeSharedPtr
GetCooStorage
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment