Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
dumux
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
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
dumux-repositories
dumux
Commits
29b025f4
Commit
29b025f4
authored
3 years ago
by
Timo Koch
Browse files
Options
Downloads
Patches
Plain Diff
[python][pmflow] Improve style, add some, use wrapper helpers
parent
fe88bce7
No related branches found
No related tags found
1 merge request
!2681
Feature/python main file
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
python/dumux/porousmediumflow/__init__.py
+43
-19
43 additions, 19 deletions
python/dumux/porousmediumflow/__init__.py
with
43 additions
and
19 deletions
python/dumux/porousmediumflow/__init__.py
+
43
−
19
View file @
29b025f4
"""
Classes and functions related to the porousmedium flow models
"""
from
dune.generator.generator
import
SimpleGenerator
from
dune.generator.generator
import
SimpleGenerator
from
dune.common.hashit
import
hashIt
from
dune.common.hashit
import
hashIt
from
dumux.wrapping
import
cppWrapperCreator
,
cppWrapperClassAlias
@cppWrapperCreator
def
_createPorousMediumFlowProblemDecorator
(
gridGeometry
,
spatialParams
,
enableInternalDirichletConstraints
=
False
):
"""
A problem decorator generator for Python problems
Usage:
from dumux.common import PorousMediumFlowProblem
@PorousMediumFlowProblem(gridGeometry)
class MyProblem:
...
"""
# A problem decorator generator for Python problems
#
# from dumux.common import PorousMediumFlowProblem
# @PorousMediumFlowProblem(gridGeometry)
# class MyProblem:
# ...
#
def
PorousMediumFlowProblem
(
gridGeometry
,
spatialParams
,
enableInternalDirichletConstraints
=
False
):
def
createModule
(
numEq
):
def
createModule
(
numEq
):
priVar
Type
=
f
"
Dune::FieldVector<double,
{
numEq
}
>
"
priVar
s
=
f
"
Dune::FieldVector<double,
{
numEq
}
>
"
ggType
=
gridGeometry
.
_typeName
ggType
=
gridGeometry
.
_typeName
spatialParamsType
=
spatialParams
.
_typeName
spType
=
spatialParams
.
_typeName
enableIntDirConstraint
=
"
true
"
if
enableInternalDirichletConstraints
else
"
false
"
enableIDC
=
"
true
"
if
enableInternalDirichletConstraints
else
"
false
"
problemType
=
f
"
Dumux::Python::PorousMediumFlowProblem<
{
ggType
}
,
{
priVarType
}
,
{
spatialParamsType
}
,
{
enableIntDirConstraint
}
>
"
problemType
=
(
"
Dumux::Python::PorousMediumFlowProblem
"
f
"
<
{
ggType
}
,
{
priVars
}
,
{
spType
}
,
{
enableIDC
}
>
"
)
includes
=
(
includes
=
(
gridGeometry
.
_includes
gridGeometry
.
_includes
+
spatialParams
.
_includes
+
spatialParams
.
_includes
...
@@ -25,22 +36,30 @@ def PorousMediumFlowProblem(gridGeometry, spatialParams, enableInternalDirichlet
...
@@ -25,22 +36,30 @@ def PorousMediumFlowProblem(gridGeometry, spatialParams, enableInternalDirichlet
module
=
generator
.
load
(
includes
,
problemType
,
moduleName
,
holder
=
"
std::shared_ptr
"
)
module
=
generator
.
load
(
includes
,
problemType
,
moduleName
,
holder
=
"
std::shared_ptr
"
)
return
module
return
module
def
PorousMediumFlowProblem
Decorator
(
C
ls
):
def
decorate
PorousMediumFlowProblem
(
c
ls
):
module
=
createModule
(
C
ls
.
numEq
)
module
=
createModule
(
c
ls
.
numEq
)
def
createPorousMediumFlowProblem
():
def
createPorousMediumFlowProblem
():
return
module
.
PorousMediumFlowProblem
(
gridGeometry
,
spatialParams
,
C
ls
())
return
module
.
PorousMediumFlowProblem
(
gridGeometry
,
spatialParams
,
c
ls
())
return
createPorousMediumFlowProblem
return
createPorousMediumFlowProblem
return
PorousMediumFlowProblem
Decorator
return
decorate
PorousMediumFlowProblem
def
PorousMediumFlowVelocityOutput
(
*
,
gridVariables
):
@cppWrapperClassAlias
(
creator
=
_createPorousMediumFlowProblemDecorator
)
class
PorousMediumFlowProblem
:
"""
A class alias used to create a problem decorator Python problems
"""
@cppWrapperCreator
def
_createPorousMediumFlowVelocityOutput
(
*
,
gridVariables
):
"""
Create a PorousMediumFlowVelocityOutput
"""
includes
=
gridVariables
.
_includes
includes
=
gridVariables
.
_includes
includes
+=
[
"
dumux/python/porousmediumflow/velocityoutput.hh
"
,
"
dumux/io/velocityoutput.hh
"
]
includes
+=
[
"
dumux/python/porousmediumflow/velocityoutput.hh
"
,
"
dumux/io/velocityoutput.hh
"
]
fluxVarsType
=
(
fluxVarsType
=
(
f
"
Dumux::GetPropType<
{
gridVariables
.
_
model
.
get
Type
Tag
()
}
, Dumux::Properties::FluxVariables>
"
f
"
Dumux::GetPropType<
{
gridVariables
.
model
.
cpp
Type
}
, Dumux::Properties::FluxVariables>
"
)
)
typeName
=
f
"
Dumux::PorousMediumFlowVelocityOutput<
{
gridVariables
.
_typeName
}
,
{
fluxVarsType
}
>
"
typeName
=
f
"
Dumux::PorousMediumFlowVelocityOutput<
{
gridVariables
.
_typeName
}
,
{
fluxVarsType
}
>
"
moduleName
=
"
porousmediumflowvelocityoutput_
"
+
hashIt
(
typeName
)
moduleName
=
"
porousmediumflowvelocityoutput_
"
+
hashIt
(
typeName
)
...
@@ -51,7 +70,12 @@ def PorousMediumFlowVelocityOutput(*, gridVariables):
...
@@ -51,7 +70,12 @@ def PorousMediumFlowVelocityOutput(*, gridVariables):
typeName
,
typeName
,
moduleName
,
moduleName
,
holder
=
"
std::shared_ptr
"
,
holder
=
"
std::shared_ptr
"
,
preamble
=
gridVariables
.
_
model
.
getProperties
()
,
preamble
=
gridVariables
.
model
.
cppHeader
,
baseClasses
=
baseClass
,
baseClasses
=
baseClass
,
)
)
return
module
.
PorousMediumFlowVelocityOutput
(
gridVariables
)
return
module
.
PorousMediumFlowVelocityOutput
(
gridVariables
)
@cppWrapperClassAlias
(
creator
=
_createPorousMediumFlowVelocityOutput
)
class
PorousMediumFlowVelocityOutput
:
"""
A class alias used to create PorousMediumFlowVelocityOutput instances
"""
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