From 2df9c1c5fe79251d907082cf4f48479c0e3264d0 Mon Sep 17 00:00:00 2001
From: bathmann <jasper.bathmann@ufz.de>
Date: Thu, 27 Sep 2018 14:15:16 +0200
Subject: [PATCH] [T] HC-Goswami Benchmark updated: new meshes, setup slightly
changed, benchmark-doc-pandoc updated
---
ProcessLib/ComponentTransport/Tests.cmake | 54 +++----
.../ComponentTransport_pcs_0_expected.pvd | 13 --
...ort_pcs_0_ts_100_t_150.000000_expected.vtu | 3 -
...ort_pcs_0_ts_150_t_350.000000_expected.vtu | 3 -
...ort_pcs_0_ts_200_t_750.000000_expected.vtu | 3 -
...rt_pcs_0_ts_250_t_1150.000000_expected.vtu | 3 -
...rt_pcs_0_ts_300_t_1950.000000_expected.vtu | 3 -
...rt_pcs_0_ts_350_t_2750.000000_expected.vtu | 3 -
...rt_pcs_0_ts_366_t_3000.000000_expected.vtu | 3 -
...sport_pcs_0_ts_50_t_50.000000_expected.vtu | 3 -
.../Goswami_Component_Transport_expected.pvd | 15 ++
...ansport_pcs_0_ts_0_t_0.000000_expected.vtu | 3 +
...sport_pcs_0_ts_105_t_6.000000_expected.vtu | 3 +
...sport_pcs_0_ts_106_t_7.000000_expected.vtu | 3 +
...port_pcs_0_ts_135_t_36.000000_expected.vtu | 3 +
...port_pcs_0_ts_165_t_66.000000_expected.vtu | 3 +
...port_pcs_0_ts_195_t_96.000000_expected.vtu | 3 +
...ort_pcs_0_ts_225_t_126.000000_expected.vtu | 3 +
...ort_pcs_0_ts_255_t_156.000000_expected.vtu | 3 +
...ort_pcs_0_ts_285_t_186.000000_expected.vtu | 3 +
...ort_pcs_0_ts_315_t_216.000000_expected.vtu | 3 +
...ort_pcs_0_ts_345_t_246.000000_expected.vtu | 3 +
...ort_pcs_0_ts_375_t_276.000000_expected.vtu | 3 +
...ort_pcs_0_ts_405_t_306.000000_expected.vtu | 3 +
...ort_pcs_0_ts_435_t_336.000000_expected.vtu | 3 +
...ort_pcs_0_ts_465_t_366.000000_expected.vtu | 3 +
...ort_pcs_0_ts_495_t_396.000000_expected.vtu | 3 +
...ort_pcs_0_ts_525_t_426.000000_expected.vtu | 3 +
...ort_pcs_0_ts_555_t_456.000000_expected.vtu | 3 +
...ort_pcs_0_ts_579_t_480.000000_expected.vtu | 3 +
.../goswami/goswami_input.gml | 3 -
.../goswami/goswami_input.prj | 144 ++++++------------
.../goswami/goswami_input.vtu | 3 +
.../goswami/goswami_input_leftBoundary.vtu | 3 +
.../goswami/goswami_input_rightBoundary.vtu | 3 +
.../goswami_input_xy_tri_kappa_ini_MatID.vtu | 3 -
.../hydro-component/Goswami_Exp_Num_Comp.png | 3 +
.../Goswami_Transient_States.png | 3 +
.../hydro-component/gif/goswami.gif | 3 +
.../benchmarks/hydro-component/goswami.pandoc | 17 ++-
.../benchmarks/hydro-component/goswami.png | 3 -
41 files changed, 173 insertions(+), 178 deletions(-)
delete mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_expected.pvd
delete mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_100_t_150.000000_expected.vtu
delete mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_150_t_350.000000_expected.vtu
delete mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_200_t_750.000000_expected.vtu
delete mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_250_t_1150.000000_expected.vtu
delete mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_300_t_1950.000000_expected.vtu
delete mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_350_t_2750.000000_expected.vtu
delete mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_366_t_3000.000000_expected.vtu
delete mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_50_t_50.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_expected.pvd
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_0_t_0.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_105_t_6.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_106_t_7.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_135_t_36.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_165_t_66.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_195_t_96.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_225_t_126.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_255_t_156.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_285_t_186.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_315_t_216.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_345_t_246.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_375_t_276.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_405_t_306.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_435_t_336.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_465_t_366.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_495_t_396.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_525_t_426.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_555_t_456.000000_expected.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_579_t_480.000000_expected.vtu
delete mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.gml
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_leftBoundary.vtu
create mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_rightBoundary.vtu
delete mode 100644 Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_xy_tri_kappa_ini_MatID.vtu
create mode 100644 web/content/docs/benchmarks/hydro-component/Goswami_Exp_Num_Comp.png
create mode 100644 web/content/docs/benchmarks/hydro-component/Goswami_Transient_States.png
create mode 100644 web/content/docs/benchmarks/hydro-component/gif/goswami.gif
delete mode 100644 web/content/docs/benchmarks/hydro-component/goswami.png
diff --git a/ProcessLib/ComponentTransport/Tests.cmake b/ProcessLib/ComponentTransport/Tests.cmake
index 45229b6f3dc..b9a503c6d39 100644
--- a/ProcessLib/ComponentTransport/Tests.cmake
+++ b/ProcessLib/ComponentTransport/Tests.cmake
@@ -200,33 +200,35 @@ AddTest(
EXECUTABLE_ARGS goswami_input.prj
WRAPPER time
TESTER vtkdiff
- REQUIREMENTS NOT OGS_USE_MPI AND DISABLE_GOSWAMI_UNTIL_CONSTRAINED_NEUMANN_BC
+ REQUIREMENTS NOT OGS_USE_MPI
DIFF_DATA
- ComponentTransport_pcs_0_ts_100_t_150.000000_expected.vtu ComponentTransport_pcs_0_ts_100_t_150.000000.vtu concentration concentration 1e-1 1e-5
- ComponentTransport_pcs_0_ts_150_t_350.000000_expected.vtu ComponentTransport_pcs_0_ts_150_t_350.000000.vtu concentration concentration 1e-1 1e-5
- ComponentTransport_pcs_0_ts_200_t_750.000000_expected.vtu ComponentTransport_pcs_0_ts_200_t_750.000000.vtu concentration concentration 1e-1 1e-5
- ComponentTransport_pcs_0_ts_250_t_1150.000000_expected.vtu ComponentTransport_pcs_0_ts_250_t_1150.000000.vtu concentration concentration 1e-1 1e-5
- ComponentTransport_pcs_0_ts_300_t_1950.000000_expected.vtu ComponentTransport_pcs_0_ts_300_t_1950.000000.vtu concentration concentration 1e-1 1e-5
- ComponentTransport_pcs_0_ts_350_t_2750.000000_expected.vtu ComponentTransport_pcs_0_ts_350_t_2750.000000.vtu concentration concentration 1e-1 1e-5
- ComponentTransport_pcs_0_ts_366_t_3000.000000_expected.vtu ComponentTransport_pcs_0_ts_366_t_3000.000000.vtu concentration concentration 1e-1 1e-5
- ComponentTransport_pcs_0_ts_50_t_50.000000_expected.vtu ComponentTransport_pcs_0_ts_50_t_50.000000.vtu concentration concentration 1e-1 1e-5
- ComponentTransport_pcs_0_ts_100_t_150.000000_expected.vtu ComponentTransport_pcs_0_ts_100_t_150.000000.vtu pressure pressure 1e-1 1e-5
- ComponentTransport_pcs_0_ts_150_t_350.000000_expected.vtu ComponentTransport_pcs_0_ts_150_t_350.000000.vtu pressure pressure 1e-1 1e-5
- ComponentTransport_pcs_0_ts_200_t_750.000000_expected.vtu ComponentTransport_pcs_0_ts_200_t_750.000000.vtu pressure pressure 1e-1 1e-5
- ComponentTransport_pcs_0_ts_250_t_1150.000000_expected.vtu ComponentTransport_pcs_0_ts_250_t_1150.000000.vtu pressure pressure 1e-1 1e-5
- ComponentTransport_pcs_0_ts_300_t_1950.000000_expected.vtu ComponentTransport_pcs_0_ts_300_t_1950.000000.vtu pressure pressure 1e-1 1e-5
- ComponentTransport_pcs_0_ts_350_t_2750.000000_expected.vtu ComponentTransport_pcs_0_ts_350_t_2750.000000.vtu pressure pressure 1e-1 1e-5
- ComponentTransport_pcs_0_ts_366_t_3000.000000_expected.vtu ComponentTransport_pcs_0_ts_366_t_3000.000000.vtu pressure pressure 1e-1 1e-5
- ComponentTransport_pcs_0_ts_50_t_50.000000_expected.vtu ComponentTransport_pcs_0_ts_50_t_50.000000.vtu pressure pressure 1e-1 1e-5
- ComponentTransport_pcs_0_ts_100_t_150.000000_expected.vtu ComponentTransport_pcs_0_ts_100_t_150.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
- ComponentTransport_pcs_0_ts_150_t_350.000000_expected.vtu ComponentTransport_pcs_0_ts_150_t_350.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
- ComponentTransport_pcs_0_ts_200_t_750.000000_expected.vtu ComponentTransport_pcs_0_ts_200_t_750.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
- ComponentTransport_pcs_0_ts_250_t_1150.000000_expected.vtu ComponentTransport_pcs_0_ts_250_t_1150.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
- ComponentTransport_pcs_0_ts_300_t_1950.000000_expected.vtu ComponentTransport_pcs_0_ts_300_t_1950.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
- ComponentTransport_pcs_0_ts_350_t_2750.000000_expected.vtu ComponentTransport_pcs_0_ts_350_t_2750.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
- ComponentTransport_pcs_0_ts_366_t_3000.000000_expected.vtu ComponentTransport_pcs_0_ts_366_t_3000.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
- ComponentTransport_pcs_0_ts_50_t_50.000000_expected.vtu ComponentTransport_pcs_0_ts_50_t_50.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
- VIS ComponentTransport_pcs_0_ts_366_t_3000.000000.vtu
+ Goswami_Component_Transport_pcs_0_ts_105_t_6.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_105_t_6.000000.vtu concentration concentration 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_165_t_66.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_165_t_66.000000.vtu concentration concentration 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_225_t_126.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_225_t_126.000000.vtu concentration concentration 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_285_t_186.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_285_t_186.000000.vtu concentration concentration 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_345_t_246.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_345_t_246.000000.vtu concentration concentration 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_405_t_306.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_405_t_306.000000.vtu concentration concentration 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_465_t_366.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_465_t_366.000000.vtu concentration concentration 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_525_t_426.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_525_t_426.000000.vtu concentration concentration 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_579_t_480.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_579_t_480.000000.vtu concentration concentration 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_105_t_6.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_105_t_6.000000.vtu pressure pressure 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_165_t_66.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_165_t_66.000000.vtu pressure pressure 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_225_t_126.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_225_t_126.000000.vtu pressure pressure 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_285_t_186.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_285_t_186.000000.vtu pressure pressure 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_345_t_246.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_345_t_246.000000.vtu pressure pressure 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_405_t_306.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_405_t_306.000000.vtu pressure pressure 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_465_t_366.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_465_t_366.000000.vtu pressure pressure 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_525_t_426.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_525_t_426.000000.vtu pressure pressure 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_579_t_480.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_579_t_480.000000.vtu pressure pressure 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_105_t_6.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_105_t_6.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_165_t_66.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_165_t_66.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_225_t_126.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_225_t_126.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_285_t_186.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_285_t_186.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_345_t_246.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_345_t_246.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_405_t_306.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_405_t_306.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_465_t_366.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_465_t_366.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_525_t_426.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_525_t_426.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
+ Goswami_Component_Transport_pcs_0_ts_579_t_480.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_579_t_480.000000.vtu darcy_velocity darcy_velocity 1e-1 1e-5
)
AddTest(
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_expected.pvd b/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_expected.pvd
deleted file mode 100644
index 3b6bacb0a40..00000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_expected.pvd
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<VTKFile type="Collection" version="0.1" byte_order="LittleEndian" compressor="vtkZLibDataCompressor">
- <Collection>
- <DataSet timestep="50" group="" part="0" file="ComponentTransport_pcs_0_ts_50_t_50.000000_expected.vtu"/>
- <DataSet timestep="150" group="" part="0" file="ComponentTransport_pcs_0_ts_100_t_150.000000_expected.vtu"/>
- <DataSet timestep="350" group="" part="0" file="ComponentTransport_pcs_0_ts_150_t_350.000000_expected.vtu"/>
- <DataSet timestep="750" group="" part="0" file="ComponentTransport_pcs_0_ts_200_t_750.000000_expected.vtu"/>
- <DataSet timestep="1150" group="" part="0" file="ComponentTransport_pcs_0_ts_250_t_1150.000000_expected.vtu"/>
- <DataSet timestep="1950" group="" part="0" file="ComponentTransport_pcs_0_ts_300_t_1950.000000_expected.vtu"/>
- <DataSet timestep="2750" group="" part="0" file="ComponentTransport_pcs_0_ts_350_t_2750.000000_expected.vtu"/>
- <DataSet timestep="3000" group="" part="0" file="ComponentTransport_pcs_0_ts_366_t_3000.000000_expected.vtu"/>
- </Collection>
-</VTKFile>
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_100_t_150.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_100_t_150.000000_expected.vtu
deleted file mode 100644
index 65784a20138..00000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_100_t_150.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:42a7491d35c298e52831b9be246ff85ae9dafff0b29d1468c3918285b9cdaa93
-size 1419231
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_150_t_350.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_150_t_350.000000_expected.vtu
deleted file mode 100644
index 11c3765b4a7..00000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_150_t_350.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9feffb3550be5df998f39b6d392847318a82e9f055bca7ea93760ec43486ccc6
-size 1417841
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_200_t_750.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_200_t_750.000000_expected.vtu
deleted file mode 100644
index f9df14ac16a..00000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_200_t_750.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:264fb7814615fb3c7780bf5d2a1527a0843652fc565015eb9dc358ff26f05b84
-size 1416946
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_250_t_1150.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_250_t_1150.000000_expected.vtu
deleted file mode 100644
index 1ed7062c730..00000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_250_t_1150.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:957d5f51540a5c240f5732666a5f394079871bc533621cda42d02c026f654765
-size 1417856
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_300_t_1950.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_300_t_1950.000000_expected.vtu
deleted file mode 100644
index 7dda7e8201b..00000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_300_t_1950.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b4b2f88e1421b47d3f7c2975e71a48e6b3315eb9189984f4b500accabdb99741
-size 1416230
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_350_t_2750.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_350_t_2750.000000_expected.vtu
deleted file mode 100644
index b1c79d16b73..00000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_350_t_2750.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aeba717bc56fbae349cc0a2a389d2aef59756907ef8b9697316f0b6eb16a18c5
-size 1415404
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_366_t_3000.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_366_t_3000.000000_expected.vtu
deleted file mode 100644
index 5b13bdeb38a..00000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_366_t_3000.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cc2d3d3024618d3081c79799790bffbe336a8e2510c700ed369adcf95a653cad
-size 2952593
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_50_t_50.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_50_t_50.000000_expected.vtu
deleted file mode 100644
index 5d336ba70ed..00000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/ComponentTransport_pcs_0_ts_50_t_50.000000_expected.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d880a18b7ec0dda1bd8e9b0bea2ad165b6e8ebedb655712285bd3b53e8b369cd
-size 1420462
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_expected.pvd b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_expected.pvd
new file mode 100644
index 00000000000..b52d7f89174
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_expected.pvd
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<VTKFile type="Collection" version="0.1" byte_order="LittleEndian" compressor="vtkZLibDataCompressor">
+ <Collection>
+ <DataSet timestep="0" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_0_t_0.000000_expected.vtu"/>
+ <DataSet timestep="6" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_105_t_6.000000_expected.vtu"/>
+ <DataSet timestep="66" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_165_t_66.000000_expected.vtu"/>
+ <DataSet timestep="126" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_225_t_126.000000_expected.vtu"/>
+ <DataSet timestep="186" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_285_t_186.000000_expected.vtu"/>
+ <DataSet timestep="246" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_345_t_246.000000_expected.vtu"/>
+ <DataSet timestep="306" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_405_t_306.000000_expected.vtu"/>
+ <DataSet timestep="366" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_465_t_366.000000_expected.vtu"/>
+ <DataSet timestep="426" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_525_t_426.000000_expected.vtu"/>
+ <DataSet timestep="480" group="" part="0" file="Goswami_Component_Transport_pcs_0_ts_579_t_480.000000_expected.vtu"/>
+ </Collection>
+</VTKFile>
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_0_t_0.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_0_t_0.000000_expected.vtu
new file mode 100644
index 00000000000..3172895cceb
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_0_t_0.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7d66a7ccc66c69787b95e872bb0b72987c20b7241cf939c84c8c5376058d788e
+size 214526
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_105_t_6.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_105_t_6.000000_expected.vtu
new file mode 100644
index 00000000000..c7cc17eb065
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_105_t_6.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6a9748b2c6d1abe34df58d4efcc38fcd79a9e4d128b265d6a8ea041a16f34899
+size 288696
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_106_t_7.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_106_t_7.000000_expected.vtu
new file mode 100644
index 00000000000..d480e7bce5d
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_106_t_7.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7b27504457046dbcffcc5ca4a6b9f14fd9a629f973bdb987a7c44277b99fc636
+size 288692
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_135_t_36.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_135_t_36.000000_expected.vtu
new file mode 100644
index 00000000000..a72e2d54b6c
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_135_t_36.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5ee9c5b5df397d9646dc2717dff0e213ac38f2fd616916cfa7df0564a68a1431
+size 288716
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_165_t_66.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_165_t_66.000000_expected.vtu
new file mode 100644
index 00000000000..794f4506075
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_165_t_66.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fca631612913078b0677e13b1fea0c3809178481f6e108ac37c0dc4cbcd7e06f
+size 288639
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_195_t_96.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_195_t_96.000000_expected.vtu
new file mode 100644
index 00000000000..af8ec87d826
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_195_t_96.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:af829dafe01ae1d512f85f9048a9801a4d9cd3d8f84543be37512ebf4fcfda01
+size 288548
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_225_t_126.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_225_t_126.000000_expected.vtu
new file mode 100644
index 00000000000..e8fae79c785
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_225_t_126.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e8803c6685fabd3285b996c22a2b8f0c99333d2d4e5ee57bfe3de5336fd5867
+size 288522
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_255_t_156.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_255_t_156.000000_expected.vtu
new file mode 100644
index 00000000000..58a15ba1c97
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_255_t_156.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91b2ea7ead2eddeb675d190a0e176dc4db9006208a86d9f3feaa29ddb0079238
+size 288443
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_285_t_186.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_285_t_186.000000_expected.vtu
new file mode 100644
index 00000000000..876d3ee9f35
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_285_t_186.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff80798bcea7e35afff0fd5bdbea0eed966987721335887c740ed687a855c1f7
+size 288327
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_315_t_216.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_315_t_216.000000_expected.vtu
new file mode 100644
index 00000000000..525c86e9bae
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_315_t_216.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fec200908d1e2f7cc7f7213ee86dec9d010181acd1cc4be30661d0f359c090d2
+size 288300
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_345_t_246.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_345_t_246.000000_expected.vtu
new file mode 100644
index 00000000000..45f38e11b07
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_345_t_246.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e4110d70293a425c22240f7bdd2ee6be09214c5f503eefd1c7ba88a9571aa981
+size 288224
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_375_t_276.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_375_t_276.000000_expected.vtu
new file mode 100644
index 00000000000..dc6caaf8dd8
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_375_t_276.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6508db7756c7dc4d5a590d07129d0f6c30bcf97d58da906c1c6fa4448f56d31
+size 288148
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_405_t_306.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_405_t_306.000000_expected.vtu
new file mode 100644
index 00000000000..8d118f11963
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_405_t_306.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:001ccfde65df87c7622ead4160e707ebe19ffcd7cbe52b5dbb4b485c0ce74679
+size 288026
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_435_t_336.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_435_t_336.000000_expected.vtu
new file mode 100644
index 00000000000..f9e85e6e899
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_435_t_336.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d61cee58150321da305fd67078bc2e36ba92c00f060128627f86cc086bfb2834
+size 287996
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_465_t_366.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_465_t_366.000000_expected.vtu
new file mode 100644
index 00000000000..02816f9b04e
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_465_t_366.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0ad9abaf5911b17ffb7cafa97bf32b4b6b47ece7daf0df702cf5565ffede7818
+size 287888
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_495_t_396.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_495_t_396.000000_expected.vtu
new file mode 100644
index 00000000000..dd3ba6fb7f1
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_495_t_396.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d6f582df76e83158f7564a4fa464319dc152a540ca7e980106aa1c4bb52caf6c
+size 287715
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_525_t_426.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_525_t_426.000000_expected.vtu
new file mode 100644
index 00000000000..c6daf697034
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_525_t_426.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4f3bb9a66c1ba97f1a5d6a8c60b3f29e2496e86cbfbe90c692868a320b2c2a5c
+size 287663
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_555_t_456.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_555_t_456.000000_expected.vtu
new file mode 100644
index 00000000000..f39ccb7221f
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_555_t_456.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dcffb728013d9251bad8915c48d6c279f9633c0ad60b59f7f5fe6a4e6f4ffbb5
+size 287568
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_579_t_480.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_579_t_480.000000_expected.vtu
new file mode 100644
index 00000000000..9296f9e98b2
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/Goswami_Component_Transport_pcs_0_ts_579_t_480.000000_expected.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f610e623d50bcc7fdeb74919119d4c80a364bb175e34f2a00876c7e2c57ba8db
+size 287488
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.gml b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.gml
deleted file mode 100644
index eac6d6066cc..00000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.gml
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2c3a6d8e5066e926450e5743e217e9699f79c8ce913127ed1cecc42ecd0b7cfb
-size 1154
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
index 2c59912501d..a0a60b03fca 100644
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<OpenGeoSysProject>
- <mesh>goswami_input_xy_tri_kappa_ini_MatID.vtu</mesh>
- <geometry>goswami_input.gml</geometry>
- <search_length_algorithm>
- <type>fixed</type>
- <value>1e-3</value>
- </search_length_algorithm>
+ <meshes>
+ <mesh>goswami_input.vtu</mesh>
+ <mesh>goswami_input_leftBoundary.vtu</mesh>
+ <mesh>goswami_input_rightBoundary.vtu</mesh>
+ </meshes>
<processes>
<process>
<name>ComponentTransport</name>
@@ -20,7 +19,7 @@
<type>ConcentrationDependent</type>
<reference_density>1000</reference_density>
<reference_concentration>0</reference_concentration>
- <fluid_density_difference_ratio>0.026</fluid_density_difference_ratio>
+ <fluid_density_difference_ratio>0.701</fluid_density_difference_ratio>
</density>
<viscosity>
<type>Constant</type>
@@ -42,20 +41,6 @@
<value>0</value>
</storage>
</porous_medium>
- <porous_medium id="1">
- <permeability>
- <permeability_tensor_entries>kappa2</permeability_tensor_entries>
- <type>Constant</type>
- </permeability>
- <porosity>
- <type>Constant</type>
- <porosity_parameter>constant_porosity_parameter</porosity_parameter>
- </porosity>
- <storage>
- <type>Constant</type>
- <value>0</value>
- </storage>
- </porous_medium>
</porous_medium>
<fluid_reference_density>rho_fluid</fluid_reference_density>
<solute_dispersivity_longitudinal>alpha_l</solute_dispersivity_longitudinal>
@@ -76,7 +61,7 @@
<convergence_criterion>
<type>PerComponentDeltaX</type>
<norm_type>NORM2</norm_type>
- <reltols>5e-3 5e-3</reltols>
+ <reltols>5e-6 5e-6</reltols>
</convergence_criterion>
<time_discretization>
<type>BackwardEuler</type>
@@ -90,36 +75,20 @@
</output>
<time_stepping>
<type>FixedTimeStepping</type>
- <t_initial> 0.0 </t_initial>
- <t_end> 3000 </t_end>
+ <t_initial>0.0</t_initial>
+ <t_end>480</t_end>
<timesteps>
<pair>
<repeat>50</repeat>
- <delta_t>1</delta_t>
- </pair>
- <pair>
- <repeat>50</repeat>
- <delta_t>2</delta_t>
+ <delta_t>0.01</delta_t>
</pair>
<pair>
- <repeat>50</repeat>
- <delta_t>4</delta_t>
+ <repeat>55</repeat>
+ <delta_t>0.1</delta_t>
</pair>
<pair>
- <repeat>100</repeat>
- <delta_t>8</delta_t>
- </pair>
- <pair>
- <repeat>200</repeat>
- <delta_t>16</delta_t>
- </pair>
- <pair>
- <repeat>100</repeat>
- <delta_t>20</delta_t>
- </pair>
- <pair>
- <repeat>50</repeat>
- <delta_t>25</delta_t>
+ <repeat>4290</repeat>
+ <delta_t>1.0</delta_t>
</pair>
</timesteps>
</time_stepping>
@@ -127,11 +96,15 @@
</processes>
<output>
<type>VTK</type>
- <prefix>ComponentTransport</prefix>
+ <prefix>Goswami_Component_Transport</prefix>
<timesteps>
<pair>
<repeat>1</repeat>
- <each_steps>50</each_steps>
+ <each_steps>105</each_steps>
+ </pair>
+ <pair>
+ <repeat>7</repeat>
+ <each_steps>60</each_steps>
</pair>
</timesteps>
</output>
@@ -145,7 +118,7 @@
<parameter>
<name>Dm</name>
<type>Constant</type>
- <value>1e-9</value>
+ <value>0</value>
</parameter>
<parameter>
<name>retardation</name>
@@ -168,36 +141,14 @@
<value>5e-4</value>
</parameter>
<parameter>
- <name>c0</name>
+ <name>c_ini</name>
<type>MeshNode</type>
- <field_name>t_conc_ini</field_name>
+ <field_name>c_ini</field_name>
</parameter>
<parameter>
- <name>p0</name>
+ <name>p_ini</name>
<type>MeshNode</type>
- <field_name>pressure</field_name>
- </parameter>
- <parameter>
- <name>p_Dirichlet_topleft</name>
- <type>Constant</type>
- <value>-50.27625</value>
- <!-- this equals h_s=0.255m-->
- </parameter>
- <parameter>
- <name>p_Dirichlet_topright</name>
- <type>Constant</type>
- <value>68.67</value>
- <!-- this equals h_f=0.267m-->
- </parameter>
- <parameter>
- <name>c_Dirichlet_left</name>
- <type>Constant</type>
- <value>1</value>
- </parameter>
- <parameter>
- <name>c_Dirichlet_right</name>
- <type>Constant</type>
- <value>0</value>
+ <field_name>p_ini</field_name>
</parameter>
<parameter>
<name>constant_porosity_parameter</name>
@@ -207,12 +158,7 @@
<parameter>
<name>kappa1</name>
<type>Constant</type>
- <values>1.239e-9 0 0 1.239e-9</values>
- </parameter>
- <parameter>
- <name>kappa2</name>
- <type>Constant</type>
- <values>1e-3 0 0 1e-3</values>
+ <values>1.2388e-9 0 0 1.2388e-9</values>
</parameter>
</parameters>
<process_variables>
@@ -220,19 +166,17 @@
<name>concentration</name>
<components>1</components>
<order>1</order>
- <initial_condition>c0</initial_condition>
+ <initial_condition>c_ini</initial_condition>
<boundary_conditions>
<boundary_condition>
- <geometrical_set>goswami_mesh</geometrical_set>
- <geometry>left</geometry>
- <type>Dirichlet</type>
- <parameter>c_Dirichlet_left</parameter>
+ <type>NonuniformDirichlet</type>
+ <mesh>goswami_input_leftBoundary</mesh>
+ <field_name>c_ini</field_name>
</boundary_condition>
<boundary_condition>
- <geometrical_set>goswami_mesh</geometrical_set>
- <geometry>right</geometry>
- <type>Dirichlet</type>
- <parameter>c_Dirichlet_right</parameter>
+ <type>NonuniformDirichlet</type>
+ <mesh>goswami_input_rightBoundary</mesh>
+ <field_name>c_ini</field_name>
</boundary_condition>
</boundary_conditions>
</process_variable>
@@ -240,19 +184,17 @@
<name>pressure</name>
<components>1</components>
<order>1</order>
- <initial_condition>p0</initial_condition>
+ <initial_condition>p_ini</initial_condition>
<boundary_conditions>
<boundary_condition>
- <geometrical_set>goswami_mesh</geometrical_set>
- <geometry>topleft</geometry>
- <type>Dirichlet</type>
- <parameter>p_Dirichlet_topleft</parameter>
+ <type>NonuniformDirichlet</type>
+ <mesh>goswami_input_leftBoundary</mesh>
+ <field_name>p_ini</field_name>
</boundary_condition>
<boundary_condition>
- <geometrical_set>goswami_mesh</geometrical_set>
- <geometry>topright</geometry>
- <type>Dirichlet</type>
- <parameter>p_Dirichlet_topright</parameter>
+ <type>NonuniformDirichlet</type>
+ <mesh>goswami_input_rightBoundary</mesh>
+ <field_name>p_ini</field_name>
</boundary_condition>
</boundary_conditions>
</process_variable>
@@ -268,11 +210,11 @@
<linear_solvers>
<linear_solver>
<name>general_linear_solver</name>
- <lis>-i bicgstab -p jacobi -tol 1e-11 -maxiter 20000</lis>
+ <lis>-i bicgstab -p ilut -tol 1e-12 -maxiter 200000</lis>
<eigen>
<solver_type>BiCGSTAB</solver_type>
- <precon_type>DIAGONAL</precon_type>
- <max_iteration_step>20000</max_iteration_step>
+ <precon_type>DIAGONAL</solver_precon>
+ <max_iteration_step>10000</max_iteration_step>
<error_tolerance>1e-11</error_tolerance>
</eigen>
<petsc>
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.vtu
new file mode 100644
index 00000000000..bc9c755f0b7
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:37b3a57ed13ecc4b2b281b7fe3c92f6fd4b3d8d5b2c06844c4ee7e4c77f6a35f
+size 124753
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_leftBoundary.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_leftBoundary.vtu
new file mode 100644
index 00000000000..73151714e97
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_leftBoundary.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f08e9a558fdacad5d31c86c22ca9caf67a4f7bfa748aab915caf2697460f815
+size 4622
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_rightBoundary.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_rightBoundary.vtu
new file mode 100644
index 00000000000..ead81c90c1e
--- /dev/null
+++ b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_rightBoundary.vtu
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3072c38f251de3b5d357972d57a60c43de0817bf3c9fba795872384ac2486e17
+size 3456
diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_xy_tri_kappa_ini_MatID.vtu b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_xy_tri_kappa_ini_MatID.vtu
deleted file mode 100644
index a2f936db6ee..00000000000
--- a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input_xy_tri_kappa_ini_MatID.vtu
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0f93f9b9f3f2b5a3ab33149893584ade9eb4931b7e842443f2c2ad456a180885
-size 2779481
diff --git a/web/content/docs/benchmarks/hydro-component/Goswami_Exp_Num_Comp.png b/web/content/docs/benchmarks/hydro-component/Goswami_Exp_Num_Comp.png
new file mode 100644
index 00000000000..e476cf42b75
--- /dev/null
+++ b/web/content/docs/benchmarks/hydro-component/Goswami_Exp_Num_Comp.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc2961a107655893414dd33314c781801fa619ed76f359bc0ec70f8f959df4a3
+size 134014
diff --git a/web/content/docs/benchmarks/hydro-component/Goswami_Transient_States.png b/web/content/docs/benchmarks/hydro-component/Goswami_Transient_States.png
new file mode 100644
index 00000000000..46ce80dfb87
--- /dev/null
+++ b/web/content/docs/benchmarks/hydro-component/Goswami_Transient_States.png
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:247b99483405126550ae3fb863f58e54613906e8702aa02ae4d9f98adf6eebf7
+size 142713
diff --git a/web/content/docs/benchmarks/hydro-component/gif/goswami.gif b/web/content/docs/benchmarks/hydro-component/gif/goswami.gif
new file mode 100644
index 00000000000..ded2522dd95
--- /dev/null
+++ b/web/content/docs/benchmarks/hydro-component/gif/goswami.gif
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b122840e73fb6c7d69d42ae2c5c4cacadd707e9756a8ec7aef0b4198865b49f5
+size 6772860
diff --git a/web/content/docs/benchmarks/hydro-component/goswami.pandoc b/web/content/docs/benchmarks/hydro-component/goswami.pandoc
index e15eedb045d..3f684825591 100644
--- a/web/content/docs/benchmarks/hydro-component/goswami.pandoc
+++ b/web/content/docs/benchmarks/hydro-component/goswami.pandoc
@@ -1,5 +1,5 @@
+++
-author = "Marc Walther"
+author = "Jasper Bathmann, Marc Walther"
weight = 142
project = "Parabolic/ComponentTransport/goswami/"
date = "2017-09-07T14:41:09+01:00"
@@ -23,15 +23,22 @@ For the setup and parameterization, see the chapter "Density dependent flow - Th
## Problem description
-The Goswami-Clement benchmark is based on experiment observations for intruding and receding saltwater in a laboratory-scale sand tank. Here, we compare numerical results of ogs6 to those of OGS5 and the original observation data.
-
-We had to extend the modeling domain to include the required boundary conditions on the left and right side.
+The Goswami-Clement benchmark is based on experiment observations for intruding and receding saltwater in a laboratory-scale sand tank. Here, we compare numerical results of ogs6 to the original observation data.
### Model results
+An example for the intruding salt front is shown below. The numerical results of OGS-6 coincide with those of OGS-5.
+
+{{< img src="../gif/goswami.gif" title="Results for numerical experiment. The steady state SS2 from the original experimental work is well reproduced.">}}
+
+{{< data-link >}}
A comparison of numerical and laboratory data is shown in the figure below. The numerical results of ogs6 coincide with those of OGS5 and likewise with the laboratory observations.
-{{< img src="../goswami.png" title="Results for numerical (OGS5 - green, ogs6 - white) and laboratory data (black squares) together with concentration distribution in the domain and mesh resolution for steady state 1 (see original research paper).">}}
+{{< img src="../Goswami_Exp_Num_Comp.png" title="Results for numerical (colored diamonds) and laboratory data (colored straight lines) on the steady state location of the concentration front (see original research paper).">}}
+
+{{< data-link >}}
+
+{{< img src="../Goswami_Transient_States.png" title="Results for numerical (colored diamonds) and laboratory data (colored straight lines) on the transient state locations of the concentration front (see original research paper).">}}
{{< data-link >}}
diff --git a/web/content/docs/benchmarks/hydro-component/goswami.png b/web/content/docs/benchmarks/hydro-component/goswami.png
deleted file mode 100644
index ad294699cee..00000000000
--- a/web/content/docs/benchmarks/hydro-component/goswami.png
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9b33f8794d3348c0cb6f3092b51cadb0d441f99f878fe4202977d1e180ee9fa4
-size 58552
--
GitLab