Commit a4ec8f1e authored by Praetorius, Simon's avatar Praetorius, Simon

baseproblems updated

parent 3d473c40
......@@ -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);
}
......
......@@ -4,7 +4,7 @@
#define PHASE_FIELD_CRYSTAL_H
#include "AMDiS.h"
#include "MyProblemVec.h"
#include "ExtendedProblemStat.h"
#include "Helpers.h"
#include "POperators.h"
......
......@@ -23,8 +23,6 @@ public:
double *getTempParameter() { return &tempParameter; }
protected:
virtual void fillOperators();
virtual void fillBoundaryConditions();
......
......@@ -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;
......
......@@ -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()");
};
......@@ -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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment