Merge branch 'fix/2pnc-vtkoutputfields' into 'cleanup/next'

[2pnc] make permeability output problem specific

See merge request !597

dumux/porousmediumflow/2pnc/implicit/vtkoutputfields.hh

@@ -61,12 +61,6 @@ public:
             vtk.addVolumeVariable([j](const VolumeVariables& v){ return v.molarity(Indices::wPhaseIdx,j); },"m_"+ FluidSystem::phaseName(Indices::wPhaseIdx) + "^" + FluidSystem::componentName(j));
 
         vtk.addVolumeVariable([](const VolumeVariables& v){ return v.priVars().state(); }, "phasePresence");
-
-        vtk.addVolumeVariable([](const VolumeVariables& v){ return v.permeability()[0][0];},"Kxx");
-        if (dim >= 2)
-            vtk.addVolumeVariable([](const VolumeVariables& v){ return v.permeability()[1][1]; },"Kyy");
-        if (dim >= 3)
-            vtk.addVolumeVariable([](const VolumeVariables& v){ return v.permeability()[2][2]; },"Kzz");
     }
 };
 

test/porousmediumflow/2pnc/implicit/fuelcellproblem.hh

@@ -166,6 +166,8 @@ public:
         currentDensity_.resize(fvGridGeometry->gridView().size(dofCodim));
         reactionSourceH2O_.resize(fvGridGeometry->gridView().size(dofCodim));
         reactionSourceO2_.resize(fvGridGeometry->gridView().size(dofCodim));
+        Kxx_.resize(fvGridGeometry->gridView().size(dofCodim));
+        Kyy_.resize(fvGridGeometry->gridView().size(dofCodim));
     }
 
     /*!
@@ -284,6 +286,15 @@ public:
         return reactionSourceO2_;
     }
 
+    const std::vector<Scalar>& getKxx()
+    {
+        return Kxx_;
+    }
+
+    const std::vector<Scalar>& getKyy()
+    {
+        return Kyy_;
+    }
 
     void updateVtkOutput(const SolutionVector& curSol)
     {
@@ -320,6 +331,8 @@ public:
                     reactionSourceO2_[dofIdxGlobal] = 0.0;
                     currentDensity_[dofIdxGlobal] = 0.0;
                 }
+                Kxx_[dofIdxGlobal] = volVars.permeability()[0][0];
+                Kyy_[dofIdxGlobal] = volVars.permeability()[1][1];
             }
         }
     }
@@ -367,6 +380,8 @@ private:
     std::vector<double> currentDensity_;
     std::vector<double> reactionSourceH2O_;
     std::vector<double> reactionSourceO2_;
+    std::vector<double> Kxx_;
+    std::vector<double> Kyy_;
 };
 
 } //end namespace Dumux

test/porousmediumflow/2pnc/implicit/test_box2pnc.cc

@@ -144,6 +144,8 @@ int main(int argc, char** argv) try
     vtkWriter.addField(problem->getCurrentDensity(), "currentDensity [A/cm^2]");
     vtkWriter.addField(problem->getReactionSourceH2O(), "reactionSourceH2O [mol/(sm^2)]");
     vtkWriter.addField(problem->getReactionSourceO2(), "reactionSourceO2 [mol/(sm^2)]");
+    vtkWriter.addField(problem->getKxx(), "Kxx");
+    vtkWriter.addField(problem->getKyy(), "Kyy");
     vtkWriter.write(0.0);
 
     // instantiate time loop

test/porousmediumflow/2pnc/implicit/test_cc2pnc.cc

@@ -143,6 +143,8 @@ int main(int argc, char** argv) try
     vtkWriter.addField(problem->getCurrentDensity(), "currentDensity [A/cm^2]");
     vtkWriter.addField(problem->getReactionSourceH2O(), "reactionSourceH2O [mol/(sm^2)]");
     vtkWriter.addField(problem->getReactionSourceO2(), "reactionSourceO2 [mol/(sm^2)]");
+    vtkWriter.addField(problem->getKxx(), "Kxx");
+    vtkWriter.addField(problem->getKyy(), "Kyy");
     vtkWriter.write(0.0);
 
     // instantiate time loop