Commit d0890723 authored by Praetorius, Simon's avatar Praetorius, Simon
Browse files

corrections of NavierStokes_TH_Multiphase, NavierStokes_TaylorHodd and CahnHilliard

parent c21c94de
...@@ -124,8 +124,12 @@ void CahnHilliard::solveInitialProblem(AdaptInfo *adaptInfo) ...@@ -124,8 +124,12 @@ void CahnHilliard::solveInitialProblem(AdaptInfo *adaptInfo)
HL_SignedDistTraverse reinit("reinit", getMesh()->getDim()); HL_SignedDistTraverse reinit("reinit", getMesh()->getDim());
reinit.calcSignedDistFct(adaptInfo, &tmp); reinit.calcSignedDistFct(adaptInfo, &tmp);
#ifndef HAVE_PARALLEL_DOMAIN_AMDIS
Recovery recovery(L2_NORM, 1); Recovery recovery(L2_NORM, 1);
recovery.recoveryUh(&tmp, *prob->getSolution()->getDOFVector(0)); recovery.recoveryUh(&tmp, *prob->getSolution()->getDOFVector(0));
#else
prob->getSolution()->getDOFVector(0)->interpol(tmp);
#endif
} }
......
...@@ -46,8 +46,14 @@ NavierStokes_TH_MultiPhase::NavierStokes_TH_MultiPhase(const std::string &name_, ...@@ -46,8 +46,14 @@ NavierStokes_TH_MultiPhase::NavierStokes_TH_MultiPhase(const std::string &name_,
NavierStokes_TH_MultiPhase::~NavierStokes_TH_MultiPhase() NavierStokes_TH_MultiPhase::~NavierStokes_TH_MultiPhase()
{ {
if (densityPhase) { delete densityPhase; densityPhase = NULL; } if (densityPhase) {
if (viscosityPhase) { delete viscosityPhase; viscosityPhase = NULL; } delete densityPhase;
densityPhase = NULL;
}
if (viscosityPhase) {
delete viscosityPhase;
viscosityPhase = NULL;
}
} }
......
...@@ -44,8 +44,8 @@ NavierStokes_TaylorHood::NavierStokes_TaylorHood(const std::string &name_, bool ...@@ -44,8 +44,8 @@ NavierStokes_TaylorHood::NavierStokes_TaylorHood(const std::string &name_, bool
// type of non-linear term: // type of non-linear term:
// 0... u^old*grad(u_i^old), // 0... u^old*grad(u_i^old),
// 1... u'*grad(u_i^old), // 1... u*grad(u_i^old),
// 2... u^old*grad(u'_i) // 2... u^old*grad(u_i)
// 3... (1)+(2)-(0) // 3... (1)+(2)-(0)
Initfile::get(self::name + "->non-linear term", nonLinTerm); Initfile::get(self::name + "->non-linear term", nonLinTerm);
......
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