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

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

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,