Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
amdis
amdis-core
Commits
f688bc11
Commit
f688bc11
authored
Feb 28, 2019
by
Praetorius, Simon
Browse files
Cleanup of directory structure and removed obsolete files and functions
parent
0ef5f46a
Changes
181
Hide whitespace changes
Inline
Side-by-side
src/amdis/linear
_
algebra/mtl/itl/minres.hpp
→
src/amdis/linearalgebra/mtl/itl/minres.hpp
View file @
f688bc11
File moved
src/amdis/linear
_
algebra/mtl/itl/preonly.hpp
→
src/amdis/linearalgebra/mtl/itl/preonly.hpp
View file @
f688bc11
File moved
src/amdis/linear
_
algebra/mtl/itl/umfpack2_solve.hpp
→
src/amdis/linearalgebra/mtl/itl/umfpack2_solve.hpp
View file @
f688bc11
File moved
src/amdis/
assembler
/CMakeLists.txt
→
src/amdis/
localoperators
/CMakeLists.txt
View file @
f688bc11
#install headers
install
(
FILES
ConvectionDiffusionOperator.hpp
FirstOrderDivTestvec.hpp
FirstOrderDivTestvecTrial.hpp
FirstOrderGradTest.hpp
FirstOrderGradTestTrial.hpp
FirstOrderGradTestTrialvec.hpp
FirstOrderPartialTest.hpp
FirstOrderPartialTestTrial.hpp
FirstOrderTestDivTrialvec.hpp
FirstOrderTestGradTrial.hpp
...
...
@@ -12,10 +16,11 @@ install(FILES
SecondOrderDivTestvecDivTrialvec.hpp
SecondOrderGradTestGradTrial.hpp
SecondOrderPartialTestPartialTrial.hpp
StokesOperator.hpp
ZeroOrderTest.hpp
ZeroOrderTestTrial.hpp
ZeroOrderTestTrialvec.hpp
ZeroOrderTestvec.hpp
ZeroOrderTestvecTrial.hpp
ZeroOrderTestvecTrialvec.hpp
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/amdis/
assembler
)
DESTINATION
${
CMAKE_INSTALL_INCLUDEDIR
}
/amdis/
localoperators
)
src/amdis/
assembler
/ConvectionDiffusionOperator.hpp
→
src/amdis/
localoperators
/ConvectionDiffusionOperator.hpp
View file @
f688bc11
...
...
@@ -2,11 +2,11 @@
#include
<type_traits>
#include
<amdis/LocalBasisCache.hpp>
#include
<amdis/
utility/
LocalBasisCache.hpp>
#include
<amdis/LocalOperator.hpp>
#include
<amdis/Output.hpp>
#include
<amdis/common/
Util
it
y
.hpp>
#include
<amdis/common/Size.hpp>
#include
<amdis/common/
TypeTra
it
s
.hpp>
#include
<amdis/common/
Static
Size.hpp>
namespace
AMDiS
{
...
...
@@ -109,22 +109,22 @@ namespace AMDiS
IF_CONSTEXPR
(
conserving
)
{
WorldVector
gradAi
;
for
(
std
::
size_t
i
=
0
;
i
<
numLocalFe
;
++
i
)
{
const
int
local_i
=
rowNode
.
localIndex
(
i
);
const
auto
local_i
=
rowNode
.
localIndex
(
i
);
gradAi
=
A
*
gradients
[
i
];
auto
gradBi
=
b
*
gradients
[
i
];
for
(
std
::
size_t
j
=
0
;
j
<
numLocalFe
;
++
j
)
{
const
int
local_j
=
colNode
.
localIndex
(
j
);
const
auto
local_j
=
colNode
.
localIndex
(
j
);
elementMatrix
[
local_i
][
local_j
]
+=
(
dot
(
gradAi
,
gradients
[
j
])
+
(
c
*
shapeValues
[
i
]
-
gradBi
)
*
shapeValues
[
j
])
*
factor
;
}
}
}
else
{
WorldVector
grad_i
;
for
(
std
::
size_t
i
=
0
;
i
<
numLocalFe
;
++
i
)
{
const
int
local_i
=
rowNode
.
localIndex
(
i
);
const
auto
local_i
=
rowNode
.
localIndex
(
i
);
grad_i
=
A
*
gradients
[
i
];
grad_i
+=
b
*
shapeValues
[
i
];
for
(
std
::
size_t
j
=
0
;
j
<
numLocalFe
;
++
j
)
{
const
int
local_j
=
colNode
.
localIndex
(
j
);
const
auto
local_j
=
colNode
.
localIndex
(
j
);
elementMatrix
[
local_i
][
local_j
]
+=
(
dot
(
grad_i
,
gradients
[
j
])
+
c
*
shapeValues
[
i
]
*
shapeValues
[
j
])
*
factor
;
}
}
...
...
@@ -169,7 +169,7 @@ namespace AMDiS
const
auto
factor
=
localFctF
(
local
)
*
context
.
integrationElement
(
quad
[
iq
].
position
())
*
quad
[
iq
].
weight
();
for
(
std
::
size_t
i
=
0
;
i
<
numLocalFe
;
++
i
)
{
const
int
local_i
=
node
.
localIndex
(
i
);
const
auto
local_i
=
node
.
localIndex
(
i
);
elementVector
[
local_i
]
+=
shapeValues
[
i
]
*
factor
;
}
}
...
...
src/amdis/
assembler
/FirstOrderDivTestvec.hpp
→
src/amdis/
localoperators
/FirstOrderDivTestvec.hpp
View file @
f688bc11
...
...
@@ -3,9 +3,9 @@
#include
<type_traits>
#include
<amdis/GridFunctionOperator.hpp>
#include
<amdis/LocalBasisCache.hpp>
#include
<amdis/Output.hpp>
#include
<amdis/common/Size.hpp>
#include
<amdis/common/StaticSize.hpp>
#include
<amdis/utility/LocalBasisCache.hpp>
namespace
AMDiS
{
...
...
src/amdis/
assembler
/FirstOrderDivTestvecTrial.hpp
→
src/amdis/
localoperators
/FirstOrderDivTestvecTrial.hpp
View file @
f688bc11
...
...
@@ -2,7 +2,7 @@
#include
<type_traits>
#include
<amdis/
assembler
/FirstOrderTestDivTrialvec.hpp>
#include
<amdis/
localoperators
/FirstOrderTestDivTrialvec.hpp>
namespace
AMDiS
{
...
...
src/amdis/
assembler
/FirstOrderGradTest.hpp
→
src/amdis/
localoperators
/FirstOrderGradTest.hpp
View file @
f688bc11
...
...
@@ -3,9 +3,9 @@
#include
<type_traits>
#include
<amdis/GridFunctionOperator.hpp>
#include
<amdis/LocalBasisCache.hpp>
#include
<amdis/Output.hpp>
#include
<amdis/common/Size.hpp>
#include
<amdis/common/StaticSize.hpp>
#include
<amdis/utility/LocalBasisCache.hpp>
namespace
AMDiS
{
...
...
src/amdis/
assembler
/FirstOrderGradTestTrial.hpp
→
src/amdis/
localoperators
/FirstOrderGradTestTrial.hpp
View file @
f688bc11
...
...
@@ -2,7 +2,7 @@
#include
<type_traits>
#include
<amdis/
assembler
/FirstOrderTestGradTrial.hpp>
#include
<amdis/
localoperators
/FirstOrderTestGradTrial.hpp>
namespace
AMDiS
{
...
...
src/amdis/
assembler
/FirstOrderGradTestTrialvec.hpp
→
src/amdis/
localoperators
/FirstOrderGradTestTrialvec.hpp
View file @
f688bc11
...
...
@@ -2,7 +2,7 @@
#include
<type_traits>
#include
<amdis/
assembler
/FirstOrderTestvecGradTrial.hpp>
#include
<amdis/
localoperators
/FirstOrderTestvecGradTrial.hpp>
namespace
AMDiS
{
...
...
src/amdis/
assembler
/FirstOrderPartialTest.hpp
→
src/amdis/
localoperators
/FirstOrderPartialTest.hpp
View file @
f688bc11
...
...
@@ -2,7 +2,7 @@
#include
<type_traits>
#include
<amdis/
assembler
/FirstOrderTestPartialTrial.hpp>
#include
<amdis/
localoperators
/FirstOrderTestPartialTrial.hpp>
namespace
AMDiS
{
...
...
src/amdis/
assembler
/FirstOrderPartialTestTrial.hpp
→
src/amdis/
localoperators
/FirstOrderPartialTestTrial.hpp
View file @
f688bc11
...
...
@@ -2,7 +2,7 @@
#include
<type_traits>
#include
<amdis/
assembler
/FirstOrderTestPartialTrial.hpp>
#include
<amdis/
localoperators
/FirstOrderTestPartialTrial.hpp>
namespace
AMDiS
{
...
...
src/amdis/
assembler
/FirstOrderTestDivTrialvec.hpp
→
src/amdis/
localoperators
/FirstOrderTestDivTrialvec.hpp
View file @
f688bc11
...
...
@@ -3,9 +3,9 @@
#include
<type_traits>
#include
<amdis/GridFunctionOperator.hpp>
#include
<amdis/LocalBasisCache.hpp>
#include
<amdis/
utility/
LocalBasisCache.hpp>
#include
<amdis/Output.hpp>
#include
<amdis/common/Size.hpp>
#include
<amdis/common/
Static
Size.hpp>
namespace
AMDiS
{
...
...
src/amdis/
assembler
/FirstOrderTestGradTrial.hpp
→
src/amdis/
localoperators
/FirstOrderTestGradTrial.hpp
View file @
f688bc11
...
...
@@ -3,9 +3,9 @@
#include
<type_traits>
#include
<amdis/GridFunctionOperator.hpp>
#include
<amdis/LocalBasisCache.hpp>
#include
<amdis/
utility/
LocalBasisCache.hpp>
#include
<amdis/Output.hpp>
#include
<amdis/common/Size.hpp>
#include
<amdis/common/
Static
Size.hpp>
namespace
AMDiS
{
...
...
src/amdis/
assembler
/FirstOrderTestPartialTrial.hpp
→
src/amdis/
localoperators
/FirstOrderTestPartialTrial.hpp
View file @
f688bc11
...
...
@@ -3,9 +3,9 @@
#include
<type_traits>
#include
<amdis/GridFunctionOperator.hpp>
#include
<amdis/LocalBasisCache.hpp>
#include
<amdis/
utility/
LocalBasisCache.hpp>
#include
<amdis/Output.hpp>
#include
<amdis/common/Size.hpp>
#include
<amdis/common/
Static
Size.hpp>
namespace
AMDiS
{
...
...
src/amdis/
assembler
/FirstOrderTestvecGradTrial.hpp
→
src/amdis/
localoperators
/FirstOrderTestvecGradTrial.hpp
View file @
f688bc11
...
...
@@ -3,9 +3,9 @@
#include
<type_traits>
#include
<amdis/GridFunctionOperator.hpp>
#include
<amdis/LocalBasisCache.hpp>
#include
<amdis/
utility/
LocalBasisCache.hpp>
#include
<amdis/Output.hpp>
#include
<amdis/common/Size.hpp>
#include
<amdis/common/
Static
Size.hpp>
namespace
AMDiS
{
...
...
src/amdis/
assembler
/SecondOrderDivTestvecDivTrialvec.hpp
→
src/amdis/
localoperators
/SecondOrderDivTestvecDivTrialvec.hpp
View file @
f688bc11
...
...
@@ -3,9 +3,9 @@
#include
<type_traits>
#include
<amdis/GridFunctionOperator.hpp>
#include
<amdis/LocalBasisCache.hpp>
#include
<amdis/
utility/
LocalBasisCache.hpp>
#include
<amdis/Output.hpp>
#include
<amdis/common/Size.hpp>
#include
<amdis/common/
Static
Size.hpp>
namespace
AMDiS
{
...
...
src/amdis/
assembler
/SecondOrderGradTestGradTrial.hpp
→
src/amdis/
localoperators
/SecondOrderGradTestGradTrial.hpp
View file @
f688bc11
...
...
@@ -3,9 +3,9 @@
#include
<type_traits>
#include
<amdis/GridFunctionOperator.hpp>
#include
<amdis/LocalBasisCache.hpp>
#include
<amdis/
utility/
LocalBasisCache.hpp>
#include
<amdis/Output.hpp>
#include
<amdis/common/Size.hpp>
#include
<amdis/common/
Static
Size.hpp>
#include
<amdis/common/ValueCategory.hpp>
namespace
AMDiS
...
...
src/amdis/
assembler
/SecondOrderPartialTestPartialTrial.hpp
→
src/amdis/
localoperators
/SecondOrderPartialTestPartialTrial.hpp
View file @
f688bc11
...
...
@@ -3,9 +3,9 @@
#include
<type_traits>
#include
<amdis/GridFunctionOperator.hpp>
#include
<amdis/LocalBasisCache.hpp>
#include
<amdis/
utility/
LocalBasisCache.hpp>
#include
<amdis/Output.hpp>
#include
<amdis/common/Size.hpp>
#include
<amdis/common/
Static
Size.hpp>
namespace
AMDiS
{
...
...
src/amdis/
assembler
/StokesOperator.hpp
→
src/amdis/
localoperators
/StokesOperator.hpp
View file @
f688bc11
...
...
@@ -4,8 +4,8 @@
#include
<vector>
#include
<amdis/GridFunctionOperator.hpp>
#include
<amdis/LocalBasisCache.hpp>
#include
<amdis/common/Size.hpp>
#include
<amdis/
utility/
LocalBasisCache.hpp>
#include
<amdis/common/
Static
Size.hpp>
namespace
AMDiS
{
...
...
Prev
1
…
3
4
5
6
7
8
9
10
Next
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