baseproblems updated

extensions/base_problems/NavierStokesPhase_TaylorHood.cc

@@ -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

@@ -4,7 +4,7 @@
 #define PHASE_FIELD_CRYSTAL_H
 
 #include "AMDiS.h"
-#include "MyProblemVec.h"
+#include "ExtendedProblemStat.h"
 #include "Helpers.h"
 #include "POperators.h"
 

extensions/base_problems/PhaseFieldCrystal_Base.h

@@ -23,8 +23,6 @@ public:
 
   double *getTempParameter() { return &tempParameter; }
 
-protected:
-
   virtual void fillOperators();
   virtual void fillBoundaryConditions();
 

extensions/base_problems/PhaseFieldCrystal_Phase.h

@@ -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

@@ -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

@@ -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();