- replaced ! with not

- corrected typos
- moved call of EnergyResid::computeSource to MassResid


git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@6789 2fb0f335-1f38-0410-981e-8018bf24f1b0

dumux/boxmodels/MpNc/MpNcindices.hh

@@ -65,7 +65,7 @@ public:
         numPhases;
 
     /*!
-     * \brief The number of primary variables / equations of the erngy module.
+     * \brief The number of primary variables / equations of the energy module.
      */
     static const int NumPrimaryEnergyVars =
         EnergyIndices::NumPrimaryVars ;

dumux/boxmodels/MpNc/MpNclocalresidual.hh

@@ -186,11 +186,17 @@ public:
         PrimaryVariables tmp(0);
         MassResid::computeSource(tmp, volVars);
         source += tmp;
-
-        tmp = 0.;
-        EnergyResid::computeSource(tmp, volVars);
-        source += tmp;
         Valgrind::CheckDefined(source);
+
+        /*
+         *      EnergyResid also called in the MassResid
+         *      1) Makes some sense because energy is also carried by mass
+         *      2) The mass transfer between the phases is needed.
+         */
+//        tmp = 0.;
+//        EnergyResid::computeSource(tmp, volVars);
+//        source += tmp;
+//        Valgrind::CheckDefined(source);
      };
 
 

dumux/boxmodels/MpNc/MpNcvolumevariablesia.hh

@@ -42,7 +42,7 @@ namespace Dumux
 template <class TypeTag, bool enableKinetic /* = false */, bool enableKineticEnergy /* = false */>
 class MPNCVolumeVariablesIA
 {
-    static_assert(!enableKinetic && !enableKineticEnergy,
+    static_assert(not enableKinetic and not enableKineticEnergy,
                   "The kinetic energy modules need specific interfacial area "
                   "but no suitable specialization of the IA volume variables module "
                   "has been included.");

dumux/boxmodels/MpNc/mass/MpNclocalresidualmass.hh

@@ -335,9 +335,23 @@ public:
     static void computeSource(PrimaryVariables &source,
                               const VolumeVariables &volVars)
     {
+    static_assert(not enableKineticEnergy,
+                      "In the case of kinetic energy transfer the advective energy transport between the phases has to be considered. "
+                      "It is hard (technically) to say how much mass got transfered in the case of chemical equilibrium. "
+                      "Therefore, kineticEnergy and no kinetic mass does not fit (yet).");
+
         // mass transfer is not considered in this mass module
         for (int compIdx = 0; compIdx < numComponents; ++compIdx)
             source[conti0EqIdx + compIdx] = 0.0;
+
+
+        PrimaryVariables tmp(0);
+        // Similar to the compute Flux, the energy residual needs to be called from the
+        // mass residual.
+        EnergyResid::computeSource(tmp,
+                                   volVars);
+        source += tmp;
+        Valgrind::CheckDefined(source);
     };
 };