Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tobias Schruff
waLBerla
Commits
47616428
Commit
47616428
authored
Mar 21, 2018
by
Michael Kuron
Browse files
Fix implict/explict typos in pe::cr
parent
aae402a0
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/pe/cr/DEM.h
View file @
47616428
...
...
@@ -79,7 +79,7 @@ private:
size_t
numberOfContactsTreated_
;
};
class
DEM
:
public
DEMSolver
<
IntegrateImplictEuler
,
ResolveContactSpringDashpotHaffWerner
>
class
DEM
:
public
DEMSolver
<
IntegrateImplic
i
tEuler
,
ResolveContactSpringDashpotHaffWerner
>
{
public:
DEM
(
const
shared_ptr
<
BodyStorage
>&
globalBodyStorage
...
...
@@ -88,8 +88,8 @@ public:
,
domain_decomposition
::
BlockDataID
ccdID
,
domain_decomposition
::
BlockDataID
fcdID
,
WcTimingTree
*
tt
=
NULL
)
:
DEMSolver
<
IntegrateImplictEuler
,
ResolveContactSpringDashpotHaffWerner
>
(
IntegrateImplictEuler
(),
ResolveContactSpringDashpotHaffWerner
(),
:
DEMSolver
<
IntegrateImplic
i
tEuler
,
ResolveContactSpringDashpotHaffWerner
>
(
IntegrateImplic
i
tEuler
(),
ResolveContactSpringDashpotHaffWerner
(),
globalBodyStorage
,
blockStorage
,
storageID
,
ccdID
,
fcdID
,
tt
)
{
}
...
...
src/pe/cr/Integrators.h
View file @
47616428
...
...
@@ -30,7 +30,7 @@ namespace pe {
namespace
cr
{
//*************************************************************************************************
/*!\brief Integrate the trajectory of one body using implict Euler.
/*!\brief Integrate the trajectory of one body using implic
i
t Euler.
*
* \param id Body ID.
* \param dt Time step size.
...
...
@@ -40,7 +40,7 @@ namespace cr {
* The implicit Euler algorithm, also known as backward Euler, is used. It is a first-order
* integrator that does conserves energy (i.e. it is symplectic.)
*/
class
IntegrateImplictEuler
{
class
IntegrateImplic
i
tEuler
{
public:
void
operator
()(
BodyID
id
,
real_t
dt
,
ICR
&
solver
)
const
{
...
...
@@ -88,7 +88,7 @@ public:
* The explicit Euler algorithm, also known as forward Euler, is used. It is a first-order
* integrator that does not conserve energy (i.e. it is not symplectic.)
*/
class
IntegrateExplictEuler
{
class
IntegrateExplic
i
tEuler
{
public:
void
operator
()(
BodyID
id
,
real_t
dt
,
ICR
&
solver
)
const
{
...
...
src/pe/cr/PlainIntegrator.h
View file @
47616428
...
...
@@ -61,14 +61,14 @@ private:
WcTimingTree
*
tt_
;
};
class
PlainIntegrator
:
public
PlainIntegratorSolver
<
IntegrateImplictEuler
>
class
PlainIntegrator
:
public
PlainIntegratorSolver
<
IntegrateImplic
i
tEuler
>
{
public:
PlainIntegrator
(
const
shared_ptr
<
BodyStorage
>&
globalBodyStorage
,
const
shared_ptr
<
BlockStorage
>&
blockStorage
,
domain_decomposition
::
BlockDataID
storageID
,
WcTimingTree
*
tt
=
NULL
)
:
PlainIntegratorSolver
<
IntegrateImplictEuler
>
(
IntegrateImplictEuler
(),
globalBodyStorage
,
blockStorage
,
:
PlainIntegratorSolver
<
IntegrateImplic
i
tEuler
>
(
IntegrateImplic
i
tEuler
(),
globalBodyStorage
,
blockStorage
,
storageID
,
tt
)
{
}
...
...
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