diff --git a/extensions/base_problems/NavierStokesPhase_TaylorHood.cc b/extensions/base_problems/NavierStokesPhase_TaylorHood.cc index b0350dad243d546b1b2b2ed66d7bf69cb28e462a..7fb8aa212cd90d1022b258a7086235034295f7a0 100644 --- a/extensions/base_problems/NavierStokesPhase_TaylorHood.cc +++ b/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); } diff --git a/extensions/base_problems/PhaseFieldCrystal.h b/extensions/base_problems/PhaseFieldCrystal.h index e277b7b9401c749f75028370a301148c6e0371fa..275818453bc8c16608b18c9c37f8a4f9a1f32667 100644 --- a/extensions/base_problems/PhaseFieldCrystal.h +++ b/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" diff --git a/extensions/base_problems/PhaseFieldCrystal_Base.h b/extensions/base_problems/PhaseFieldCrystal_Base.h index 7e3937838e67a4d928b6f5ca848ac9a1c58ab465..071a8bac01d95ddea4eb2a5b1122d263ba2cfb8f 100644 --- a/extensions/base_problems/PhaseFieldCrystal_Base.h +++ b/extensions/base_problems/PhaseFieldCrystal_Base.h @@ -23,8 +23,6 @@ public: double *getTempParameter() { return &tempParameter; } -protected: - virtual void fillOperators(); virtual void fillBoundaryConditions(); diff --git a/extensions/base_problems/PhaseFieldCrystal_Phase.h b/extensions/base_problems/PhaseFieldCrystal_Phase.h index 38bb9ef72bdb53a1121f769d3a500aa4d96af917..69019aea0db9ca45b6872c3bfc37cbdd09473e2d 100644 --- a/extensions/base_problems/PhaseFieldCrystal_Phase.h +++ b/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; diff --git a/extensions/base_problems/PhaseFieldCrystal_RB.cc b/extensions/base_problems/PhaseFieldCrystal_RB.cc index 9f2935c93391ecbb5b0ee05d8163dc118713b9ae..14653578869ac8d23d3f6009af5dd28d881189d3 100644 --- a/extensions/base_problems/PhaseFieldCrystal_RB.cc +++ b/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()"); }; diff --git a/extensions/base_problems/PhaseFieldCrystal_RB.h b/extensions/base_problems/PhaseFieldCrystal_RB.h index 5765706eb8cd0bc5d71647aa638b22cd3a1c5e9f..db373531656a9b6c1a41c5c3c89e8cfa6316a4c3 100644 --- a/extensions/base_problems/PhaseFieldCrystal_RB.h +++ b/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();