Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
amdis
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
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
iwr
amdis
Commits
92b1e9ce
Commit
92b1e9ce
authored
9 years ago
by
Praetorius, Simon
Browse files
Options
Downloads
Patches
Plain Diff
extensions: std namespaces added
parent
4b686a34
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
extensions/BoundaryFunctions.h
+8
-8
8 additions, 8 deletions
extensions/BoundaryFunctions.h
with
8 additions
and
8 deletions
extensions/BoundaryFunctions.h
+
8
−
8
View file @
92b1e9ce
...
@@ -107,7 +107,7 @@ public:
...
@@ -107,7 +107,7 @@ public:
BoundaryFct2
()
:
AbstractFunction
<
double
,
WorldVector
<
double
>
>
(
1
),
y
(
0.205
),
c
(
6.0
)
{};
BoundaryFct2
()
:
AbstractFunction
<
double
,
WorldVector
<
double
>
>
(
1
),
y
(
0.205
),
c
(
6.0
)
{};
BoundaryFct2
(
double
y_
,
double
c_
)
:
AbstractFunction
<
double
,
WorldVector
<
double
>
>
(
1
),
y
(
y_
),
c
(
c_
)
{};
BoundaryFct2
(
double
y_
,
double
c_
)
:
AbstractFunction
<
double
,
WorldVector
<
double
>
>
(
1
),
y
(
y_
),
c
(
c_
)
{};
double
operator
()(
const
WorldVector
<
double
>&
x
)
const
{
double
operator
()(
const
WorldVector
<
double
>&
x
)
const
{
return
1.0
/
sqr
(
2.0
*
y
)
*
sin
(
m_pi
*
(
*
timePtr
)
/
8.0
)
*
c
*
(
y
+
x
[
1
])
*
(
y
-
x
[
1
]);
return
1.0
/
sqr
(
2.0
*
y
)
*
std
::
sin
(
m_pi
*
(
*
timePtr
)
/
8.0
)
*
c
*
(
y
+
x
[
1
])
*
(
y
-
x
[
1
]);
};
};
protected
:
protected
:
double
y
,
c
;
double
y
,
c
;
...
@@ -119,7 +119,7 @@ public:
...
@@ -119,7 +119,7 @@ public:
BoundaryFct2_robin
()
:
AbstractFunction
<
double
,
WorldVector
<
double
>
>
(
1
),
y
(
0.205
),
c
(
6.0
)
{};
BoundaryFct2_robin
()
:
AbstractFunction
<
double
,
WorldVector
<
double
>
>
(
1
),
y
(
0.205
),
c
(
6.0
)
{};
BoundaryFct2_robin
(
double
y_
,
double
c_
)
:
AbstractFunction
<
double
,
WorldVector
<
double
>
>
(
1
),
y
(
y_
),
c
(
c_
)
{};
BoundaryFct2_robin
(
double
y_
,
double
c_
)
:
AbstractFunction
<
double
,
WorldVector
<
double
>
>
(
1
),
y
(
y_
),
c
(
c_
)
{};
double
operator
()(
const
WorldVector
<
double
>&
x
)
const
{
double
operator
()(
const
WorldVector
<
double
>&
x
)
const
{
double
result
=
1.0
/
sqr
(
2.0
*
y
)
*
sin
(
m_pi
*
(
*
timePtr
)
/
8.0
)
*
c
*
(
y
+
x
[
1
])
*
(
y
-
x
[
1
]);
double
result
=
1.0
/
sqr
(
2.0
*
y
)
*
std
::
sin
(
m_pi
*
(
*
timePtr
)
/
8.0
)
*
c
*
(
y
+
x
[
1
])
*
(
y
-
x
[
1
]);
double
n
=
(
x
[
0
]
<
0.0
?-
1.0
:
1.0
);
double
n
=
(
x
[
0
]
<
0.0
?-
1.0
:
1.0
);
return
-
1.0
*
result
*
n
;
return
-
1.0
*
result
*
n
;
};
};
...
@@ -138,8 +138,8 @@ class StokesFlow : public AbstractFunction<WorldVector<double>, WorldVector<doub
...
@@ -138,8 +138,8 @@ class StokesFlow : public AbstractFunction<WorldVector<double>, WorldVector<doub
Initfile
::
get
(
"user parameter->colloidal radius"
,
R
,
1
);
Initfile
::
get
(
"user parameter->colloidal radius"
,
R
,
1
);
Initfile
::
get
(
"pfc-parameter->density"
,
density
,
1
);
Initfile
::
get
(
"pfc-parameter->density"
,
density
,
1
);
Initfile
::
get
(
"pfc-parameter->r"
,
r
,
1
);
Initfile
::
get
(
"pfc-parameter->r"
,
r
,
1
);
radius
=
R
/
(
1.0
-
R
)
*
2.0
*
m_pi
/
sqrt
(
3.0
);
radius
=
R
/
(
1.0
-
R
)
*
2.0
*
m_pi
/
std
::
sqrt
(
3.0
);
D
=
radius
+
2.0
*
m_pi
/
sqrt
(
3.0
);
D
=
radius
+
2.0
*
m_pi
/
std
::
sqrt
(
3.0
);
center
.
set
(
0.0
);
center
.
set
(
0.0
);
Initfile
::
get
(
"user parameter->colloids position[0]"
,
center
,
1
);
Initfile
::
get
(
"user parameter->colloids position[0]"
,
center
,
1
);
...
@@ -176,8 +176,8 @@ class StokesFlow_component : public AbstractFunction<double, WorldVector<double>
...
@@ -176,8 +176,8 @@ class StokesFlow_component : public AbstractFunction<double, WorldVector<double>
Initfile
::
get
(
"user parameter->colloidal radius"
,
R
,
1
);
Initfile
::
get
(
"user parameter->colloidal radius"
,
R
,
1
);
Initfile
::
get
(
"pfc-parameter->density"
,
density
,
1
);
Initfile
::
get
(
"pfc-parameter->density"
,
density
,
1
);
Initfile
::
get
(
"pfc-parameter->r"
,
r
,
1
);
Initfile
::
get
(
"pfc-parameter->r"
,
r
,
1
);
radius
=
R
/
(
1.0
-
R
)
*
2.0
*
m_pi
/
sqrt
(
3.0
);
radius
=
R
/
(
1.0
-
R
)
*
2.0
*
m_pi
/
std
::
sqrt
(
3.0
);
D
=
radius
+
2.0
*
m_pi
/
sqrt
(
3.0
);
D
=
radius
+
2.0
*
m_pi
/
std
::
sqrt
(
3.0
);
center
.
set
(
0.0
);
center
.
set
(
0.0
);
Initfile
::
get
(
"user parameter->colloids position[0]"
,
center
,
1
);
Initfile
::
get
(
"user parameter->colloids position[0]"
,
center
,
1
);
...
@@ -215,8 +215,8 @@ class StokesFlow_robin : public AbstractFunction<double, WorldVector<double> >
...
@@ -215,8 +215,8 @@ class StokesFlow_robin : public AbstractFunction<double, WorldVector<double> >
Initfile
::
get
(
"user parameter->colloidal radius"
,
R
,
1
);
Initfile
::
get
(
"user parameter->colloidal radius"
,
R
,
1
);
Initfile
::
get
(
"pfc-parameter->density"
,
density
,
1
);
Initfile
::
get
(
"pfc-parameter->density"
,
density
,
1
);
Initfile
::
get
(
"pfc-parameter->r"
,
r
,
1
);
Initfile
::
get
(
"pfc-parameter->r"
,
r
,
1
);
radius
=
R
/
(
1.0
-
R
)
*
2.0
*
m_pi
/
sqrt
(
3.0
);
radius
=
R
/
(
1.0
-
R
)
*
2.0
*
m_pi
/
std
::
sqrt
(
3.0
);
D
=
radius
+
2.0
*
m_pi
/
sqrt
(
3.0
);
D
=
radius
+
2.0
*
m_pi
/
std
::
sqrt
(
3.0
);
center
.
set
(
0.0
);
center
.
set
(
0.0
);
Initfile
::
get
(
"user parameter->colloids position[0]"
,
center
,
1
);
Initfile
::
get
(
"user parameter->colloids position[0]"
,
center
,
1
);
...
...
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