Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dorie
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
31
Issues
31
List
Boards
Labels
Service Desk
Milestones
Merge Requests
9
Merge Requests
9
Operations
Operations
Incidents
Environments
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
dorie
dorie
Commits
b7a08261
Commit
b7a08261
authored
Mar 19, 2019
by
Santiago Ospina De Los Ríos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[Transport] Rename parameterization stohr to power law dispersion
parent
b606e2c4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
dune/dorie/model/transport/parameterization/hydrodynamic_dispersion/power_law.hh
...ort/parameterization/hydrodynamic_dispersion/power_law.hh
+8
-8
dune/dorie/model/transport/solute_parameters.hh
dune/dorie/model/transport/solute_parameters.hh
+3
-3
No files found.
dune/dorie/model/transport/parameterization/hydrodynamic_dispersion/
stohr
.hh
→
dune/dorie/model/transport/parameterization/hydrodynamic_dispersion/
power_law
.hh
View file @
b7a08261
...
...
@@ -13,7 +13,7 @@ namespace Dorie {
namespace
Parameterization
{
template
<
class
Traits
>
class
Stohr
:
class
PowerLawDispersion
:
public
HydrodynamicDispersion
<
Traits
>
{
private:
...
...
@@ -29,29 +29,29 @@ public:
struct
GammaType
{
RangeField
value
;
inline
static
const
std
::
string
name
=
"gamma
_st
"
;
inline
static
const
std
::
string
name
=
"gamma"
;
};
struct
AlphaType
{
RangeField
value
;
inline
static
const
std
::
string
name
=
"alpha
_st
"
;
inline
static
const
std
::
string
name
=
"alpha"
;
};
/// The name of this parameterization type (This is not the instance name)
static
inline
std
::
string
type
=
"
sthor
"
;
static
inline
std
::
string
type
=
"
power_law
"
;
GammaType
_gamma
;
AlphaType
_alpha
;
std
::
shared_ptr
<
Peclet
<
Traits
>>
_peclet_ptr
;
Stohr
(
const
std
::
string
name
,
PowerLawDispersion
(
const
std
::
string
name
,
std
::
shared_ptr
<
Peclet
<
Traits
>>
peclet
)
:
Base
(
name
),
_peclet_ptr
(
peclet
)
{
}
template
<
typename
...
Args
>
Stohr
(
PowerLawDispersion
(
const
std
::
string
name
,
const
std
::
tuple
<
Args
...
>
parameters
)
:
Base
(
name
,
parameters
),
...
...
@@ -60,7 +60,7 @@ public:
_peclet_ptr
(
std
::
make_shared
<
Peclet
<
Traits
>>
(
name
,
parameters
))
{
}
virtual
~
Stohr
()
override
{}
virtual
~
PowerLawDispersion
()
override
{}
public:
...
...
@@ -94,7 +94,7 @@ public:
std
::
unique_ptr
<
HydrodynamicDispersion
<
Traits
>>
clone
()
const
override
{
using
ThisType
=
Stohr
<
Traits
>
;
using
ThisType
=
PowerLawDispersion
<
Traits
>
;
return
std
::
make_unique
<
ThisType
>
(
*
this
);
}
};
...
...
dune/dorie/model/transport/solute_parameters.hh
View file @
b7a08261
...
...
@@ -19,7 +19,7 @@
#include <dune/dorie/model/transport/parameterization/peclet.hh>
#include <dune/dorie/model/transport/parameterization/hydrodynamic_dispersion/interface.hh>
#include <dune/dorie/model/transport/parameterization/hydrodynamic_dispersion/const.hh>
#include <dune/dorie/model/transport/parameterization/hydrodynamic_dispersion/
stohr
.hh>
#include <dune/dorie/model/transport/parameterization/hydrodynamic_dispersion/
power_law
.hh>
#include <dune/dorie/model/transport/parameterization/hydrodynamic_dispersion/eff_hydromechanic_dispersion/interface.hh>
#include <dune/dorie/model/transport/parameterization/hydrodynamic_dispersion/eff_hydromechanic_dispersion/const.hh>
#include <dune/dorie/model/transport/parameterization/hydrodynamic_dispersion/eff_hydromechanic_dispersion/isotropic.hh>
...
...
@@ -62,8 +62,8 @@ struct TransportParameterizationFactory
if
(
type
==
Parameterization
::
ConstHydrodynamicDispersion
<
Traits
>::
type
)
{
hd_dips
=
std
::
make_shared
<
Parameterization
::
ConstHydrodynamicDispersion
<
Traits
>>
(
name
);
}
else
if
(
type
==
Parameterization
::
Stohr
<
Traits
>::
type
)
{
hd_dips
=
std
::
make_shared
<
Parameterization
::
Stohr
<
Traits
>>
(
name
,
peclet
);
}
else
if
(
type
==
Parameterization
::
PowerLawDispersion
<
Traits
>::
type
)
{
hd_dips
=
std
::
make_shared
<
Parameterization
::
PowerLawDispersion
<
Traits
>>
(
name
,
peclet
);
}
else
if
(
type
==
Parameterization
::
HydrodynamicDispersionSuperposition
<
Traits
>::
type
)
{
// Select type for effective diffusion
...
...
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