From 671dc7a1d1ded84578e782381bd4794e59895b8d Mon Sep 17 00:00:00 2001
From: Johannes Hommel <johannes.hommel@iws.uni-stuttgart.de>
Date: Wed, 31 Jan 2018 13:46:42 +0100
Subject: [PATCH] [2pncmin] deleted temperature in reference outputs, adapted
names and vtu number
---
.../mineralization/vtkoutputfields.hh | 2 +-
.../2pncmin/implicit/CMakeLists.txt | 2 +-
.../saltflushbox2pncmin-reference.vtu | 112 +++++++-----------
.../saltflushcc2pncmin-reference.vtu | 21 +---
4 files changed, 48 insertions(+), 89 deletions(-)
diff --git a/dumux/porousmediumflow/mineralization/vtkoutputfields.hh b/dumux/porousmediumflow/mineralization/vtkoutputfields.hh
index bfd879d0f9..9ff5abb721 100644
--- a/dumux/porousmediumflow/mineralization/vtkoutputfields.hh
+++ b/dumux/porousmediumflow/mineralization/vtkoutputfields.hh
@@ -54,7 +54,7 @@ public:
// additional output
for (int i = 0; i < numSPhases; ++i)
{
- vtk.addVolumeVariable([i](const VolumeVariables& v){ return v.precipitateVolumeFraction(numPhases + i); },"precipVolFrac_"+ FluidSystem::phaseName(numPhases + i));
+ vtk.addVolumeVariable([i](const VolumeVariables& v){ return v.precipitateVolumeFraction(numPhases + i); },"precipitateVolumeFraction_"+ FluidSystem::phaseName(numPhases + i));
}
}
};
diff --git a/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt b/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt
index d4accfa758..cc4224af28 100644
--- a/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt
@@ -7,7 +7,7 @@ dune_add_test(NAME test_2pncmin_box
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/saltflushbox2pncmin-reference.vtu
- ${CMAKE_CURRENT_BINARY_DIR}/saltflushbox-00046.vtu
+ ${CMAKE_CURRENT_BINARY_DIR}/saltflushbox-00050.vtu
--command "${CMAKE_CURRENT_BINARY_DIR}/test_2pncmin_box -ParameterFile test_2pncmin.input -Problem.Name saltflushbox")
dune_add_test(NAME test_2pncmin_tpfa
diff --git a/test/references/saltflushbox2pncmin-reference.vtu b/test/references/saltflushbox2pncmin-reference.vtu
index 2d1546c5a4..ddbb46a506 100644
--- a/test/references/saltflushbox2pncmin-reference.vtu
+++ b/test/references/saltflushbox2pncmin-reference.vtu
@@ -2,29 +2,7 @@
<VTKFile type="UnstructuredGrid" version="0.1" byte_order="LittleEndian">
<UnstructuredGrid>
<Piece NumberOfCells="200" NumberOfPoints="231">
- <PointData Scalars="Sn" Vectors="velocity_liquid (m/s)">
- <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
- 0.05 0.0323458 0.05 0.0477935 0.0259454 0.0419438 0 0 0 0 0 0
- 0 0 0 0 0 0 0 0 0 0 0 0
- 0 0 0 0.0214426 0.0553292 0.08244 0.0807518 0.119742 0.142242 0.242648 0.471931 0.585647
- 0.611075 0.631672 0.614715 0.633735 0.8 0.8 0.05 0.0534039 0.0494369 0 0 0
- 0 0 0 0 0 0 0 0.0314173 0.0956834 0.147474 0.351085 0.620309
- 0.63178 0.633758 0.8 0.05 0.0541903 0.0522629 0 0 0 0 0 0
- 0 0 0 0 0.0347488 0.104263 0.171568 0.437012 0.628455 0.631797 0.633759 0.8
- 0.05 0.0536678 0.0528241 0 0 0 0 0 0 0 0 0
- 0 0.035752 0.110621 0.194785 0.497422 0.630516 0.631801 0.633759 0.8 0.05 0.0530864 0.0527012
- 0 0 0 0 0 0 0 0 0 0 0.0362374 0.116324
- 0.220215 0.543134 0.631196 0.631802 0.63376 0.8 0.05 0.0526184 0.0524762 0 0 0
- 0 0 0 0 0 0 0 0.0371368 0.122505 0.251492 0.578308 0.631456
- 0.631802 0.633761 0.8 0.05 0.0522275 0.0522556 0 0 0 0 0 0
- 0 0 0 0 0.038806 0.130106 0.294457 0.604205 0.631575 0.631813 0.633772 0.8
- 0.05 0.0518837 0.0520256 0 0 0 0 0 0 0 0 0
- 0 0.0419763 0.140578 0.357845 0.620694 0.631775 0.631966 0.633916 0.8 0.05 0.0517713 0.051973
- 0 0 0 0 0 0 0 0 0 0 0.0505585 0.157906
- 0.445387 0.630008 0.633463 0.633627 0.635487 0.8 0.05 0.0695192 0.0829568 0 0 0
- 0 0 0 0 0 0 0 0.123683 0.292859 0.599014 0.647617 0.647929
- 0.64804 0.649341 0.8
- </DataArray>
+ <PointData Scalars="Sw" Vectors="velocity_liquid (m/s)">
<DataArray type="Float32" Name="Sw" NumberOfComponents="1" format="ascii">
0.95 0.967654 0.95 0.952206 0.974055 0.958056 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
@@ -47,27 +25,27 @@
1 1 1 1 1 1 1 0.876317 0.707141 0.400986 0.352383 0.352071
0.35196 0.350659 0.2
</DataArray>
- <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
- 1.3e+07 1.29986e+07 1.3e+07 1.29902e+07 1.29821e+07 1.29733e+07 1.29633e+07 1.29526e+07 1.28393e+07 1.28305e+07 1.26048e+07 1.25965e+07
- 1.23436e+07 1.2334e+07 1.20697e+07 1.20594e+07 1.17897e+07 1.1779e+07 1.15066e+07 1.14958e+07 1.13436e+07 1.13327e+07 1.13015e+07 1.12905e+07
- 1.12588e+07 1.12479e+07 1.12149e+07 1.12045e+07 1.11714e+07 1.11607e+07 1.11137e+07 1.1103e+07 1.10555e+07 1.10408e+07 1.10135e+07 1.10139e+07
- 1.10106e+07 1.10099e+07 1.10061e+07 1.10053e+07 1.1e+07 1.1e+07 1.3e+07 1.29844e+07 1.29648e+07 1.2942e+07 1.28265e+07 1.25946e+07
- 1.2327e+07 1.20504e+07 1.1769e+07 1.14851e+07 1.13218e+07 1.12797e+07 1.12372e+07 1.11944e+07 1.11503e+07 1.10921e+07 1.10295e+07 1.10145e+07
- 1.10096e+07 1.10049e+07 1.1e+07 1.3e+07 1.29797e+07 1.2957e+07 1.29318e+07 1.28255e+07 1.25964e+07 1.2322e+07 1.20424e+07 1.17595e+07
- 1.14747e+07 1.13111e+07 1.1269e+07 1.12267e+07 1.11841e+07 1.11401e+07 1.10814e+07 1.10244e+07 1.10143e+07 1.10094e+07 1.10046e+07 1.1e+07
- 1.3e+07 1.29755e+07 1.29496e+07 1.2922e+07 1.28254e+07 1.25997e+07 1.23184e+07 1.20352e+07 1.17503e+07 1.14645e+07 1.13004e+07 1.12584e+07
- 1.12162e+07 1.11739e+07 1.11301e+07 1.10712e+07 1.10217e+07 1.1014e+07 1.10092e+07 1.10044e+07 1.1e+07 1.3e+07 1.29715e+07 1.29423e+07
- 1.29125e+07 1.28252e+07 1.26031e+07 1.23153e+07 1.20283e+07 1.17414e+07 1.14543e+07 1.12898e+07 1.12478e+07 1.12057e+07 1.11635e+07 1.112e+07
- 1.10611e+07 1.102e+07 1.10137e+07 1.10089e+07 1.10043e+07 1.1e+07 1.3e+07 1.29675e+07 1.29351e+07 1.2903e+07 1.28245e+07 1.26059e+07
- 1.2312e+07 1.20214e+07 1.17324e+07 1.14442e+07 1.12791e+07 1.12372e+07 1.11952e+07 1.11533e+07 1.11101e+07 1.10511e+07 1.10191e+07 1.10134e+07
- 1.10086e+07 1.10041e+07 1.1e+07 1.3e+07 1.29633e+07 1.29277e+07 1.2893e+07 1.28229e+07 1.26076e+07 1.23079e+07 1.2014e+07 1.17232e+07
- 1.14339e+07 1.12684e+07 1.12265e+07 1.11848e+07 1.1143e+07 1.11001e+07 1.10416e+07 1.10186e+07 1.10131e+07 1.10083e+07 1.10038e+07 1.1e+07
- 1.3e+07 1.29586e+07 1.292e+07 1.28826e+07 1.28197e+07 1.26074e+07 1.23021e+07 1.20058e+07 1.17136e+07 1.14235e+07 1.12577e+07 1.12158e+07
- 1.11743e+07 1.11329e+07 1.109e+07 1.10339e+07 1.10184e+07 1.10128e+07 1.10078e+07 1.10035e+07 1.1e+07 1.3e+07 1.29529e+07 1.2912e+07
- 1.28722e+07 1.28131e+07 1.2603e+07 1.22942e+07 1.19966e+07 1.17035e+07 1.14129e+07 1.12469e+07 1.1205e+07 1.11638e+07 1.1123e+07 1.10787e+07
- 1.10296e+07 1.10182e+07 1.10122e+07 1.10072e+07 1.1003e+07 1.1e+07 1.3e+07 1.29451e+07 1.29034e+07 1.28649e+07 1.27993e+07 1.25886e+07
- 1.22848e+07 1.19861e+07 1.16928e+07 1.1402e+07 1.12359e+07 1.11941e+07 1.11528e+07 1.11147e+07 1.10646e+07 1.1029e+07 1.10178e+07 1.10114e+07
- 1.10064e+07 1.10022e+07 1.1e+07
+ <DataArray type="Float32" Name="Sn" NumberOfComponents="1" format="ascii">
+ 0.05 0.0323458 0.05 0.0477935 0.0259454 0.0419438 0 0 0 0 0 0
+ 0 0 0 0 0 0 0 0 0 0 0 0
+ 0 0 0 0.0214426 0.0553292 0.08244 0.0807518 0.119742 0.142242 0.242648 0.471931 0.585647
+ 0.611075 0.631672 0.614715 0.633735 0.8 0.8 0.05 0.0534039 0.0494369 0 0 0
+ 0 0 0 0 0 0 0 0.0314173 0.0956834 0.147474 0.351085 0.620309
+ 0.63178 0.633758 0.8 0.05 0.0541903 0.0522629 0 0 0 0 0 0
+ 0 0 0 0 0.0347488 0.104263 0.171568 0.437012 0.628455 0.631797 0.633759 0.8
+ 0.05 0.0536678 0.0528241 0 0 0 0 0 0 0 0 0
+ 0 0.035752 0.110621 0.194785 0.497422 0.630516 0.631801 0.633759 0.8 0.05 0.0530864 0.0527012
+ 0 0 0 0 0 0 0 0 0 0 0.0362374 0.116324
+ 0.220215 0.543134 0.631196 0.631802 0.63376 0.8 0.05 0.0526184 0.0524762 0 0 0
+ 0 0 0 0 0 0 0 0.0371368 0.122505 0.251492 0.578308 0.631456
+ 0.631802 0.633761 0.8 0.05 0.0522275 0.0522556 0 0 0 0 0 0
+ 0 0 0 0 0.038806 0.130106 0.294457 0.604205 0.631575 0.631813 0.633772 0.8
+ 0.05 0.0518837 0.0520256 0 0 0 0 0 0 0 0 0
+ 0 0.0419763 0.140578 0.357845 0.620694 0.631775 0.631966 0.633916 0.8 0.05 0.0517713 0.051973
+ 0 0 0 0 0 0 0 0 0 0 0.0505585 0.157906
+ 0.445387 0.630008 0.633463 0.633627 0.635487 0.8 0.05 0.0695192 0.0829568 0 0 0
+ 0 0 0 0 0 0 0 0.123683 0.292859 0.599014 0.647617 0.647929
+ 0.64804 0.649341 0.8
</DataArray>
<DataArray type="Float32" Name="pw" NumberOfComponents="1" format="ascii">
1.29995e+07 1.29981e+07 1.29995e+07 1.29897e+07 1.29816e+07 1.29728e+07 1.29628e+07 1.29521e+07 1.28388e+07 1.283e+07 1.26043e+07 1.2596e+07
@@ -91,6 +69,28 @@
1.22843e+07 1.19856e+07 1.16923e+07 1.14015e+07 1.12354e+07 1.11936e+07 1.11523e+07 1.11141e+07 1.10639e+07 1.1028e+07 1.10167e+07 1.10103e+07
1.10053e+07 1.10011e+07 1.09925e+07
</DataArray>
+ <DataArray type="Float32" Name="pn" NumberOfComponents="1" format="ascii">
+ 1.3e+07 1.29986e+07 1.3e+07 1.29902e+07 1.29821e+07 1.29733e+07 1.29633e+07 1.29526e+07 1.28393e+07 1.28305e+07 1.26048e+07 1.25965e+07
+ 1.23436e+07 1.2334e+07 1.20697e+07 1.20594e+07 1.17897e+07 1.1779e+07 1.15066e+07 1.14958e+07 1.13436e+07 1.13327e+07 1.13015e+07 1.12905e+07
+ 1.12588e+07 1.12479e+07 1.12149e+07 1.12045e+07 1.11714e+07 1.11607e+07 1.11137e+07 1.1103e+07 1.10555e+07 1.10408e+07 1.10135e+07 1.10139e+07
+ 1.10106e+07 1.10099e+07 1.10061e+07 1.10053e+07 1.1e+07 1.1e+07 1.3e+07 1.29844e+07 1.29648e+07 1.2942e+07 1.28265e+07 1.25946e+07
+ 1.2327e+07 1.20504e+07 1.1769e+07 1.14851e+07 1.13218e+07 1.12797e+07 1.12372e+07 1.11944e+07 1.11503e+07 1.10921e+07 1.10295e+07 1.10145e+07
+ 1.10096e+07 1.10049e+07 1.1e+07 1.3e+07 1.29797e+07 1.2957e+07 1.29318e+07 1.28255e+07 1.25964e+07 1.2322e+07 1.20424e+07 1.17595e+07
+ 1.14747e+07 1.13111e+07 1.1269e+07 1.12267e+07 1.11841e+07 1.11401e+07 1.10814e+07 1.10244e+07 1.10143e+07 1.10094e+07 1.10046e+07 1.1e+07
+ 1.3e+07 1.29755e+07 1.29496e+07 1.2922e+07 1.28254e+07 1.25997e+07 1.23184e+07 1.20352e+07 1.17503e+07 1.14645e+07 1.13004e+07 1.12584e+07
+ 1.12162e+07 1.11739e+07 1.11301e+07 1.10712e+07 1.10217e+07 1.1014e+07 1.10092e+07 1.10044e+07 1.1e+07 1.3e+07 1.29715e+07 1.29423e+07
+ 1.29125e+07 1.28252e+07 1.26031e+07 1.23153e+07 1.20283e+07 1.17414e+07 1.14543e+07 1.12898e+07 1.12478e+07 1.12057e+07 1.11635e+07 1.112e+07
+ 1.10611e+07 1.102e+07 1.10137e+07 1.10089e+07 1.10043e+07 1.1e+07 1.3e+07 1.29675e+07 1.29351e+07 1.2903e+07 1.28245e+07 1.26059e+07
+ 1.2312e+07 1.20214e+07 1.17324e+07 1.14442e+07 1.12791e+07 1.12372e+07 1.11952e+07 1.11533e+07 1.11101e+07 1.10511e+07 1.10191e+07 1.10134e+07
+ 1.10086e+07 1.10041e+07 1.1e+07 1.3e+07 1.29633e+07 1.29277e+07 1.2893e+07 1.28229e+07 1.26076e+07 1.23079e+07 1.2014e+07 1.17232e+07
+ 1.14339e+07 1.12684e+07 1.12265e+07 1.11848e+07 1.1143e+07 1.11001e+07 1.10416e+07 1.10186e+07 1.10131e+07 1.10083e+07 1.10038e+07 1.1e+07
+ 1.3e+07 1.29586e+07 1.292e+07 1.28826e+07 1.28197e+07 1.26074e+07 1.23021e+07 1.20058e+07 1.17136e+07 1.14235e+07 1.12577e+07 1.12158e+07
+ 1.11743e+07 1.11329e+07 1.109e+07 1.10339e+07 1.10184e+07 1.10128e+07 1.10078e+07 1.10035e+07 1.1e+07 1.3e+07 1.29529e+07 1.2912e+07
+ 1.28722e+07 1.28131e+07 1.2603e+07 1.22942e+07 1.19966e+07 1.17035e+07 1.14129e+07 1.12469e+07 1.1205e+07 1.11638e+07 1.1123e+07 1.10787e+07
+ 1.10296e+07 1.10182e+07 1.10122e+07 1.10072e+07 1.1003e+07 1.1e+07 1.3e+07 1.29451e+07 1.29034e+07 1.28649e+07 1.27993e+07 1.25886e+07
+ 1.22848e+07 1.19861e+07 1.16928e+07 1.1402e+07 1.12359e+07 1.11941e+07 1.11528e+07 1.11147e+07 1.10646e+07 1.1029e+07 1.10178e+07 1.10114e+07
+ 1.10064e+07 1.10022e+07 1.1e+07
+ </DataArray>
<DataArray type="Float32" Name="pc" NumberOfComponents="1" format="ascii">
516.075 510.106 516.075 515.317 507.993 513.325 499.687 499.687 499.687 499.687 499.687 499.687
499.687 499.687 499.687 499.687 499.687 499.687 499.687 499.687 499.687 499.687 499.687 499.687
@@ -223,29 +223,7 @@
0.0575249 0.0575162 0.0575065 0.0575003 0.105464 0.105458 0.105444 0.105324 0.105298 0.105297 0.105296 0.105295
0.105293 0.105288 0.11
</DataArray>
- <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15
- </DataArray>
- <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii">
3 3 3 3 3 3 1 1 1 1 1 1
1 1 1 1 1 1 1 1 1 1 1 1
1 1 1 3 3 3 3 3 3 3 3 3
diff --git a/test/references/saltflushcc2pncmin-reference.vtu b/test/references/saltflushcc2pncmin-reference.vtu
index b104ead918..b24ef7ef7c 100644
--- a/test/references/saltflushcc2pncmin-reference.vtu
+++ b/test/references/saltflushcc2pncmin-reference.vtu
@@ -193,26 +193,7 @@
0.11 0.11 0.109469 0.0584545 0.0574946 0.0574945 0.0574915 0.0574901 0.0574889 0.0574858 0.105422 0.10542
0.105358 0.105298 0.105298 0.105297 0.105296 0.105294 0.105291 0.105285
</DataArray>
- <DataArray type="Float32" Name="temperature" NumberOfComponents="1" format="ascii">
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- 418.15 418.15 418.15 418.15 418.15 418.15 418.15 418.15
- </DataArray>
- <DataArray type="Float32" Name="phase presence" NumberOfComponents="1" format="ascii">
+ <DataArray type="Float32" Name="phasePresence" NumberOfComponents="1" format="ascii">
3 3 1 1 1 1 1 1 1 1 1 1
1 3 3 3 3 3 3 3 3 3 1 1
1 1 1 1 1 1 1 1 1 3 3 3
--
GitLab