Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Aland, Sebastian
amdis
Commits
a4ec8f1e
Commit
a4ec8f1e
authored
Aug 02, 2012
by
Praetorius, Simon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
baseproblems updated
parent
3d473c40
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
12 additions
and
15 deletions
+12
-15
extensions/base_problems/NavierStokesPhase_TaylorHood.cc
extensions/base_problems/NavierStokesPhase_TaylorHood.cc
+1
-1
extensions/base_problems/PhaseFieldCrystal.h
extensions/base_problems/PhaseFieldCrystal.h
+1
-1
extensions/base_problems/PhaseFieldCrystal_Base.h
extensions/base_problems/PhaseFieldCrystal_Base.h
+0
-2
extensions/base_problems/PhaseFieldCrystal_Phase.h
extensions/base_problems/PhaseFieldCrystal_Phase.h
+2
-1
extensions/base_problems/PhaseFieldCrystal_RB.cc
extensions/base_problems/PhaseFieldCrystal_RB.cc
+5
-5
extensions/base_problems/PhaseFieldCrystal_RB.h
extensions/base_problems/PhaseFieldCrystal_RB.h
+3
-5
No files found.
extensions/base_problems/NavierStokesPhase_TaylorHood.cc
View file @
a4ec8f1e
...
...
@@ -44,7 +44,7 @@ void NavierStokesPhase_TaylorHood::transferInitialSolution(AdaptInfo *adaptInfo)
for
(
int
i
=
0
;
i
<
dow
;
i
++
)
transformDOF
(
prob
->
getSolution
()
->
getDOFVector
(
0
),
phase
,
prob
->
getSolution
()
->
getDOFVector
(
0
),
new
AMDiS
::
Mult
<
double
>
);
super
::
transferInitialSolution
(
AdaptInfo
*
adaptInfo
);
super
::
transferInitialSolution
(
adaptInfo
);
phaseOld
->
interpol
(
phase
);
}
...
...
extensions/base_problems/PhaseFieldCrystal.h
View file @
a4ec8f1e
...
...
@@ -4,7 +4,7 @@
#define PHASE_FIELD_CRYSTAL_H
#include "AMDiS.h"
#include "
My
Problem
Vec
.h"
#include "
Extended
Problem
Stat
.h"
#include "Helpers.h"
#include "POperators.h"
...
...
extensions/base_problems/PhaseFieldCrystal_Base.h
View file @
a4ec8f1e
...
...
@@ -23,8 +23,6 @@ public:
double
*
getTempParameter
()
{
return
&
tempParameter
;
}
protected:
virtual
void
fillOperators
();
virtual
void
fillBoundaryConditions
();
...
...
extensions/base_problems/PhaseFieldCrystal_Phase.h
View file @
a4ec8f1e
...
...
@@ -3,8 +3,9 @@
#ifndef PHASE_FIELD_CRYSTAL_PHASE_H
#define PHASE_FIELD_CRYSTAL_PHASE_H
#include "PhaseFieldCrystal.h"
#include "PhaseFieldCrystal
_Base
.h"
#include "PhaseFieldConvert.h"
#include "POperators.h"
using
namespace
AMDiS
;
...
...
extensions/base_problems/PhaseFieldCrystal_RB.cc
View file @
a4ec8f1e
...
...
@@ -3,7 +3,7 @@
using
namespace
std
;
using
namespace
AMDiS
;
PhaseFieldCrystal
::
PhaseFieldCrystal
(
const
std
::
string
&
name_
)
:
PhaseFieldCrystal
_RB
::
PhaseFieldCrystal
_RB
(
const
std
::
string
&
name_
)
:
super
(
name_
),
useMobility
(
false
),
tempParameter
(
-
0.6
),
...
...
@@ -22,8 +22,8 @@ PhaseFieldCrystal::PhaseFieldCrystal(const std::string &name_) :
};
void
PhaseFieldCrystal
::
fillOperators
()
{
FUNCNAME
(
"PhaseFieldCrystal::fillOperators()"
);
void
PhaseFieldCrystal
_RB
::
fillOperators
()
{
FUNCNAME
(
"PhaseFieldCrystal
_RB
::fillOperators()"
);
// rho
Operator
*
opMnu
=
new
Operator
(
prob
->
getFeSpace
(
0
),
prob
->
getFeSpace
(
2
));
...
...
@@ -100,6 +100,6 @@ void PhaseFieldCrystal::fillOperators()
};
void
PhaseFieldCrystal
::
fillBoundaryConditions
()
{
FUNCNAME
(
"PhaseFieldCrystal::fillBoundaryConditions()"
);
void
PhaseFieldCrystal
_RB
::
fillBoundaryConditions
()
{
FUNCNAME
(
"PhaseFieldCrystal
_RB
::fillBoundaryConditions()"
);
};
extensions/base_problems/PhaseFieldCrystal_RB.h
View file @
a4ec8f1e
...
...
@@ -11,7 +11,7 @@ using namespace AMDiS;
/** Phase-field Crystal problem
*/
class
PhaseFieldCrystal
:
public
BaseProblem
<
RosenbrockStationary
>
class
PhaseFieldCrystal
_RB
:
public
BaseProblem
<
RosenbrockStationary
>
{
public:
// typedefs
...
...
@@ -19,10 +19,8 @@ public: // typedefs
public:
PhaseFieldCrystal
(
const
std
::
string
&
name_
);
~
PhaseFieldCrystal
()
{};
protected:
PhaseFieldCrystal_RB
(
const
std
::
string
&
name_
);
~
PhaseFieldCrystal_RB
()
{};
virtual
void
fillOperators
();
virtual
void
fillBoundaryConditions
();
...
...
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