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
f30ec5ef
Commit
f30ec5ef
authored
4 months ago
by
Robert K
Browse files
Options
Downloads
Patches
Plain Diff
[bugfix][ShallowWater] disable user defined flux, because it segfaults.
parent
1c8ad338
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Pipeline
#74694
passed
4 months ago
Stage: test
Changes
3
Pipelines
9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dune/fem-dg/operator/fluxes/advection/python.hh
+4
-3
4 additions, 3 deletions
dune/fem-dg/operator/fluxes/advection/python.hh
pydemo/shallowWater/main.py
+4
-0
4 additions, 0 deletions
pydemo/shallowWater/main.py
pydemo/shallowWater/shallowwater.py
+5
-5
5 additions, 5 deletions
pydemo/shallowWater/shallowwater.py
with
13 additions
and
8 deletions
dune/fem-dg/operator/fluxes/advection/python.hh
+
4
−
3
View file @
f30ec5ef
...
...
@@ -83,9 +83,10 @@ namespace Fem
*/
DGAdvectionFluxPythonUserDefine
(
const
ModelImp
&
modelImp
,
const
ParameterType
&
parameter
)
:
BaseType
(
*
(
new
ModelType
(
modelImp
)),
parameter
)
//: BaseType( *(new ModelType(modelImp)), parameter )
:
BaseType
(
modelImp
,
parameter
)
{
modelPtr_
.
reset
(
&
this
->
model_
);
//
modelPtr_.reset( &this->model_ );
}
/**
...
...
@@ -111,7 +112,7 @@ namespace Fem
}
protected
:
std
::
unique_ptr
<
const
ModelType
>
modelPtr_
;
//
std::unique_ptr< const ModelType > modelPtr_;
};
}
// end namespace Fem
...
...
This diff is collapsed.
Click to expand it.
pydemo/shallowWater/main.py
+
4
−
0
View file @
f30ec5ef
from
dune.fem
import
threading
threading
.
use
=
8
from
dune.fem
import
parameter
from
dune.femdg.testing
import
run
...
...
This diff is collapsed.
Click to expand it.
pydemo/shallowWater/shallowwater.py
+
5
−
5
View file @
f30ec5ef
...
...
@@ -40,11 +40,11 @@ def ShallowWater(topo,g):
# boundary = {range(1,5): lambda t,x,u,n: Model.F_c(t,x,u)*n}
boundary
=
{
range
(
1
,
5
):
lambda
t
,
x
,
u
:
u
}
topography
=
topo
def
NumericalF_c
(
model
,
clsName
,
includes
):
print
(
"
NumericalFlux_c
"
)
from
dune.generator.importclass
import
load
from
dune.generator
import
path
return
load
(
clsName
,[
path
(
__file__
)
+
"
llf.hh
"
]
+
includes
,
model
)
#
def NumericalF_c(model,clsName,includes):
#
print("NumericalFlux_c")
#
from dune.generator.importclass import load
#
from dune.generator import path
#
return load(clsName,[path(__file__)+"llf
wb
.hh"]+includes,model)
return
Model
...
...
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