Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
amdis
amdis-core
Commits
e82994c5
Commit
e82994c5
authored
Jul 31, 2020
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
restrict order to functions
parent
7489f1fb
Pipeline
#4548
passed with stage
in 49 minutes and 22 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
12 deletions
+7
-12
amdis/common/Order.hpp
amdis/common/Order.hpp
+1
-1
amdis/functions/Order.hpp
amdis/functions/Order.hpp
+0
-5
amdis/gridfunctions/DiscreteLocalFunction.inc.hpp
amdis/gridfunctions/DiscreteLocalFunction.inc.hpp
+6
-6
No files found.
amdis/common/Order.hpp
View file @
e82994c5
...
...
@@ -9,7 +9,7 @@ namespace AMDiS
/// polynomial order of functions
template
<
class
F
>
auto
order
(
F
const
&
f
)
->
decltype
(
f
.
order
())
->
decltype
(
&
F
::
operator
(),
f
.
order
())
{
return
f
.
order
();
}
...
...
amdis/functions/Order.hpp
View file @
e82994c5
#pragma once
#include <cmath>
#include <dune/common/typetraits.hh>
#include <dune/typetree/nodetags.hh>
#include <amdis/Output.hpp>
#include <amdis/common/Math.hpp>
#include <amdis/common/Apply.hpp>
...
...
amdis/gridfunctions/DiscreteLocalFunction.inc.hpp
View file @
e82994c5
...
...
@@ -5,6 +5,7 @@
#include <amdis/common/FieldMatVec.hpp>
#include <amdis/common/Math.hpp>
#include <amdis/functions/NodeIndices.hpp>
#include <amdis/functions/Order.hpp>
#include <amdis/typetree/FiniteElementType.hpp>
#include <amdis/utility/LocalBasisCache.hpp>
#include <amdis/utility/LocalToGlobalAdapter.hpp>
...
...
@@ -133,11 +134,11 @@ public:
}
/// \brief The polynomial degree of the LocalFunctions basis-functions
int
order
()
const
auto
order
()
const
->
decltype
(
AMDiS
::
order
(
std
::
declval
<
SubTree
>
()))
{
using
AMDiS
::
order
;
assert
(
bound_
);
return
order
(
*
subTree_
);
return
AMDiS
::
order
(
*
subTree_
);
}
/// \brief Return the bound element
...
...
@@ -211,11 +212,10 @@ public:
}
auto
order
()
const
->
decltype
(
order
(
std
::
declval
<
SubTree
>
()))
->
decltype
(
AMDiS
::
order
(
std
::
declval
<
SubTree
>
()))
{
using
AMDiS
::
order
;
assert
(
bound_
);
return
std
::
max
(
0
,
order
(
*
subTree_
)
-
1
);
return
std
::
max
(
0
,
AMDiS
::
order
(
*
subTree_
)
-
1
);
}
/// Return the bound element
...
...
Write
Preview
Markdown
is supported
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