[implicit/2p2c]

the automatic testing environment seems to be unable to handle
interactive gnuplot windows, therefore they have been removed for
testing

reviewed by Beatrix



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

test/implicit/2p2c/CMakeLists.txt

@@ -19,11 +19,13 @@ add_dumux_test(test_box2p2cni test_box2p2cni test_box2p2cni.cc
   ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
   ${CMAKE_SOURCE_DIR}/test/references/waterairbox-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/waterairbox-00010.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_box2p2cni)
+  ${CMAKE_CURRENT_BINARY_DIR}/test_box2p2cni
+  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_box2p2cni_reference.input)
 
 add_dumux_test(test_cc2p2cni test_cc2p2cni test_cc2p2cni.cc
   ${CMAKE_SOURCE_DIR}/bin/runTest.sh
   ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
   ${CMAKE_SOURCE_DIR}/test/references/wateraircc-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/wateraircc-00010.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_cc2p2cni)
+  ${CMAKE_CURRENT_BINARY_DIR}/test_cc2p2cni
+  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_cc2p2cni_reference.input)

test/implicit/2p2c/test_box2p2cni.cc

@@ -44,7 +44,8 @@ void usage(const char *progName, const std::string &errorMsg)
                                         "\t-TimeManager.TEnd      End of the simulation [s] \n"
                                         "\t-TimeManager.DtInitial Initial timestep size [s] \n"
                                         "\t-Grid.File             Name of the file containing the grid \n"
-                                        "\t                       definition in DGF format\n";
+                                        "\t                       definition in DGF format\n"
+                                        "\t-Output.PlotFluidMatrixInteractions  Interactive output via gnuplot\n";
 
         std::cout << errorMessageOut
                   << "\n";

test/implicit/2p2c/test_box2p2cni.input

@@ -8,3 +8,5 @@ File = ./grids/test_2p2cni.dgf
 [Problem]
 Name = waterairbox
 
+[Output]
+PlotFluidMatrixInteractions = true

test/implicit/2p2c/test_box2p2cni_reference.input

+[TimeManager]
+DtInitial = 250 # [s]
+TEnd = 1e4 # [s]
+
+[Grid]
+File = ./grids/test_2p2cni.dgf
+
+[Problem]
+Name = waterairbox
+
+[Output]
+PlotFluidMatrixInteractions = false

test/implicit/2p2c/test_cc2p2cni.input

@@ -8,3 +8,5 @@ File = ./grids/test_2p2cni.dgf
 [Problem]
 Name = wateraircc
 
+[Output]
+PlotFluidMatrixInteractions = true

test/implicit/2p2c/test_cc2p2cni_reference.input

+[TimeManager]
+DtInitial = 250 # [s]
+TEnd = 1e4 # [s]
+
+[Grid]
+File = ./grids/test_2p2cni.dgf
+
+[Problem]
+Name = wateraircc
+
+[Output]
+PlotFluidMatrixInteractions = false

test/implicit/2p2c/waterairspatialparams.hh

@@ -115,6 +115,9 @@ public:
         coarseMaterialParams_.setPe(1e4);
         fineMaterialParams_.setLambda(2.0);
         coarseMaterialParams_.setLambda(2.0);
+
+        plotFluidMatrixInteractions_ = GET_RUNTIME_PARAM_FROM_GROUP(TypeTag, bool, Output,
+                                                                    PlotFluidMatrixInteractions);
     }
 
     /*!
@@ -126,18 +129,18 @@ public:
         PlotMaterialLaw<TypeTag> plotMaterialLaw;
         PlotEffectiveDiffusivityModel<TypeTag> plotEffectiveDiffusivityModel;
         PlotThermalConductivityModel<TypeTag> plotThermalConductivityModel;
-        plotMaterialLaw.plotpcsw(fineMaterialParams_, 0.1, 1.0, "fine");
-        plotMaterialLaw.plotpcsw(coarseMaterialParams_, 0.1, 1.0, "coarse");
-        plotMaterialLaw.plotkr(fineMaterialParams_, 0.1, 1.0, "fine", false/*interactive*/);
-        plotMaterialLaw.plotkr(coarseMaterialParams_, 0.1, 1.0, "coarse", false/*interactive*/);
+        plotMaterialLaw.plotpcsw(fineMaterialParams_, 0.2, 1.0, "fine", plotFluidMatrixInteractions_);
+        plotMaterialLaw.plotpcsw(coarseMaterialParams_, 0.2, 1.0, "coarse", plotFluidMatrixInteractions_);
+        plotMaterialLaw.plotkr(fineMaterialParams_, 0.2, 1.0, "fine", plotFluidMatrixInteractions_);
+        plotMaterialLaw.plotkr(coarseMaterialParams_, 0.2, 1.0, "coarse", plotFluidMatrixInteractions_);
 
-        plotEffectiveDiffusivityModel.plotdeff(finePorosity_, 0.0, 1.0, "fine");
-        plotEffectiveDiffusivityModel.plotdeff(coarsePorosity_, 0.0, 1.0, "coarse");
+        plotEffectiveDiffusivityModel.plotdeff(finePorosity_, 0.0, 1.0, "fine", plotFluidMatrixInteractions_);
+        plotEffectiveDiffusivityModel.plotdeff(coarsePorosity_, 0.0, 1.0, "coarse", plotFluidMatrixInteractions_);
 
         plotThermalConductivityModel.plotlambdaeff(finePorosity_, 2700.0, lambdaSolid_,
-                                                   0.0, 1.0, "fine");
+                                                   0.0, 1.0, "fine", plotFluidMatrixInteractions_);
         plotThermalConductivityModel.plotlambdaeff(coarsePorosity_, 2700.0, lambdaSolid_,
-                                                   0.0, 1.0, "coarse");
+                                                   0.0, 1.0, "coarse", plotFluidMatrixInteractions_);
     }
 
     /*!
@@ -259,6 +262,8 @@ private:
 
     MaterialLawParams fineMaterialParams_;
     MaterialLawParams coarseMaterialParams_;
+
+    bool plotFluidMatrixInteractions_;
 };
 
 }