Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dune-fem-dg
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
Container Registry
Model registry
Operate
Environments
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
dune-fem
dune-fem-dg
Commits
12610394
Commit
12610394
authored
2 years ago
by
Robert K
Browse files
Options
Downloads
Patches
Plain Diff
[feature][femDGOperator] Allow to set quadrature orders when creating
femDGOperator.
parent
3514d132
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Pipeline
#59522
failed
2 years ago
Stage: test
Changes
3
Pipelines
45
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dune/fem-dg/operator/dg/operatorbase.hh
+1
-1
1 addition, 1 deletion
dune/fem-dg/operator/dg/operatorbase.hh
dune/fem-dg/pass/dgpass.hh
+10
-3
10 additions, 3 deletions
dune/fem-dg/pass/dgpass.hh
python/dune/femdg/_operators.py
+11
-0
11 additions, 0 deletions
python/dune/femdg/_operators.py
with
22 additions
and
4 deletions
dune/fem-dg/operator/dg/operatorbase.hh
+
1
−
1
View file @
12610394
...
...
@@ -157,7 +157,7 @@ namespace Fem
,
space_
(
gridPart_
)
,
discreteModel_
(
model_
,
numFlux_
,
DiffusionFluxType
(
gridPart_
,
model_
,
parameter
)
)
,
previousPass_
(
InsertFunctionsType
::
createPass
(
tuple
)
)
,
pass1_
(
discreteModel_
,
*
previousPass_
,
space_
)
,
pass1_
(
discreteModel_
,
*
previousPass_
,
space_
,
parameter
)
,
counter_
(
0
)
{}
...
...
This diff is collapsed.
Click to expand it.
dune/fem-dg/pass/dgpass.hh
+
10
−
3
View file @
12610394
...
...
@@ -156,7 +156,7 @@ namespace Fem
LocalCDGPass
(
DiscreteModelType
&
discreteModel
,
PreviousPassType
&
pass
,
const
DiscreteFunctionSpaceType
&
spc
,
const
Dune
::
Fem
::
ParameterReader
&
/*
parameter
*/
,
const
Dune
::
Fem
::
ParameterReader
&
parameter
=
Dune
::
Fem
::
Parameter
::
container
()
,
const
int
volumeQuadOrd
=
-
1
,
const
int
faceQuadOrd
=
-
1
,
const
bool
verbose
=
Dune
::
Fem
::
Parameter
::
verbose
()
)
...
...
@@ -178,8 +178,8 @@ namespace Fem
valJacNb_
(
20
),
dtMin_
(
std
::
numeric_limits
<
double
>::
max
()),
minLimit_
(
2.0
*
std
::
numeric_limits
<
double
>::
min
()),
volumeQuadOrd_
(
volumeQuadOrd
),
faceQuadOrd_
(
faceQuadOrd
),
volumeQuadOrd_
(
parameter
.
getValue
<
int
>
(
"femdg.dgpass.volumequadratureorder"
,
volumeQuadOrd
)
),
faceQuadOrd_
(
parameter
.
getValue
<
int
>
(
"femdg.dgpass.surfacequadratureorder"
,
faceQuadOrd
)
),
#ifdef USE_CACHED_INVERSE_MASSMATRIX
localMassMatrix_
(
InverseMassProviderType
::
getObject
(
MassKeyType
(
gridPart_
)
)
),
#else
...
...
@@ -197,6 +197,13 @@ namespace Fem
}
}
if
(
verbose
&&
(
volumeQuadOrd_
>=
0
||
faceQuadOrd_
>=
0
)
)
{
const
int
vo
=
volumeQuadOrd_
<
0
?
DefaultQuadratureType
::
volumeOrder
(
spc_
.
order
())
:
volumeQuadOrd_
;
const
int
so
=
faceQuadOrd_
<
0
?
DefaultQuadratureType
::
surfaceOrder
(
spc_
.
order
())
:
faceQuadOrd_
;
std
::
cout
<<
"LocalCDGPass: quadrature orders = ("
<<
vo
<<
","
<<
so
<<
")"
<<
std
::
endl
;
}
valEnVec_
.
setMemoryFactor
(
1.1
);
valNbVec_
.
setMemoryFactor
(
1.1
);
valJacEn_
.
setMemoryFactor
(
1.1
);
...
...
This diff is collapsed.
Click to expand it.
python/dune/femdg/_operators.py
+
11
−
0
View file @
12610394
...
...
@@ -152,6 +152,7 @@ def femDGOperator(Model, space,
diffusionScheme
=
"
cdg2
"
,
threading
=
"
default
"
,
defaultQuadrature
=
True
,
quadratureOrders
=
None
,
codegen
=
True
,
initialTime
=
0.0
,
parameters
=
None
):
"""
create DG operator + ODE solver
...
...
@@ -168,6 +169,7 @@ def femDGOperator(Model, space,
threading: enable shared memory parallelization - default is that
threading is turned on if `dune.fem.threading.use>1`
defaultQuadrature: use quadratures that generically fit to the space
quadratureOrders: tuple with (volume,surface) quadrature orders, otherwise default is used (depends on space and quadrature)
codegen: enable optimized code for evaluation and interpolation
initialTime: T_0, default is 0.0
parameters: Additional parameter passed to the DG operator, limiter and ODE solvers
...
...
@@ -250,6 +252,15 @@ def femDGOperator(Model, space,
limiterstr
=
"
default(
"
+
limiterstr
+
"
)
"
if
defaultLimiter
else
limiterstr
print
(
"
femDGOperator: Limiter =
"
,
limiterstr
)
# if quadrature orders were provide store those in parameters
if
isinstance
(
quadratureOrders
,
tuple
):
if
parameters
is
None
:
parameterReader
.
append
({
"
femdg.dgpass.volumequadratureorder
"
:
quadratureOrders
[
0
],
"
femdg.dgpass.surfacequadratureorder
"
:
quadratureOrders
[
1
]
})
else
:
parameters
[
"
femdg.dgpass.volumequadratureorder
"
]
=
quadratureOrders
[
0
]
parameters
[
"
femdg.dgpass.surfacequadratureorder
"
]
=
quadratureOrders
[
1
]
# TODO: does this make sense - if there is no diffusion then it doesn't
# matter and with diffusion using 'none' seems a bad idea?
if
diffusionScheme
is
None
or
diffusionScheme
is
False
:
...
...
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