From 6802c6b5df99f4f1917ee82023b78a8c8deec9f4 Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Wed, 11 Jan 2012 10:32:23 +0000
Subject: [PATCH] the other changes besides CoordScalar -> Scalar of r7333 also
seem to be spurious
git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@7336 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
dumux/boxmodels/MpNc/MpNclocalresidual.hh | 17 +----------------
.../MpNc/energy/MpNclocalresidualenergy.hh | 3 ---
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/dumux/boxmodels/MpNc/MpNclocalresidual.hh b/dumux/boxmodels/MpNc/MpNclocalresidual.hh
index ee24916038..4c63795d57 100644
--- a/dumux/boxmodels/MpNc/MpNclocalresidual.hh
+++ b/dumux/boxmodels/MpNc/MpNclocalresidual.hh
@@ -75,12 +75,7 @@ protected:
phase0NcpIdx = Indices::phase0NcpIdx
};
-#if SUMMED_UP
- enum { energyEq0Idx = Indices::energyEq0Idx };
- enum { wPhaseIdx = FluidSystem::lPhaseIdx};
- enum { nPhaseIdx = FluidSystem::gPhaseIdx};
- enum { sPhaseIdx = FluidSystem::sPhaseIdx};
-#endif
+
typedef typename GridView::template Codim<0>::Entity Element;
typedef typename GridView::template Codim<0>::Iterator ElementIterator;
@@ -267,16 +262,6 @@ public:
this->curVolVars_(i).phaseNcp(phaseIdx);
}
}
-
-#if SUMMED_UP
- this->residual_[i][energyEq0Idx + wPhaseIdx] += this->residual_[i][energyEq0Idx + nPhaseIdx]
- + this->residual_[i][energyEq0Idx + sPhaseIdx];
- this->residual_[i][energyEq0Idx + nPhaseIdx] = this->curVolVars_(i).temperature(wPhaseIdx)
- - this->curVolVars_(i).temperature(nPhaseIdx);
- this->residual_[i][energyEq0Idx + sPhaseIdx] = this->curVolVars_(i).temperature(wPhaseIdx)
- - this->curVolVars_(i).temperature(sPhaseIdx);
-#endif
-
}
}
diff --git a/dumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh b/dumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh
index c15717d955..1a5bb1f4c7 100644
--- a/dumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh
+++ b/dumux/boxmodels/MpNc/energy/MpNclocalresidualenergy.hh
@@ -180,13 +180,10 @@ public:
phaseIdx,
molarPhaseComponentValuesMassTransport[phaseIdx]);
-#warning HEAT CONDUCTION OFF
-#if 0
//conduction is treated lumped in this model
computeHeatConduction(flux,
fluxVars,
volVars);
-#endif
}
static void computePhaseEnthalpyFlux(PrimaryVariables & result,
--
GitLab