From 07e230c1d8cdceb1138e1a349aa9bcefe3d8406c Mon Sep 17 00:00:00 2001 From: renchao_lu <renchao.lu@gmail.com> Date: Wed, 19 Dec 2018 19:29:53 +0100 Subject: [PATCH] [T] Benchmark testing --- ProcessLib/ComponentTransport/Tests.cmake | 235 ++++++------ .../square_1e4_heterogeneity.prj | 67 ++-- .../ConcentrationDiffusionAndStorage.prj | 57 +-- .../ConcentrationDiffusionOnly.prj | 58 +-- ...ConcentrationDiffusionOnly_3Components.prj | 334 ++++++++++++++++++ .../DiffusionAndStorageAndAdvection.prj | 57 +-- ...iffusionAndStorageAndAdvectionAndDecay.prj | 57 +-- ...ionAndStorageAndAdvectionAndDispersion.prj | 57 +-- ...ndStorageAndAdvectionAndDispersionHalf.prj | 57 +-- ...nAndStorageAndGravityAndDispersionHalf.prj | 57 +-- ...rfaceflux_component-transport_cube_1e3.prj | 57 +-- .../VariableNeumannBoundary/vdbc_input.prj | 57 +-- .../ComponentTransport/elder/elder-python.prj | 57 +-- .../ComponentTransport/elder/elder.prj | 57 +-- .../goswami/goswami_input.prj | 57 +-- .../heterogeneous/ogs5_H_2D/ogs5_H_2d.prj | 57 +-- .../heterogeneous/ogs5_H_3D/ogs5_H_3d.prj | 57 +-- 17 files changed, 1006 insertions(+), 429 deletions(-) create mode 100644 Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly_3Components.prj diff --git a/ProcessLib/ComponentTransport/Tests.cmake b/ProcessLib/ComponentTransport/Tests.cmake index bc2faebfba1..686af4ff811 100644 --- a/ProcessLib/ComponentTransport/Tests.cmake +++ b/ProcessLib/ComponentTransport/Tests.cmake @@ -7,12 +7,29 @@ AddTest( TESTER vtkdiff REQUIREMENTS NOT OGS_USE_MPI DIFF_DATA - DiffusionOnly_pcs_0_ts_1_t_1.000000_expected.vtu DiffusionOnly_pcs_0_ts_1_t_1.000000.vtu linear_1_to_0 concentration 1e-7 1e-10 + DiffusionOnly_pcs_0_ts_1_t_1.000000_expected.vtu DiffusionOnly_pcs_0_ts_1_t_1.000000.vtu linear_1_to_0 Si 1e-7 1e-10 DiffusionOnly_pcs_0_ts_1_t_1.000000_expected.vtu DiffusionOnly_pcs_0_ts_1_t_1.000000.vtu zero pressure 1e-7 1e-10 DiffusionOnly_pcs_0_ts_1_t_1.000000_expected.vtu DiffusionOnly_pcs_0_ts_1_t_1.000000.vtu zero_vector_2d darcy_velocity 1e-7 1e-10 VIS DiffusionOnly_pcs_0_ts_1_t_1.000000.vtu ) +AddTest( + NAME 2D_MultiComponentTransport_ConcentrationDiffusionOnly + PATH Parabolic/ComponentTransport/SimpleSynthetics + EXECUTABLE ogs + EXECUTABLE_ARGS ConcentrationDiffusionOnly_3Components.prj + WRAPPER time + TESTER vtkdiff + REQUIREMENTS NOT OGS_USE_MPI + DIFF_DATA + DiffusionOnly_pcs_0_ts_1_t_1.000000_expected.vtu DiffusionOnly_3Components_pcs_0_ts_1_t_1.000000.vtu linear_1_to_0 Si 1e-7 1e-10 + DiffusionOnly_pcs_0_ts_1_t_1.000000_expected.vtu DiffusionOnly_3Components_pcs_0_ts_1_t_1.000000.vtu linear_1_to_0 Al 1e-7 1e-10 + DiffusionOnly_pcs_0_ts_1_t_1.000000_expected.vtu DiffusionOnly_3Components_pcs_0_ts_1_t_1.000000.vtu linear_1_to_0 Cl 1e-7 1e-10 + DiffusionOnly_pcs_0_ts_1_t_1.000000_expected.vtu DiffusionOnly_3Components_pcs_0_ts_1_t_1.000000.vtu zero pressure 1e-7 1e-10 + DiffusionOnly_pcs_0_ts_1_t_1.000000_expected.vtu DiffusionOnly_3Components_pcs_0_ts_1_t_1.000000.vtu zero_vector_2d darcy_velocity 1e-7 1e-10 + VIS DiffusionOnly_pcs_0_ts_1_t_1.000000.vtu +) + AddTest( NAME 2D_ComponentTransport_ConcentrationDiffusionAndStorage PATH Parabolic/ComponentTransport/SimpleSynthetics @@ -22,10 +39,10 @@ AddTest( TESTER vtkdiff REQUIREMENTS NOT OGS_USE_MPI DIFF_DATA - DiffusionAndStorage_pcs_0_ts_100_t_0.150000_expected.vtu DiffusionAndStorage_pcs_0_ts_100_t_0.150000.vtu concentration concentration 1e-7 1e-10 + DiffusionAndStorage_pcs_0_ts_100_t_0.150000_expected.vtu DiffusionAndStorage_pcs_0_ts_100_t_0.150000.vtu concentration Si 1e-7 1e-10 DiffusionAndStorage_pcs_0_ts_100_t_0.150000_expected.vtu DiffusionAndStorage_pcs_0_ts_100_t_0.150000.vtu pressure pressure 1e-7 1e-10 DiffusionAndStorage_pcs_0_ts_100_t_0.150000_expected.vtu DiffusionAndStorage_pcs_0_ts_100_t_0.150000.vtu darcy_velocity darcy_velocity 1e-7 1e-10 - DiffusionAndStorage_pcs_0_ts_134_t_1.500000_expected.vtu DiffusionAndStorage_pcs_0_ts_134_t_1.500000.vtu concentration concentration 1e-7 1e-10 + DiffusionAndStorage_pcs_0_ts_134_t_1.500000_expected.vtu DiffusionAndStorage_pcs_0_ts_134_t_1.500000.vtu concentration Si 1e-7 1e-10 DiffusionAndStorage_pcs_0_ts_134_t_1.500000_expected.vtu DiffusionAndStorage_pcs_0_ts_134_t_1.500000.vtu zero pressure 1e-7 1e-10 DiffusionAndStorage_pcs_0_ts_134_t_1.500000_expected.vtu DiffusionAndStorage_pcs_0_ts_134_t_1.500000.vtu zero_vector_2d darcy_velocity 1e-7 1e-10 VIS DiffusionAndStorage_pcs_0_ts_134_t_1.500000.vtu @@ -41,13 +58,13 @@ AddTest( REQUIREMENTS NOT OGS_USE_MPI RUNTIME 23 DIFF_DATA - DiffusionAndStorageAndAdvection_pcs_0_ts_100_t_5.700000_expected.vtu DiffusionAndStorageAndAdvection_pcs_0_ts_100_t_5.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvection_pcs_0_ts_200_t_35.700000_expected.vtu DiffusionAndStorageAndAdvection_pcs_0_ts_200_t_35.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvection_pcs_0_ts_300_t_155.700000_expected.vtu DiffusionAndStorageAndAdvection_pcs_0_ts_300_t_155.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvection_pcs_0_ts_400_t_315.700000_expected.vtu DiffusionAndStorageAndAdvection_pcs_0_ts_400_t_315.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvection_pcs_0_ts_500_t_495.700000_expected.vtu DiffusionAndStorageAndAdvection_pcs_0_ts_500_t_495.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvection_pcs_0_ts_600_t_720.700000_expected.vtu DiffusionAndStorageAndAdvection_pcs_0_ts_600_t_720.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvection_pcs_0_ts_672_t_900.000000_expected.vtu DiffusionAndStorageAndAdvection_pcs_0_ts_672_t_900.000000.vtu concentration concentration 1e-7 1e-10 + DiffusionAndStorageAndAdvection_pcs_0_ts_100_t_5.700000_expected.vtu DiffusionAndStorageAndAdvection_pcs_0_ts_100_t_5.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvection_pcs_0_ts_200_t_35.700000_expected.vtu DiffusionAndStorageAndAdvection_pcs_0_ts_200_t_35.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvection_pcs_0_ts_300_t_155.700000_expected.vtu DiffusionAndStorageAndAdvection_pcs_0_ts_300_t_155.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvection_pcs_0_ts_400_t_315.700000_expected.vtu DiffusionAndStorageAndAdvection_pcs_0_ts_400_t_315.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvection_pcs_0_ts_500_t_495.700000_expected.vtu DiffusionAndStorageAndAdvection_pcs_0_ts_500_t_495.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvection_pcs_0_ts_600_t_720.700000_expected.vtu DiffusionAndStorageAndAdvection_pcs_0_ts_600_t_720.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvection_pcs_0_ts_672_t_900.000000_expected.vtu DiffusionAndStorageAndAdvection_pcs_0_ts_672_t_900.000000.vtu concentration Si 1e-7 1e-10 DiffusionAndStorageAndAdvection_pcs_0_ts_100_t_5.700000_expected.vtu DiffusionAndStorageAndAdvection_pcs_0_ts_100_t_5.700000.vtu pressure pressure 1e-7 1e-10 DiffusionAndStorageAndAdvection_pcs_0_ts_200_t_35.700000_expected.vtu DiffusionAndStorageAndAdvection_pcs_0_ts_200_t_35.700000.vtu pressure pressure 1e-7 1e-10 DiffusionAndStorageAndAdvection_pcs_0_ts_300_t_155.700000_expected.vtu DiffusionAndStorageAndAdvection_pcs_0_ts_300_t_155.700000.vtu pressure pressure 1e-7 1e-10 @@ -75,12 +92,12 @@ AddTest( REQUIREMENTS NOT OGS_USE_MPI RUNTIME 46 DIFF_DATA - DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1000_t_2500.000000_expected.vtu DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1000_t_2500.000000.vtu concentration concentration 1e-5 1e-10 - DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1100_t_5000.000000_expected.vtu DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1100_t_5000.000000.vtu concentration concentration 1e-5 1e-10 - DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1200_t_7500.000000_expected.vtu DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1200_t_7500.000000.vtu concentration concentration 1e-5 1e-10 - DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1300_t_10000.000000_expected.vtu DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1300_t_10000.000000.vtu concentration concentration 1e-5 1e-10 - DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1400_t_12500.000000_expected.vtu DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1400_t_12500.000000.vtu concentration concentration 1e-5 1e-10 - DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1500_t_15000.000000_expected.vtu DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1500_t_15000.000000.vtu concentration concentration 1e-5 1e-10 + DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1000_t_2500.000000_expected.vtu DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1000_t_2500.000000.vtu concentration Si 1e-5 1e-10 + DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1100_t_5000.000000_expected.vtu DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1100_t_5000.000000.vtu concentration Si 1e-5 1e-10 + DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1200_t_7500.000000_expected.vtu DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1200_t_7500.000000.vtu concentration Si 1e-5 1e-10 + DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1300_t_10000.000000_expected.vtu DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1300_t_10000.000000.vtu concentration Si 1e-5 1e-10 + DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1400_t_12500.000000_expected.vtu DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1400_t_12500.000000.vtu concentration Si 1e-5 1e-10 + DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1500_t_15000.000000_expected.vtu DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1500_t_15000.000000.vtu concentration Si 1e-5 1e-10 DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1000_t_2500.000000_expected.vtu DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1000_t_2500.000000.vtu pressure pressure 1e-5 1e-10 DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1100_t_5000.000000_expected.vtu DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1100_t_5000.000000.vtu pressure pressure 1e-5 1e-10 DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1200_t_7500.000000_expected.vtu DiffusionAndStorageAndGravityAndDispersionHalf_pcs_0_ts_1200_t_7500.000000.vtu pressure pressure 1e-5 1e-10 @@ -106,20 +123,20 @@ AddTest( REQUIREMENTS NOT OGS_USE_MPI RUNTIME 26 DIFF_DATA - DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_100_t_5.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_100_t_5.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_200_t_35.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_200_t_35.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_300_t_155.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_300_t_155.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_400_t_315.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_400_t_315.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_500_t_495.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_500_t_495.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_600_t_720.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_600_t_720.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_672_t_900.000000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_672_t_900.000000.vtu concentration concentration 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_100_t_5.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_100_t_5.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_200_t_35.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_200_t_35.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_300_t_155.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_300_t_155.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_400_t_315.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_400_t_315.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_500_t_495.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_500_t_495.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_600_t_720.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_600_t_720.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_672_t_900.000000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_672_t_900.000000.vtu concentration Si 1e-7 1e-10 DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_100_t_5.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_100_t_5.700000.vtu pressure pressure 1e-7 1e-10 DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_200_t_35.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_200_t_35.700000.vtu pressure pressure 1e-7 1e-10 DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_300_t_155.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_300_t_155.700000.vtu pressure pressure 1e-7 1e-10 DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_400_t_315.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_400_t_315.700000.vtu pressure pressure 1e-7 1e-10 DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_500_t_495.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_500_t_495.700000.vtu pressure pressure 1e-7 1e-10 DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_600_t_720.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_600_t_720.700000.vtu pressure pressure 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_672_t_900.000000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_672_t_900.000000.vtu pressure pressure 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_672_t_900.000000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_672_t_900.000000.vtu pressure pressure 2e-7 1e-10 DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_100_t_5.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_100_t_5.700000.vtu darcy_velocity darcy_velocity 1e-7 1e-10 DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_200_t_35.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_200_t_35.700000.vtu darcy_velocity darcy_velocity 1e-7 1e-10 DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_300_t_155.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersion_pcs_0_ts_300_t_155.700000.vtu darcy_velocity darcy_velocity 1e-7 1e-10 @@ -140,13 +157,13 @@ AddTest( REQUIREMENTS NOT OGS_USE_MPI RUNTIME 23 DIFF_DATA - DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_100_t_5.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_100_t_5.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_200_t_35.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_200_t_35.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_300_t_155.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_300_t_155.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_400_t_315.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_400_t_315.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_500_t_495.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_500_t_495.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_600_t_720.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_600_t_720.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_672_t_900.000000_expected.vtu DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_672_t_900.000000.vtu concentration concentration 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_100_t_5.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_100_t_5.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_200_t_35.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_200_t_35.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_300_t_155.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_300_t_155.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_400_t_315.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_400_t_315.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_500_t_495.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_500_t_495.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_600_t_720.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_600_t_720.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_672_t_900.000000_expected.vtu DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_672_t_900.000000.vtu concentration Si 1e-7 1e-10 DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_100_t_5.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_100_t_5.700000.vtu pressure pressure 1e-7 1e-10 DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_200_t_35.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_200_t_35.700000.vtu pressure pressure 1e-7 1e-10 DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_300_t_155.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDecay_pcs_0_ts_300_t_155.700000.vtu pressure pressure 1e-7 1e-10 @@ -174,13 +191,13 @@ AddTest( REQUIREMENTS NOT OGS_USE_MPI RUNTIME 25 DIFF_DATA - DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_100_t_5.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_100_t_5.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_200_t_35.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_200_t_35.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_300_t_155.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_300_t_155.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_400_t_315.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_400_t_315.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_500_t_495.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_500_t_495.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_600_t_720.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_600_t_720.700000.vtu concentration concentration 1e-7 1e-10 - DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_672_t_900.000000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_672_t_900.000000.vtu concentration concentration 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_100_t_5.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_100_t_5.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_200_t_35.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_200_t_35.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_300_t_155.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_300_t_155.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_400_t_315.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_400_t_315.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_500_t_495.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_500_t_495.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_600_t_720.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_600_t_720.700000.vtu concentration Si 1e-7 1e-10 + DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_672_t_900.000000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_672_t_900.000000.vtu concentration Si 1e-7 1e-10 DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_100_t_5.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_100_t_5.700000.vtu pressure pressure 1e-7 1e-10 DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_200_t_35.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_200_t_35.700000.vtu pressure pressure 1e-7 1e-10 DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_300_t_155.700000_expected.vtu DiffusionAndStorageAndAdvectionAndDispersionHalf_pcs_0_ts_300_t_155.700000.vtu pressure pressure 1e-7 1e-10 @@ -208,12 +225,12 @@ AddTest( REQUIREMENTS NOT OGS_USE_MPI DIFF_DATA cube_1x1x1_hex_1e3_complete_surface.vtu flux_1e3_t_1.000000.vtu flux flux 1e-10 1e-16 - cube_1x1x1_hex_1e3_left_pcs_0_ts_0_t_0.000000.vtu cube_1x1x1_hex_1e3_left_pcs_0_ts_0_t_0.000000.vtu concentration concentration 1e-10 1e-16 - cube_1x1x1_hex_1e3_left_pcs_0_ts_1_t_1.000000.vtu cube_1x1x1_hex_1e3_left_pcs_0_ts_1_t_1.000000.vtu concentration concentration 1e-10 1e-16 + cube_1x1x1_hex_1e3_left_pcs_0_ts_0_t_0.000000.vtu cube_1x1x1_hex_1e3_left_pcs_0_ts_0_t_0.000000.vtu concentration Si 1e-10 1e-16 + cube_1x1x1_hex_1e3_left_pcs_0_ts_1_t_1.000000.vtu cube_1x1x1_hex_1e3_left_pcs_0_ts_1_t_1.000000.vtu concentration Si 1e-10 1e-16 cube_1x1x1_hex_1e3_left_pcs_0_ts_0_t_0.000000.vtu cube_1x1x1_hex_1e3_left_pcs_0_ts_0_t_0.000000.vtu pressure pressure 1e-10 1e-16 cube_1x1x1_hex_1e3_left_pcs_0_ts_1_t_1.000000.vtu cube_1x1x1_hex_1e3_left_pcs_0_ts_1_t_1.000000.vtu pressure pressure 1e-10 1e-16 - cube_1x1x1_hex_1e3_right_pcs_0_ts_0_t_0.000000.vtu cube_1x1x1_hex_1e3_right_pcs_0_ts_0_t_0.000000.vtu concentration concentration 1e-10 1e-16 - cube_1x1x1_hex_1e3_right_pcs_0_ts_1_t_1.000000.vtu cube_1x1x1_hex_1e3_right_pcs_0_ts_1_t_1.000000.vtu concentration concentration 1e-10 1e-16 + cube_1x1x1_hex_1e3_right_pcs_0_ts_0_t_0.000000.vtu cube_1x1x1_hex_1e3_right_pcs_0_ts_0_t_0.000000.vtu concentration Si 1e-10 1e-16 + cube_1x1x1_hex_1e3_right_pcs_0_ts_1_t_1.000000.vtu cube_1x1x1_hex_1e3_right_pcs_0_ts_1_t_1.000000.vtu concentration Si 1e-10 1e-16 cube_1x1x1_hex_1e3_right_pcs_0_ts_0_t_0.000000.vtu cube_1x1x1_hex_1e3_right_pcs_0_ts_0_t_0.000000.vtu pressure pressure 1e-10 1e-16 cube_1x1x1_hex_1e3_right_pcs_0_ts_1_t_1.000000.vtu cube_1x1x1_hex_1e3_right_pcs_0_ts_1_t_1.000000.vtu pressure pressure 1e-10 1e-16 ) @@ -227,14 +244,14 @@ AddTest( TESTER vtkdiff REQUIREMENTS NOT OGS_USE_MPI DIFF_DATA - Goswami_Component_Transport_pcs_0_ts_1185_t_600.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_1185_t_600.000000.vtu concentration concentration 1e-1 1e-5 - Goswami_Component_Transport_pcs_0_ts_1785_t_1200.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_1785_t_1200.000000.vtu concentration concentration 1e-1 1e-5 - Goswami_Component_Transport_pcs_0_ts_2385_t_1800.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_2385_t_1800.000000.vtu concentration concentration 1e-1 1e-5 - Goswami_Component_Transport_pcs_0_ts_2985_t_2400.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_2985_t_2400.000000.vtu concentration concentration 1e-1 1e-5 - Goswami_Component_Transport_pcs_0_ts_3585_t_3000.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_3585_t_3000.000000.vtu concentration concentration 1e-1 1e-5 - Goswami_Component_Transport_pcs_0_ts_4185_t_3600.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_4185_t_3600.000000.vtu concentration concentration 1e-1 1e-5 - Goswami_Component_Transport_pcs_0_ts_4785_t_4200.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_4785_t_4200.000000.vtu concentration concentration 1e-1 1e-5 - Goswami_Component_Transport_pcs_0_ts_5385_t_4800.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_5385_t_4800.000000.vtu concentration concentration 1e-1 1e-5 + Goswami_Component_Transport_pcs_0_ts_1185_t_600.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_1185_t_600.000000.vtu concentration Si 1e-1 1e-5 + Goswami_Component_Transport_pcs_0_ts_1785_t_1200.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_1785_t_1200.000000.vtu concentration Si 1e-1 1e-5 + Goswami_Component_Transport_pcs_0_ts_2385_t_1800.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_2385_t_1800.000000.vtu concentration Si 1e-1 1e-5 + Goswami_Component_Transport_pcs_0_ts_2985_t_2400.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_2985_t_2400.000000.vtu concentration Si 1e-1 1e-5 + Goswami_Component_Transport_pcs_0_ts_3585_t_3000.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_3585_t_3000.000000.vtu concentration Si 1e-1 1e-5 + Goswami_Component_Transport_pcs_0_ts_4185_t_3600.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_4185_t_3600.000000.vtu concentration Si 1e-1 1e-5 + Goswami_Component_Transport_pcs_0_ts_4785_t_4200.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_4785_t_4200.000000.vtu concentration Si 1e-1 1e-5 + Goswami_Component_Transport_pcs_0_ts_5385_t_4800.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_5385_t_4800.000000.vtu concentration Si 1e-1 1e-5 Goswami_Component_Transport_pcs_0_ts_1185_t_600.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_1185_t_600.000000.vtu pressure pressure 1e-1 1e-5 Goswami_Component_Transport_pcs_0_ts_1785_t_1200.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_1785_t_1200.000000.vtu pressure pressure 1e-1 1e-5 Goswami_Component_Transport_pcs_0_ts_2385_t_1800.000000_expected.vtu Goswami_Component_Transport_pcs_0_ts_2385_t_1800.000000.vtu pressure pressure 1e-1 1e-5 @@ -288,32 +305,32 @@ AddTest( elder_pcs_0_ts_500_t_131490000.000000_reference.vtu elder_pcs_0_ts_500_t_131490000.000000.vtu pressure pressure 1e-1 1e-5 elder_pcs_0_ts_60_t_15778800.000000_reference.vtu elder_pcs_0_ts_60_t_15778800.000000.vtu pressure pressure 1e-1 1e-5 elder_pcs_0_ts_80_t_21038400.000000_reference.vtu elder_pcs_0_ts_80_t_21038400.000000.vtu pressure pressure 1e-1 1e-5 - elder_pcs_0_ts_0_t_0.000000_reference.vtu elder_pcs_0_ts_0_t_0.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_100_t_26298000.000000_reference.vtu elder_pcs_0_ts_100_t_26298000.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_120_t_31557600.000000_reference.vtu elder_pcs_0_ts_120_t_31557600.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_140_t_36817200.000000_reference.vtu elder_pcs_0_ts_140_t_36817200.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_160_t_42076800.000000_reference.vtu elder_pcs_0_ts_160_t_42076800.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_180_t_47336400.000000_reference.vtu elder_pcs_0_ts_180_t_47336400.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_200_t_52596000.000000_reference.vtu elder_pcs_0_ts_200_t_52596000.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_20_t_5259600.000000_reference.vtu elder_pcs_0_ts_20_t_5259600.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_220_t_57855600.000000_reference.vtu elder_pcs_0_ts_220_t_57855600.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_240_t_63115200.000000_reference.vtu elder_pcs_0_ts_240_t_63115200.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_260_t_68374800.000000_reference.vtu elder_pcs_0_ts_260_t_68374800.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_280_t_73634400.000000_reference.vtu elder_pcs_0_ts_280_t_73634400.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_300_t_78894000.000000_reference.vtu elder_pcs_0_ts_300_t_78894000.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_320_t_84153600.000000_reference.vtu elder_pcs_0_ts_320_t_84153600.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_340_t_89413200.000000_reference.vtu elder_pcs_0_ts_340_t_89413200.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_360_t_94672800.000000_reference.vtu elder_pcs_0_ts_360_t_94672800.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_380_t_99932400.000000_reference.vtu elder_pcs_0_ts_380_t_99932400.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_400_t_105192000.000000_reference.vtu elder_pcs_0_ts_400_t_105192000.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_40_t_10519200.000000_reference.vtu elder_pcs_0_ts_40_t_10519200.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_420_t_110451600.000000_reference.vtu elder_pcs_0_ts_420_t_110451600.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_440_t_115711200.000000_reference.vtu elder_pcs_0_ts_440_t_115711200.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_460_t_120970800.000000_reference.vtu elder_pcs_0_ts_460_t_120970800.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_480_t_126230400.000000_reference.vtu elder_pcs_0_ts_480_t_126230400.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_500_t_131490000.000000_reference.vtu elder_pcs_0_ts_500_t_131490000.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_60_t_15778800.000000_reference.vtu elder_pcs_0_ts_60_t_15778800.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_80_t_21038400.000000_reference.vtu elder_pcs_0_ts_80_t_21038400.000000.vtu conc conc 1e-1 1e-5 + elder_pcs_0_ts_0_t_0.000000_reference.vtu elder_pcs_0_ts_0_t_0.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_100_t_26298000.000000_reference.vtu elder_pcs_0_ts_100_t_26298000.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_120_t_31557600.000000_reference.vtu elder_pcs_0_ts_120_t_31557600.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_140_t_36817200.000000_reference.vtu elder_pcs_0_ts_140_t_36817200.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_160_t_42076800.000000_reference.vtu elder_pcs_0_ts_160_t_42076800.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_180_t_47336400.000000_reference.vtu elder_pcs_0_ts_180_t_47336400.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_200_t_52596000.000000_reference.vtu elder_pcs_0_ts_200_t_52596000.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_20_t_5259600.000000_reference.vtu elder_pcs_0_ts_20_t_5259600.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_220_t_57855600.000000_reference.vtu elder_pcs_0_ts_220_t_57855600.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_240_t_63115200.000000_reference.vtu elder_pcs_0_ts_240_t_63115200.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_260_t_68374800.000000_reference.vtu elder_pcs_0_ts_260_t_68374800.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_280_t_73634400.000000_reference.vtu elder_pcs_0_ts_280_t_73634400.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_300_t_78894000.000000_reference.vtu elder_pcs_0_ts_300_t_78894000.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_320_t_84153600.000000_reference.vtu elder_pcs_0_ts_320_t_84153600.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_340_t_89413200.000000_reference.vtu elder_pcs_0_ts_340_t_89413200.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_360_t_94672800.000000_reference.vtu elder_pcs_0_ts_360_t_94672800.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_380_t_99932400.000000_reference.vtu elder_pcs_0_ts_380_t_99932400.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_400_t_105192000.000000_reference.vtu elder_pcs_0_ts_400_t_105192000.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_40_t_10519200.000000_reference.vtu elder_pcs_0_ts_40_t_10519200.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_420_t_110451600.000000_reference.vtu elder_pcs_0_ts_420_t_110451600.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_440_t_115711200.000000_reference.vtu elder_pcs_0_ts_440_t_115711200.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_460_t_120970800.000000_reference.vtu elder_pcs_0_ts_460_t_120970800.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_480_t_126230400.000000_reference.vtu elder_pcs_0_ts_480_t_126230400.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_500_t_131490000.000000_reference.vtu elder_pcs_0_ts_500_t_131490000.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_60_t_15778800.000000_reference.vtu elder_pcs_0_ts_60_t_15778800.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_80_t_21038400.000000_reference.vtu elder_pcs_0_ts_80_t_21038400.000000.vtu conc Si 1e-1 1e-5 ) AddTest( @@ -351,32 +368,32 @@ AddTest( elder_pcs_0_ts_500_t_131490000.000000_reference.vtu elder_python_pcs_0_ts_500_t_131490000.000000.vtu pressure pressure 1e-1 1e-5 elder_pcs_0_ts_60_t_15778800.000000_reference.vtu elder_python_pcs_0_ts_60_t_15778800.000000.vtu pressure pressure 1e-1 1e-5 elder_pcs_0_ts_80_t_21038400.000000_reference.vtu elder_python_pcs_0_ts_80_t_21038400.000000.vtu pressure pressure 1e-1 1e-5 - elder_pcs_0_ts_0_t_0.000000_reference.vtu elder_python_pcs_0_ts_0_t_0.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_100_t_26298000.000000_reference.vtu elder_python_pcs_0_ts_100_t_26298000.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_120_t_31557600.000000_reference.vtu elder_python_pcs_0_ts_120_t_31557600.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_140_t_36817200.000000_reference.vtu elder_python_pcs_0_ts_140_t_36817200.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_160_t_42076800.000000_reference.vtu elder_python_pcs_0_ts_160_t_42076800.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_180_t_47336400.000000_reference.vtu elder_python_pcs_0_ts_180_t_47336400.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_200_t_52596000.000000_reference.vtu elder_python_pcs_0_ts_200_t_52596000.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_20_t_5259600.000000_reference.vtu elder_python_pcs_0_ts_20_t_5259600.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_220_t_57855600.000000_reference.vtu elder_python_pcs_0_ts_220_t_57855600.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_240_t_63115200.000000_reference.vtu elder_python_pcs_0_ts_240_t_63115200.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_260_t_68374800.000000_reference.vtu elder_python_pcs_0_ts_260_t_68374800.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_280_t_73634400.000000_reference.vtu elder_python_pcs_0_ts_280_t_73634400.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_300_t_78894000.000000_reference.vtu elder_python_pcs_0_ts_300_t_78894000.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_320_t_84153600.000000_reference.vtu elder_python_pcs_0_ts_320_t_84153600.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_340_t_89413200.000000_reference.vtu elder_python_pcs_0_ts_340_t_89413200.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_360_t_94672800.000000_reference.vtu elder_python_pcs_0_ts_360_t_94672800.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_380_t_99932400.000000_reference.vtu elder_python_pcs_0_ts_380_t_99932400.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_400_t_105192000.000000_reference.vtu elder_python_pcs_0_ts_400_t_105192000.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_40_t_10519200.000000_reference.vtu elder_python_pcs_0_ts_40_t_10519200.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_420_t_110451600.000000_reference.vtu elder_python_pcs_0_ts_420_t_110451600.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_440_t_115711200.000000_reference.vtu elder_python_pcs_0_ts_440_t_115711200.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_460_t_120970800.000000_reference.vtu elder_python_pcs_0_ts_460_t_120970800.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_480_t_126230400.000000_reference.vtu elder_python_pcs_0_ts_480_t_126230400.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_500_t_131490000.000000_reference.vtu elder_python_pcs_0_ts_500_t_131490000.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_60_t_15778800.000000_reference.vtu elder_python_pcs_0_ts_60_t_15778800.000000.vtu conc conc 1e-1 1e-5 - elder_pcs_0_ts_80_t_21038400.000000_reference.vtu elder_python_pcs_0_ts_80_t_21038400.000000.vtu conc conc 1e-1 1e-5 + elder_pcs_0_ts_0_t_0.000000_reference.vtu elder_python_pcs_0_ts_0_t_0.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_100_t_26298000.000000_reference.vtu elder_python_pcs_0_ts_100_t_26298000.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_120_t_31557600.000000_reference.vtu elder_python_pcs_0_ts_120_t_31557600.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_140_t_36817200.000000_reference.vtu elder_python_pcs_0_ts_140_t_36817200.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_160_t_42076800.000000_reference.vtu elder_python_pcs_0_ts_160_t_42076800.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_180_t_47336400.000000_reference.vtu elder_python_pcs_0_ts_180_t_47336400.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_200_t_52596000.000000_reference.vtu elder_python_pcs_0_ts_200_t_52596000.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_20_t_5259600.000000_reference.vtu elder_python_pcs_0_ts_20_t_5259600.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_220_t_57855600.000000_reference.vtu elder_python_pcs_0_ts_220_t_57855600.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_240_t_63115200.000000_reference.vtu elder_python_pcs_0_ts_240_t_63115200.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_260_t_68374800.000000_reference.vtu elder_python_pcs_0_ts_260_t_68374800.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_280_t_73634400.000000_reference.vtu elder_python_pcs_0_ts_280_t_73634400.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_300_t_78894000.000000_reference.vtu elder_python_pcs_0_ts_300_t_78894000.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_320_t_84153600.000000_reference.vtu elder_python_pcs_0_ts_320_t_84153600.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_340_t_89413200.000000_reference.vtu elder_python_pcs_0_ts_340_t_89413200.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_360_t_94672800.000000_reference.vtu elder_python_pcs_0_ts_360_t_94672800.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_380_t_99932400.000000_reference.vtu elder_python_pcs_0_ts_380_t_99932400.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_400_t_105192000.000000_reference.vtu elder_python_pcs_0_ts_400_t_105192000.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_40_t_10519200.000000_reference.vtu elder_python_pcs_0_ts_40_t_10519200.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_420_t_110451600.000000_reference.vtu elder_python_pcs_0_ts_420_t_110451600.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_440_t_115711200.000000_reference.vtu elder_python_pcs_0_ts_440_t_115711200.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_460_t_120970800.000000_reference.vtu elder_python_pcs_0_ts_460_t_120970800.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_480_t_126230400.000000_reference.vtu elder_python_pcs_0_ts_480_t_126230400.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_500_t_131490000.000000_reference.vtu elder_python_pcs_0_ts_500_t_131490000.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_60_t_15778800.000000_reference.vtu elder_python_pcs_0_ts_60_t_15778800.000000.vtu conc Si 1e-1 1e-5 + elder_pcs_0_ts_80_t_21038400.000000_reference.vtu elder_python_pcs_0_ts_80_t_21038400.000000.vtu conc Si 1e-1 1e-5 ) AddTest( @@ -388,7 +405,7 @@ AddTest( TESTER vtkdiff REQUIREMENTS NOT OGS_USE_MPI DIFF_DATA - square_100x100_quad_1e4_ComponentTransport_pcs_0_ts_1_t_1.000000.vtu square_100x100_quad_1e4_ComponentTransport_pcs_0_ts_1_t_1.000000.vtu pressure_expected pressure 1e-7 1e-10 + square_100x100_quad_1e4_ComponentTransport_pcs_0_ts_1_t_1.000000.vtu square_100x100_quad_1e4_ComponentTransport_pcs_0_ts_1_t_1.000000.vtu pressure_expected pressure 2e-2 1e-10 square_100x100_quad_1e4_ComponentTransport_pcs_0_ts_1_t_1.000000.vtu square_100x100_quad_1e4_ComponentTransport_pcs_0_ts_1_t_1.000000.vtu darcy_velocity_expected darcy_velocity 1e-7 1e-10 VIS square_100x100_quad_1e4_ComponentTransport_pcs_0_ts_1_t_1.000000.vtu ) @@ -440,10 +457,10 @@ AddTest( vdbc_pcs_0_ts_21990_t_210000.000000_expected.vtu vdbc_pcs_0_ts_21990_t_210000.000000.vtu pressure pressure 1e-5 1e-4 vdbc_pcs_0_ts_25990_t_250000.000000_expected.vtu vdbc_pcs_0_ts_25990_t_250000.000000.vtu pressure pressure 1e-5 1e-4 vdbc_pcs_0_ts_0_t_0.000000_expected.vtu vdbc_pcs_0_ts_0_t_0.000000.vtu pressure pressure 1e-5 1e-4 - vdbc_pcs_0_ts_1590_t_6000.000000_expected.vtu vdbc_pcs_0_ts_1590_t_6000.000000.vtu concentration concentration 1e-5 1e-4 - vdbc_pcs_0_ts_3990_t_30000.000000_expected.vtu vdbc_pcs_0_ts_3990_t_30000.000000.vtu concentration concentration 1e-5 1e-4 - vdbc_pcs_0_ts_9990_t_90000.000000_expected.vtu vdbc_pcs_0_ts_9990_t_90000.000000.vtu concentration concentration 1e-5 1e-4 - vdbc_pcs_0_ts_15990_t_150000.000000_expected.vtu vdbc_pcs_0_ts_15990_t_150000.000000.vtu concentration concentration 1e-5 1e-4 - vdbc_pcs_0_ts_21990_t_210000.000000_expected.vtu vdbc_pcs_0_ts_21990_t_210000.000000.vtu concentration concentration 1e-5 1e-4 - vdbc_pcs_0_ts_25990_t_250000.000000_expected.vtu vdbc_pcs_0_ts_25990_t_250000.000000.vtu concentration concentration 1e-5 1e-4 + vdbc_pcs_0_ts_1590_t_6000.000000_expected.vtu vdbc_pcs_0_ts_1590_t_6000.000000.vtu concentration Si 1e-5 1e-4 + vdbc_pcs_0_ts_3990_t_30000.000000_expected.vtu vdbc_pcs_0_ts_3990_t_30000.000000.vtu concentration Si 1e-5 1e-4 + vdbc_pcs_0_ts_9990_t_90000.000000_expected.vtu vdbc_pcs_0_ts_9990_t_90000.000000.vtu concentration Si 1e-5 1e-4 + vdbc_pcs_0_ts_15990_t_150000.000000_expected.vtu vdbc_pcs_0_ts_15990_t_150000.000000.vtu concentration Si 1e-5 1e-4 + vdbc_pcs_0_ts_21990_t_210000.000000_expected.vtu vdbc_pcs_0_ts_21990_t_210000.000000.vtu concentration Si 1e-5 1e-4 + vdbc_pcs_0_ts_25990_t_250000.000000_expected.vtu vdbc_pcs_0_ts_25990_t_250000.000000.vtu concentration Si 1e-5 1e-4 ) diff --git a/Tests/Data/Elliptic/square_100x100_ComponentTransport/square_1e4_heterogeneity.prj b/Tests/Data/Elliptic/square_100x100_ComponentTransport/square_1e4_heterogeneity.prj index 1ee6eeade5d..e0e8bdd9259 100644 --- a/Tests/Data/Elliptic/square_100x100_ComponentTransport/square_1e4_heterogeneity.prj +++ b/Tests/Data/Elliptic/square_100x100_ComponentTransport/square_1e4_heterogeneity.prj @@ -8,7 +8,7 @@ <type>ComponentTransport</type> <integration_order>2</integration_order> <process_variables> - <concentration>concentration</concentration> + <concentration>Si</concentration> <pressure>pressure</pressure> </process_variables> <fluid> @@ -38,9 +38,6 @@ </porous_medium> </porous_medium> <fluid_reference_density>rho_fluid</fluid_reference_density> - <solute_dispersivity_longitudinal>beta_l</solute_dispersivity_longitudinal> - <solute_dispersivity_transverse>beta_t</solute_dispersivity_transverse> - <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient> <retardation_factor>retardation</retardation_factor> <decay_rate>decay</decay_rate> <specific_body_force>0 0</specific_body_force> @@ -49,6 +46,39 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases> + <phase> + <type>AqueousLiquid</type> + <components> + <component> + <name>Si</name> + <properties> + <property> + <name>molecular_diffusion</name> + <type>Constant</type> + <value>1e-5</value> + </property> + </properties> + </component> + </components> + </phase> + </phases> + <properties> + <property> + <name>longitudinal_dispersivity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>transversal_dispersivity</name> + <type>Constant</type> + <value>0.1</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="hc"> @@ -56,7 +86,7 @@ <convergence_criterion> <type>PerComponentDeltaX</type> <norm_type>NORM2</norm_type> - <reltols>5e-3 5e-3</reltols> + <reltols>1e-15 1e-15</reltols> </convergence_criterion> <time_discretization> <type>BackwardEuler</type> @@ -84,7 +114,7 @@ </pair> </timesteps> <variables> - <variable>concentration</variable> + <variable>Si</variable> <variable>pressure</variable> <variable>darcy_velocity</variable> </variables> @@ -96,11 +126,6 @@ <type>Constant</type> <value>1000</value> </parameter> - <parameter> - <name>Dm</name> - <type>Constant</type> - <value>1e-5</value> - </parameter> <parameter> <name>retardation</name> <type>Constant</type> @@ -111,16 +136,6 @@ <type>Constant</type> <value>0</value> </parameter> - <parameter> - <name>beta_l</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>beta_t</name> - <type>Constant</type> - <value>0.1</value> - </parameter> <parameter> <name>c0</name> <type>Constant</type> @@ -156,7 +171,7 @@ </parameters> <process_variables> <process_variable> - <name>concentration</name> + <name>Si</name> <components>1</components> <order>1</order> <initial_condition>c0</initial_condition> @@ -201,16 +216,16 @@ <linear_solvers> <linear_solver> <name>general_linear_solver</name> - <lis>-i bicgstab -p ilut -tol 1e-8 -maxiter 20000</lis> + <lis>-i bicgstab -p ilut -tol 1e-16 -maxiter 20000</lis> <eigen> <solver_type>BiCGSTAB</solver_type> - <precon_type>ILUT</precon_type> + <precon_type>DIAGONAL</precon_type> <max_iteration_step>20000</max_iteration_step> - <error_tolerance>1e-8</error_tolerance> + <error_tolerance>1e-16</error_tolerance> </eigen> <petsc> <prefix>hc</prefix> - <parameters>-hc_ksp_type bcgs -hc_pc_type bjacobi -hc_ksp_rtol 1e-8 -hc_ksp_max_it 20000</parameters> + <parameters>-hc_ksp_type bcgs -hc_pc_type bjacobi -hc_ksp_rtol 1e-16 -hc_ksp_max_it 20000</parameters> </petsc> </linear_solver> </linear_solvers> diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj index f47b12e0335..9318140c605 100644 --- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj +++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj @@ -8,7 +8,7 @@ <type>ComponentTransport</type> <integration_order>2</integration_order> <process_variables> - <concentration>concentration</concentration> + <concentration>Si</concentration> <pressure>pressure</pressure> </process_variables> <fluid> @@ -56,9 +56,6 @@ </porous_medium> </porous_medium> <fluid_reference_density>rho_fluid</fluid_reference_density> - <solute_dispersivity_longitudinal>beta_l</solute_dispersivity_longitudinal> - <solute_dispersivity_transverse>beta_t</solute_dispersivity_transverse> - <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient> <retardation_factor>retardation</retardation_factor> <decay_rate>decay</decay_rate> <specific_body_force>0 0</specific_body_force> @@ -67,6 +64,39 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases> + <phase> + <type>AqueousLiquid</type> + <components> + <component> + <name>Si</name> + <properties> + <property> + <name>molecular_diffusion</name> + <value>1</value> + <type>Constant</type> + </property> + </properties> + </component> + </components> + </phase> + </phases> + <properties> + <property> + <name>longitudinal_dispersivity</name> + <type>Constant</type> + <value>0</value> + </property> + <property> + <name>transversal_dispersivity</name> + <type>Constant</type> + <value>1</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="hc"> @@ -110,7 +140,7 @@ </pair> </timesteps> <variables> - <variable>concentration</variable> + <variable>Si</variable> <variable>pressure</variable> <variable>darcy_velocity</variable> </variables> @@ -127,11 +157,6 @@ <type>Constant</type> <value>1000</value> </parameter> - <parameter> - <name>Dm</name> - <type>Constant</type> - <value>1</value> - </parameter> <parameter> <name>retardation</name> <type>Constant</type> @@ -142,16 +167,6 @@ <type>Constant</type> <value>0</value> </parameter> - <parameter> - <name>beta_l</name> - <type>Constant</type> - <value>0</value> - </parameter> - <parameter> - <name>beta_t</name> - <type>Constant</type> - <value>1</value> - </parameter> <parameter> <name>c0</name> <type>Constant</type> @@ -195,7 +210,7 @@ </parameters> <process_variables> <process_variable> - <name>concentration</name> + <name>Si</name> <components>1</components> <order>1</order> <initial_condition>c0</initial_condition> diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj index 21159856009..b1b520744c8 100644 --- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj +++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj @@ -8,7 +8,7 @@ <type>ComponentTransport</type> <integration_order>2</integration_order> <process_variables> - <concentration>concentration</concentration> + <concentration>Si</concentration> <pressure>pressure</pressure> </process_variables> <fluid> @@ -54,9 +54,6 @@ </porous_medium> </porous_medium> <fluid_reference_density>rho_fluid</fluid_reference_density> - <solute_dispersivity_longitudinal>beta_l</solute_dispersivity_longitudinal> - <solute_dispersivity_transverse>beta_t</solute_dispersivity_transverse> - <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient> <retardation_factor>retardation</retardation_factor> <decay_rate>decay</decay_rate> <specific_body_force>0 0</specific_body_force> @@ -65,6 +62,39 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases> + <phase> + <type>AqueousLiquid</type> + <components> + <component> + <name>Si</name> + <properties> + <property> + <name>molecular_diffusion</name> + <type>Constant</type> + <value>1</value> + </property> + </properties> + </component> + </components> + </phase> + </phases> + <properties> + <property> + <name>longitudinal_dispersivity</name> + <type>Constant</type> + <value>0</value> + </property> + <property> + <name>transversal_dispersivity</name> + <type>Constant</type> + <value>1</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="hc"> @@ -100,7 +130,7 @@ </pair> </timesteps> <variables> - <variable>concentration</variable> + <variable>Si</variable> <variable>pressure</variable> <variable>darcy_velocity</variable> </variables> @@ -127,11 +157,6 @@ <type>Constant</type> <value>1000</value> </parameter> - <parameter> - <name>Dm</name> - <type>Constant</type> - <value>1</value> - </parameter> <parameter> <name>retardation</name> <type>Constant</type> @@ -142,16 +167,6 @@ <type>Constant</type> <value>0</value> </parameter> - <parameter> - <name>beta_l</name> - <type>Constant</type> - <value>0</value> - </parameter> - <parameter> - <name>beta_t</name> - <type>Constant</type> - <value>1</value> - </parameter> <parameter> <name>c0</name> <type>Constant</type> @@ -185,7 +200,8 @@ </parameters> <process_variables> <process_variable> - <name>concentration</name> + <name>Si</name> + <!--keep conformity with component name--> <components>1</components> <order>1</order> <initial_condition>c0</initial_condition> diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly_3Components.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly_3Components.prj new file mode 100644 index 00000000000..0627e7414f0 --- /dev/null +++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly_3Components.prj @@ -0,0 +1,334 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<OpenGeoSysProject> + <mesh>square_1x1_quad_1e3.vtu</mesh> + <geometry>square_1x1.gml</geometry> + <processes> + <process> + <name>hc</name> + <type>ComponentTransport</type> + <integration_order>2</integration_order> + <process_variables> + <concentration>Si</concentration> + <concentration>Al</concentration> + <concentration>Cl</concentration> + <pressure>pressure</pressure> + </process_variables> + <fluid> + <density> + <type>ConcentrationDependent</type> + <reference_density>1</reference_density> + <reference_concentration>0</reference_concentration> + <fluid_density_difference_ratio>0.0</fluid_density_difference_ratio> + </density> + <viscosity> + <type>Constant</type> + <value>1.0e-3</value> + </viscosity> + </fluid> + <porous_medium> + <porous_medium id="0"> + <permeability> + <type>Constant</type> + <permeability_tensor_entries>kappa1</permeability_tensor_entries> + </permeability> + <porosity> + <type>Constant</type> + <porosity_parameter>constant_porosity_parameter</porosity_parameter> + </porosity> + <storage> + <type>Constant</type> + <value>1e-5</value> + </storage> + </porous_medium> + <porous_medium id="1"> + <permeability> + <type>Constant</type> + <permeability_tensor_entries>kappa2</permeability_tensor_entries> + </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> + <retardation_factor>retardation</retardation_factor> + <decay_rate>decay</decay_rate> + <specific_body_force>0 0</specific_body_force> + <secondary_variables> + <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/> + </secondary_variables> + </process> + </processes> + <media> + <medium id="0"> + <phases> + <phase> + <type>AqueousLiquid</type> + <components> + <component> + <name>Si</name> + <properties> + <property> + <name>molecular_diffusion</name> + <type>Constant</type> + <value>1</value> + </property> + </properties> + </component> + <component> + <name>Al</name> + <properties> + <property> + <name>molecular_diffusion</name> + <type>Constant</type> + <value>1</value> + </property> + </properties> + </component> + <component> + <name>Cl</name> + <properties> + <property> + <name>molecular_diffusion</name> + <type>Constant</type> + <value>1</value> + </property> + </properties> + </component> + </components> + </phase> + </phases> + <properties> + <property> + <name>longitudinal_dispersivity</name> + <type>Constant</type> + <value>0</value> + </property> + <property> + <name>transversal_dispersivity</name> + <type>Constant</type> + <value>1</value> + </property> + </properties> + </medium> + </media> + <time_loop> + <processes> + <process ref="hc"> + <nonlinear_solver>basic_picard</nonlinear_solver> + <convergence_criterion> + <type>DeltaX</type> + <norm_type>NORM2</norm_type> + <reltol>1e-1</reltol> + </convergence_criterion> + <time_discretization> + <type>BackwardEuler</type> + </time_discretization> + <time_stepping> + <type>FixedTimeStepping</type> + <t_initial>0.0</t_initial> + <t_end>1</t_end> + <timesteps> + <pair> + <repeat>1</repeat> + <delta_t>1</delta_t> + </pair> + </timesteps> + </time_stepping> + </process> + </processes> + <output> + <type>VTK</type> + <prefix>DiffusionOnly_3Components</prefix> + <timesteps> + <pair> + <repeat>1</repeat> + <each_steps>1</each_steps> + </pair> + </timesteps> + <variables> + <variable>Si</variable> + <variable>Al</variable> + <variable>Cl</variable> + <variable>pressure</variable> + <variable>darcy_velocity</variable> + </variables> + </output> + </time_loop> + <parameters> + <parameter> + <name>kappa1</name> + <type>Constant</type> + <values>1.239e-7 0 0 1.239e-7</values> + </parameter> + <parameter> + <name>kappa2</name> + <type>Constant</type> + <values>1e-3 0 0 1e-3</values> + </parameter> + <parameter> + <name>constant_porosity_parameter</name> + <type>Constant</type> + <value>0.2</value> + </parameter> + <parameter> + <name>rho_fluid</name> + <type>Constant</type> + <value>1000</value> + </parameter> + <parameter> + <name>retardation</name> + <type>Constant</type> + <value>0</value> + </parameter> + <parameter> + <name>decay</name> + <type>Constant</type> + <value>0</value> + </parameter> + <parameter> + <name>c0</name> + <type>Constant</type> + <value>0</value> + </parameter> + <parameter> + <name>p0</name> + <type>Constant</type> + <value>0</value> + </parameter> + <parameter> + <name>p_Dirichlet_left</name> + <type>Constant</type> + <value>0</value> + </parameter> + <parameter> + <name>p_Dirichlet_right</name> + <type>Constant</type> + <value>0</value> + </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> + </parameter> + </parameters> + <process_variables> + <process_variable> + <name>Si</name> + <!--keep conformity with component name--> + <components>1</components> + <order>1</order> + <initial_condition>c0</initial_condition> + <boundary_conditions> + <boundary_condition> + <geometrical_set>geometry</geometrical_set> + <geometry>left</geometry> + <type>Dirichlet</type> + <parameter>c_Dirichlet_left</parameter> + </boundary_condition> + <boundary_condition> + <geometrical_set>geometry</geometrical_set> + <geometry>right</geometry> + <type>Dirichlet</type> + <parameter>c_Dirichlet_right</parameter> + </boundary_condition> + </boundary_conditions> + </process_variable> + <process_variable> + <name>Al</name> + <!--keep conformity with component name--> + <components>1</components> + <order>1</order> + <initial_condition>c0</initial_condition> + <boundary_conditions> + <boundary_condition> + <geometrical_set>geometry</geometrical_set> + <geometry>left</geometry> + <type>Dirichlet</type> + <parameter>c_Dirichlet_left</parameter> + </boundary_condition> + <boundary_condition> + <geometrical_set>geometry</geometrical_set> + <geometry>right</geometry> + <type>Dirichlet</type> + <parameter>c_Dirichlet_right</parameter> + </boundary_condition> + </boundary_conditions> + </process_variable> + <process_variable> + <name>Cl</name> + <!--keep conformity with component name--> + <components>1</components> + <order>1</order> + <initial_condition>c0</initial_condition> + <boundary_conditions> + <boundary_condition> + <geometrical_set>geometry</geometrical_set> + <geometry>left</geometry> + <type>Dirichlet</type> + <parameter>c_Dirichlet_left</parameter> + </boundary_condition> + <boundary_condition> + <geometrical_set>geometry</geometrical_set> + <geometry>right</geometry> + <type>Dirichlet</type> + <parameter>c_Dirichlet_right</parameter> + </boundary_condition> + </boundary_conditions> + </process_variable> + <process_variable> + <name>pressure</name> + <components>1</components> + <order>1</order> + <initial_condition>p0</initial_condition> + <boundary_conditions> + <boundary_condition> + <geometrical_set>geometry</geometrical_set> + <geometry>left</geometry> + <type>Dirichlet</type> + <parameter>p_Dirichlet_left</parameter> + </boundary_condition> + <boundary_condition> + <geometrical_set>geometry</geometrical_set> + <geometry>right</geometry> + <type>Dirichlet</type> + <parameter>p_Dirichlet_right</parameter> + </boundary_condition> + </boundary_conditions> + </process_variable> + </process_variables> + <nonlinear_solvers> + <nonlinear_solver> + <name>basic_picard</name> + <type>Picard</type> + <max_iter>2</max_iter> + <linear_solver>general_linear_solver</linear_solver> + </nonlinear_solver> + </nonlinear_solvers> + <linear_solvers> + <linear_solver> + <name>general_linear_solver</name> + <lis>-i cg -p jacobi -tol 1e-16 -maxiter 20000</lis> + <eigen> + <solver_type>BiCGSTAB</solver_type> + <precon_type>ILUT</precon_type> + <max_iteration_step>20000</max_iteration_step> + <error_tolerance>1e-8</error_tolerance> + </eigen> + <petsc> + <prefix>hc</prefix> + <parameters>-hc_ksp_type bcgs -hc_pc_type bjacobi -hc_ksp_rtol 1e-8 -hc_ksp_max_it 20000</parameters> + </petsc> + </linear_solver> + </linear_solvers> +</OpenGeoSysProject> diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj index ae6e1d4948d..f5e85df57da 100644 --- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj +++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj @@ -8,7 +8,7 @@ <type>ComponentTransport</type> <integration_order>2</integration_order> <process_variables> - <concentration>concentration</concentration> + <concentration>Si</concentration> <pressure>pressure</pressure> </process_variables> <fluid> @@ -56,9 +56,6 @@ </porous_medium> </porous_medium> <fluid_reference_density>rho_fluid</fluid_reference_density> - <solute_dispersivity_longitudinal>beta_l</solute_dispersivity_longitudinal> - <solute_dispersivity_transverse>beta_t</solute_dispersivity_transverse> - <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient> <retardation_factor>retardation</retardation_factor> <decay_rate>decay</decay_rate> <specific_body_force>0 0</specific_body_force> @@ -67,6 +64,39 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases> + <phase> + <type>AqueousLiquid</type> + <components> + <component> + <name>Si</name> + <properties> + <property> + <name>molecular_diffusion</name> + <type>Constant</type> + <value>1e-5</value> + </property> + </properties> + </component> + </components> + </phase> + </phases> + <properties> + <property> + <name>longitudinal_dispersivity</name> + <type>Constant</type> + <value>0</value> + </property> + <property> + <name>transversal_dispersivity</name> + <type>Constant</type> + <value>0</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="hc"> @@ -134,7 +164,7 @@ </pair> </timesteps> <variables> - <variable>concentration</variable> + <variable>Si</variable> <variable>pressure</variable> <variable>darcy_velocity</variable> </variables> @@ -146,11 +176,6 @@ <type>Constant</type> <value>1000</value> </parameter> - <parameter> - <name>Dm</name> - <type>Constant</type> - <value>1e-5</value> - </parameter> <parameter> <name>retardation</name> <type>Constant</type> @@ -161,16 +186,6 @@ <type>Constant</type> <value>0</value> </parameter> - <parameter> - <name>beta_l</name> - <type>Constant</type> - <value>0</value> - </parameter> - <parameter> - <name>beta_t</name> - <type>Constant</type> - <value>0</value> - </parameter> <parameter> <name>c0</name> <type>Constant</type> @@ -219,7 +234,7 @@ </parameters> <process_variables> <process_variable> - <name>concentration</name> + <name>Si</name> <components>1</components> <order>1</order> <initial_condition>c0</initial_condition> diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj index 0c45f0c78ce..de229bb8047 100644 --- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj +++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj @@ -8,7 +8,7 @@ <type>ComponentTransport</type> <integration_order>2</integration_order> <process_variables> - <concentration>concentration</concentration> + <concentration>Si</concentration> <pressure>pressure</pressure> </process_variables> <fluid> @@ -56,9 +56,6 @@ </porous_medium> </porous_medium> <fluid_reference_density>rho_fluid</fluid_reference_density> - <solute_dispersivity_longitudinal>beta_l</solute_dispersivity_longitudinal> - <solute_dispersivity_transverse>beta_t</solute_dispersivity_transverse> - <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient> <retardation_factor>retardation</retardation_factor> <decay_rate>decay</decay_rate> <specific_body_force>0 0</specific_body_force> @@ -67,6 +64,39 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases> + <phase> + <type>AqueousLiquid</type> + <components> + <component> + <name>Si</name> + <properties> + <property> + <name>molecular_diffusion</name> + <type>Constant</type> + <value>1e-5</value> + </property> + </properties> + </component> + </components> + </phase> + </phases> + <properties> + <property> + <name>longitudinal_dispersivity</name> + <type>Constant</type> + <value>0</value> + </property> + <property> + <name>transversal_dispersivity</name> + <type>Constant</type> + <value>0</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="hc"> @@ -134,7 +164,7 @@ </pair> </timesteps> <variables> - <variable>concentration</variable> + <variable>Si</variable> <variable>pressure</variable> <variable>darcy_velocity</variable> </variables> @@ -146,11 +176,6 @@ <type>Constant</type> <value>1000</value> </parameter> - <parameter> - <name>Dm</name> - <type>Constant</type> - <value>1e-5</value> - </parameter> <parameter> <name>retardation</name> <type>Constant</type> @@ -161,16 +186,6 @@ <type>Constant</type> <value>0.001</value> </parameter> - <parameter> - <name>beta_l</name> - <type>Constant</type> - <value>0</value> - </parameter> - <parameter> - <name>beta_t</name> - <type>Constant</type> - <value>0</value> - </parameter> <parameter> <name>c0</name> <type>Constant</type> @@ -219,7 +234,7 @@ </parameters> <process_variables> <process_variable> - <name>concentration</name> + <name>Si</name> <components>1</components> <order>1</order> <initial_condition>c0</initial_condition> diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj index b3f00d394d9..b02e2d7f196 100644 --- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj +++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj @@ -8,7 +8,7 @@ <type>ComponentTransport</type> <integration_order>2</integration_order> <process_variables> - <concentration>concentration</concentration> + <concentration>Si</concentration> <pressure>pressure</pressure> </process_variables> <fluid> @@ -56,9 +56,6 @@ </porous_medium> </porous_medium> <fluid_reference_density>rho_fluid</fluid_reference_density> - <solute_dispersivity_longitudinal>beta_l</solute_dispersivity_longitudinal> - <solute_dispersivity_transverse>beta_t</solute_dispersivity_transverse> - <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient> <retardation_factor>retardation</retardation_factor> <decay_rate>decay</decay_rate> <specific_body_force>0 0</specific_body_force> @@ -67,6 +64,39 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases> + <phase> + <type>AqueousLiquid</type> + <components> + <component> + <name>Si</name> + <properties> + <property> + <name>molecular_diffusion</name> + <type>Constant</type> + <value>1e-5</value> + </property> + </properties> + </component> + </components> + </phase> + </phases> + <properties> + <property> + <name>longitudinal_dispersivity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>transversal_dispersivity</name> + <type>Constant</type> + <value>1</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="hc"> @@ -134,7 +164,7 @@ </pair> </timesteps> <variables> - <variable>concentration</variable> + <variable>Si</variable> <variable>pressure</variable> <variable>darcy_velocity</variable> </variables> @@ -146,11 +176,6 @@ <type>Constant</type> <value>1000</value> </parameter> - <parameter> - <name>Dm</name> - <type>Constant</type> - <value>1e-5</value> - </parameter> <parameter> <name>retardation</name> <type>Constant</type> @@ -161,16 +186,6 @@ <type>Constant</type> <value>0</value> </parameter> - <parameter> - <name>beta_l</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>beta_t</name> - <type>Constant</type> - <value>1</value> - </parameter> <parameter> <name>c0</name> <type>Constant</type> @@ -219,7 +234,7 @@ </parameters> <process_variables> <process_variable> - <name>concentration</name> + <name>Si</name> <components>1</components> <order>1</order> <initial_condition>c0</initial_condition> diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj index 7e090bb728f..31f562fd86c 100644 --- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj +++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj @@ -8,7 +8,7 @@ <type>ComponentTransport</type> <integration_order>2</integration_order> <process_variables> - <concentration>concentration</concentration> + <concentration>Si</concentration> <pressure>pressure</pressure> </process_variables> <fluid> @@ -56,9 +56,6 @@ </porous_medium> </porous_medium> <fluid_reference_density>rho_fluid</fluid_reference_density> - <solute_dispersivity_longitudinal>beta_l</solute_dispersivity_longitudinal> - <solute_dispersivity_transverse>beta_t</solute_dispersivity_transverse> - <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient> <retardation_factor>retardation</retardation_factor> <decay_rate>decay</decay_rate> <specific_body_force>0 0</specific_body_force> @@ -67,6 +64,39 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases> + <phase> + <type>AqueousLiquid</type> + <components> + <component> + <name>Si</name> + <properties> + <property> + <name>molecular_diffusion</name> + <type>Constant</type> + <value>1e-5</value> + </property> + </properties> + </component> + </components> + </phase> + </phases> + <properties> + <property> + <name>longitudinal_dispersivity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>transversal_dispersivity</name> + <type>Constant</type> + <value>0.1</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="hc"> @@ -134,7 +164,7 @@ </pair> </timesteps> <variables> - <variable>concentration</variable> + <variable>Si</variable> <variable>pressure</variable> <variable>darcy_velocity</variable> </variables> @@ -146,11 +176,6 @@ <type>Constant</type> <value>1000</value> </parameter> - <parameter> - <name>Dm</name> - <type>Constant</type> - <value>1e-5</value> - </parameter> <parameter> <name>retardation</name> <type>Constant</type> @@ -161,16 +186,6 @@ <type>Constant</type> <value>0</value> </parameter> - <parameter> - <name>beta_l</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>beta_t</name> - <type>Constant</type> - <value>0.1</value> - </parameter> <parameter> <name>c0</name> <type>Constant</type> @@ -219,7 +234,7 @@ </parameters> <process_variables> <process_variable> - <name>concentration</name> + <name>Si</name> <components>1</components> <order>1</order> <initial_condition>c0</initial_condition> diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj index 21a1a987b8f..ea803b6ac5f 100644 --- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj +++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj @@ -8,7 +8,7 @@ <type>ComponentTransport</type> <integration_order>2</integration_order> <process_variables> - <concentration>concentration</concentration> + <concentration>Si</concentration> <pressure>pressure</pressure> </process_variables> <fluid> @@ -56,9 +56,6 @@ </porous_medium> </porous_medium> <fluid_reference_density>rho_fluid</fluid_reference_density> - <solute_dispersivity_longitudinal>beta_l</solute_dispersivity_longitudinal> - <solute_dispersivity_transverse>beta_t</solute_dispersivity_transverse> - <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient> <retardation_factor>retardation</retardation_factor> <decay_rate>decay</decay_rate> <specific_body_force>0 -1</specific_body_force> @@ -67,6 +64,39 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases> + <phase> + <type>AqueousLiquid</type> + <components> + <component> + <name>Si</name> + <properties> + <property> + <name>molecular_diffusion</name> + <type>Constant</type> + <value>1e-5</value> + </property> + </properties> + </component> + </components> + </phase> + </phases> + <properties> + <property> + <name>longitudinal_dispersivity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>transversal_dispersivity</name> + <type>Constant</type> + <value>0.1</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="hc"> @@ -110,7 +140,7 @@ </pair> </timesteps> <variables> - <variable>concentration</variable> + <variable>Si</variable> <variable>pressure</variable> <variable>darcy_velocity</variable> </variables> @@ -122,11 +152,6 @@ <type>Constant</type> <value>1000</value> </parameter> - <parameter> - <name>Dm</name> - <type>Constant</type> - <value>1e-5</value> - </parameter> <parameter> <name>retardation</name> <type>Constant</type> @@ -137,16 +162,6 @@ <type>Constant</type> <value>0</value> </parameter> - <parameter> - <name>beta_l</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>beta_t</name> - <type>Constant</type> - <value>0.1</value> - </parameter> <parameter> <name>c0</name> <type>Constant</type> @@ -195,7 +210,7 @@ </parameters> <process_variables> <process_variable> - <name>concentration</name> + <name>Si</name> <components>1</components> <order>1</order> <initial_condition>c0</initial_condition> diff --git a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj index 505b3b96bc6..822958182ee 100644 --- a/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj +++ b/Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/surfaceflux_component-transport_cube_1e3.prj @@ -12,7 +12,7 @@ <type>ComponentTransport</type> <integration_order>2</integration_order> <process_variables> - <concentration>concentration</concentration> + <concentration>Si</concentration> <pressure>pressure</pressure> </process_variables> <fluid> @@ -44,9 +44,6 @@ </porous_medium> </porous_medium> <fluid_reference_density>rho_fluid</fluid_reference_density> - <solute_dispersivity_longitudinal>beta_l</solute_dispersivity_longitudinal> - <solute_dispersivity_transverse>beta_t</solute_dispersivity_transverse> - <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient> <retardation_factor>retardation</retardation_factor> <decay_rate>decay</decay_rate> <specific_body_force>0 0 0</specific_body_force> @@ -60,6 +57,39 @@ </calculatesurfaceflux> </process> </processes> + <media> + <medium id="0"> + <phases> + <phase> + <type>AqueousLiquid</type> + <components> + <component> + <name>Si</name> + <properties> + <property> + <name>molecular_diffusion</name> + <type>Constant</type> + <value>1</value> + </property> + </properties> + </component> + </components> + </phase> + </phases> + <properties> + <property> + <name>longitudinal_dispersivity</name> + <type>Constant</type> + <value>0</value> + </property> + <property> + <name>transversal_dispersivity</name> + <type>Constant</type> + <value>1</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="hc"> @@ -100,7 +130,7 @@ <mesh>cube_1x1x1_hex_1e3_right</mesh> </meshes> <variables> - <variable>concentration</variable> + <variable>Si</variable> <variable>pressure</variable> <variable>darcy_velocity</variable> </variables> @@ -122,11 +152,6 @@ <type>Constant</type> <value>1000</value> </parameter> - <parameter> - <name>Dm</name> - <type>Constant</type> - <value>1</value> - </parameter> <parameter> <name>retardation</name> <type>Constant</type> @@ -137,16 +162,6 @@ <type>Constant</type> <value>0</value> </parameter> - <parameter> - <name>beta_l</name> - <type>Constant</type> - <value>0</value> - </parameter> - <parameter> - <name>beta_t</name> - <type>Constant</type> - <value>1</value> - </parameter> <parameter> <name>c0</name> <type>Constant</type> @@ -180,7 +195,7 @@ </parameters> <process_variables> <process_variable> - <name>concentration</name> + <name>Si</name> <components>1</components> <order>1</order> <initial_condition>c0</initial_condition> diff --git a/Tests/Data/Parabolic/ComponentTransport/VariableNeumannBoundary/vdbc_input.prj b/Tests/Data/Parabolic/ComponentTransport/VariableNeumannBoundary/vdbc_input.prj index ab9271e504c..46fed65132e 100644 --- a/Tests/Data/Parabolic/ComponentTransport/VariableNeumannBoundary/vdbc_input.prj +++ b/Tests/Data/Parabolic/ComponentTransport/VariableNeumannBoundary/vdbc_input.prj @@ -11,7 +11,7 @@ <type>ComponentTransport</type> <integration_order>2</integration_order> <process_variables> - <concentration>concentration</concentration> + <concentration>Si</concentration> <pressure>pressure</pressure> </process_variables> <fluid> @@ -41,9 +41,6 @@ </porous_medium> </porous_medium> <fluid_reference_density>rho_fluid</fluid_reference_density> - <solute_dispersivity_longitudinal>beta_l</solute_dispersivity_longitudinal> - <solute_dispersivity_transverse>beta_t</solute_dispersivity_transverse> - <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient> <retardation_factor>retardation</retardation_factor> <decay_rate>decay</decay_rate> <specific_body_force>0 0</specific_body_force> @@ -52,6 +49,39 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases> + <phase> + <type>AqueousLiquid</type> + <components> + <component> + <name>Si</name> + <properties> + <property> + <name>molecular_diffusion</name> + <type>Constant</type> + <value>0</value> + </property> + </properties> + </component> + </components> + </phase> + </phases> + <properties> + <property> + <name>longitudinal_dispersivity</name> + <type>Constant</type> + <value>0</value> + </property> + <property> + <name>transversal_dispersivity</name> + <type>Constant</type> + <value>0</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="hc"> @@ -107,7 +137,7 @@ </pair> </timesteps> <variables> - <variable>concentration</variable> + <variable>Si</variable> <variable>pressure</variable> <variable>darcy_velocity</variable> </variables> @@ -119,11 +149,6 @@ <type>Constant</type> <value>1000</value> </parameter> - <parameter> - <name>Dm</name> - <type>Constant</type> - <value>0</value> - </parameter> <parameter> <name>retardation</name> <type>Constant</type> @@ -134,16 +159,6 @@ <type>Constant</type> <value>0</value> </parameter> - <parameter> - <name>beta_l</name> - <type>Constant</type> - <value>0</value> - </parameter> - <parameter> - <name>beta_t</name> - <type>Constant</type> - <value>0</value> - </parameter> <parameter> <name>c_ini</name> <type>MeshNode</type> @@ -167,7 +182,7 @@ </parameters> <process_variables> <process_variable> - <name>concentration</name> + <name>Si</name> <components>1</components> <order>1</order> <initial_condition>c_ini</initial_condition> diff --git a/Tests/Data/Parabolic/ComponentTransport/elder/elder-python.prj b/Tests/Data/Parabolic/ComponentTransport/elder/elder-python.prj index 9431fff6f57..58293fa3bc3 100644 --- a/Tests/Data/Parabolic/ComponentTransport/elder/elder-python.prj +++ b/Tests/Data/Parabolic/ComponentTransport/elder/elder-python.prj @@ -11,7 +11,7 @@ <type>ComponentTransport</type> <integration_order>2</integration_order> <process_variables> - <concentration>conc</concentration> + <concentration>Si</concentration> <pressure>pressure</pressure> </process_variables> <fluid> @@ -45,15 +45,45 @@ <decay_rate>decay_rate</decay_rate> <fluid_reference_density>rho_fluid</fluid_reference_density> <retardation_factor>retardation_factor</retardation_factor> - <solute_dispersivity_longitudinal>alpha_l</solute_dispersivity_longitudinal> - <solute_dispersivity_transverse>alpha_t</solute_dispersivity_transverse> - <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient> <specific_body_force>0 0 -9.81</specific_body_force> <secondary_variables> <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/> </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases> + <phase> + <type>AqueousLiquid</type> + <components> + <component> + <name>Si</name> + <properties> + <property> + <name>molecular_diffusion</name> + <type>Constant</type> + <value>3.57e-6</value> + </property> + </properties> + </component> + </components> + </phase> + </phases> + <properties> + <property> + <name>longitudinal_dispersivity</name> + <type>Constant</type> + <value>0</value> + </property> + <property> + <name>transversal_dispersivity</name> + <type>Constant</type> + <value>0</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="HC"> @@ -89,7 +119,7 @@ </pair> </timesteps> <variables> - <variable>conc</variable> + <variable>Si</variable> <variable>pressure</variable> <variable>darcy_velocity</variable> </variables> @@ -101,21 +131,6 @@ <type>Constant</type> <value>1000.0</value> </parameter> - <parameter> - <name>alpha_l</name> - <type>Constant</type> - <value>0</value> - </parameter> - <parameter> - <name>alpha_t</name> - <type>Constant</type> - <value>0</value> - </parameter> - <parameter> - <name>Dm</name> - <type>Constant</type> - <value>3.57e-6</value> - </parameter> <parameter> <name>decay_rate</name> <type>Constant</type> @@ -149,7 +164,7 @@ </parameters> <process_variables> <process_variable> - <name>conc</name> + <name>Si</name> <components>1</components> <order>1</order> <initial_condition>c_ini</initial_condition> diff --git a/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj b/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj index 8b6d7c0b7d2..c26dc329656 100644 --- a/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj +++ b/Tests/Data/Parabolic/ComponentTransport/elder/elder.prj @@ -8,7 +8,7 @@ <type>ComponentTransport</type> <integration_order>2</integration_order> <process_variables> - <concentration>conc</concentration> + <concentration>Si</concentration> <pressure>pressure</pressure> </process_variables> <fluid> @@ -46,15 +46,45 @@ <decay_rate>decay_rate</decay_rate> <fluid_reference_density>rho_fluid</fluid_reference_density> <retardation_factor>retardation_factor</retardation_factor> - <solute_dispersivity_longitudinal>alpha_l</solute_dispersivity_longitudinal> - <solute_dispersivity_transverse>alpha_t</solute_dispersivity_transverse> - <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient> <specific_body_force>0 0 -9.81</specific_body_force> <secondary_variables> <secondary_variable type="static" internal_name="darcy_velocity" output_name="darcy_velocity"/> </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases> + <phase> + <type>AqueousLiquid</type> + <components> + <component> + <name>Si</name> + <properties> + <property> + <name>molecular_diffusion</name> + <type>Constant</type> + <value>3.57e-6</value> + </property> + </properties> + </component> + </components> + </phase> + </phases> + <properties> + <property> + <name>longitudinal_dispersivity</name> + <type>Constant</type> + <value>0</value> + </property> + <property> + <name>transversal_dispersivity</name> + <type>Constant</type> + <value>0</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="HC"> @@ -93,7 +123,7 @@ </pair> </timesteps> <variables> - <variable>conc</variable> + <variable>Si</variable> <variable>pressure</variable> <variable>darcy_velocity</variable> </variables> @@ -105,21 +135,6 @@ <type>Constant</type> <value>1000.0</value> </parameter> - <parameter> - <name>alpha_l</name> - <type>Constant</type> - <value>0</value> - </parameter> - <parameter> - <name>alpha_t</name> - <type>Constant</type> - <value>0</value> - </parameter> - <parameter> - <name>Dm</name> - <type>Constant</type> - <value>3.57e-6</value> - </parameter> <parameter> <name>decay_rate</name> <type>Constant</type> @@ -176,7 +191,7 @@ </parameters> <process_variables> <process_variable> - <name>conc</name> + <name>Si</name> <components>1</components> <order>1</order> <initial_condition>c_ini</initial_condition> diff --git a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj index 1d36fa6fee6..0609c824eea 100644 --- a/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj +++ b/Tests/Data/Parabolic/ComponentTransport/goswami/goswami_input.prj @@ -11,7 +11,7 @@ <type>ComponentTransport</type> <integration_order>2</integration_order> <process_variables> - <concentration>concentration</concentration> + <concentration>Si</concentration> <pressure>pressure</pressure> </process_variables> <fluid> @@ -43,9 +43,6 @@ </porous_medium> </porous_medium> <fluid_reference_density>rho_fluid</fluid_reference_density> - <solute_dispersivity_longitudinal>beta_l</solute_dispersivity_longitudinal> - <solute_dispersivity_transverse>beta_t</solute_dispersivity_transverse> - <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient> <retardation_factor>retardation</retardation_factor> <decay_rate>decay</decay_rate> <specific_body_force>0 -9.81</specific_body_force> @@ -54,6 +51,39 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases> + <phase> + <type>AqueousLiquid</type> + <components> + <component> + <name>Si</name> + <properties> + <property> + <name>molecular_diffusion</name> + <type>Constant</type> + <value>0</value> + </property> + </properties> + </component> + </components> + </phase> + </phases> + <properties> + <property> + <name>longitudinal_dispersivity</name> + <type>Constant</type> + <value>5e-3</value> + </property> + <property> + <name>transversal_dispersivity</name> + <type>Constant</type> + <value>0.0005</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="ComponentTransport"> @@ -109,7 +139,7 @@ </pair> </timesteps> <variables> - <variable>concentration</variable> + <variable>Si</variable> <variable>pressure</variable> <variable>darcy_velocity</variable> </variables> @@ -121,11 +151,6 @@ <type>Constant</type> <value>1000</value> </parameter> - <parameter> - <name>Dm</name> - <type>Constant</type> - <value>0</value> - </parameter> <parameter> <name>retardation</name> <type>Constant</type> @@ -136,16 +161,6 @@ <type>Constant</type> <value>0</value> </parameter> - <parameter> - <name>beta_l</name> - <type>Constant</type> - <value>5e-3</value> - </parameter> - <parameter> - <name>beta_t</name> - <type>Constant</type> - <value>0.0005</value> - </parameter> <parameter> <name>c_ini</name> <type>MeshNode</type> @@ -169,7 +184,7 @@ </parameters> <process_variables> <process_variable> - <name>concentration</name> + <name>Si</name> <components>1</components> <order>1</order> <initial_condition>c_ini</initial_condition> diff --git a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_2D/ogs5_H_2d.prj b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_2D/ogs5_H_2d.prj index e326e799b14..856588da760 100644 --- a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_2D/ogs5_H_2d.prj +++ b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_2D/ogs5_H_2d.prj @@ -8,7 +8,7 @@ <type>ComponentTransport</type> <integration_order>2</integration_order> <process_variables> - <concentration>concentration</concentration> + <concentration>Si</concentration> <pressure>pressure</pressure> </process_variables> <fluid> @@ -38,9 +38,6 @@ </porous_medium> </porous_medium> <fluid_reference_density>rho_fluid</fluid_reference_density> - <solute_dispersivity_longitudinal>beta_l</solute_dispersivity_longitudinal> - <solute_dispersivity_transverse>beta_t</solute_dispersivity_transverse> - <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient> <retardation_factor>retardation</retardation_factor> <decay_rate>decay</decay_rate> <specific_body_force>0 0</specific_body_force> @@ -49,6 +46,39 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases> + <phase> + <type>AqueousLiquid</type> + <components> + <component> + <name>Si</name> + <properties> + <property> + <name>molecular_diffusion</name> + <type>Constant</type> + <value>2e-9</value> + </property> + </properties> + </component> + </components> + </phase> + </phases> + <properties> + <property> + <name>longitudinal_dispersivity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>transversal_dispersivity</name> + <type>Constant</type> + <value>0.1</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="hc"> @@ -84,7 +114,7 @@ </pair> </timesteps> <variables> - <variable>concentration</variable> + <variable>Si</variable> <variable>pressure</variable> <variable>darcy_velocity</variable> </variables> @@ -96,11 +126,6 @@ <type>Constant</type> <value>1000</value> </parameter> - <parameter> - <name>Dm</name> - <type>Constant</type> - <value>2e-9</value> - </parameter> <parameter> <name>retardation</name> <type>Constant</type> @@ -111,16 +136,6 @@ <type>Constant</type> <value>0</value> </parameter> - <parameter> - <name>beta_l</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>beta_t</name> - <type>Constant</type> - <value>0.1</value> - </parameter> <parameter> <name>c1</name> <type>Constant</type> @@ -161,7 +176,7 @@ </parameters> <process_variables> <process_variable> - <name>concentration</name> + <name>Si</name> <components>1</components> <order>1</order> <initial_condition>c0</initial_condition> diff --git a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj index 0c7c08e1c3a..2e84856f6ce 100644 --- a/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj +++ b/Tests/Data/Parabolic/ComponentTransport/heterogeneous/ogs5_H_3D/ogs5_H_3d.prj @@ -11,7 +11,7 @@ <type>ComponentTransport</type> <integration_order>2</integration_order> <process_variables> - <concentration>concentration</concentration> + <concentration>Si</concentration> <pressure>pressure</pressure> </process_variables> <fluid> @@ -41,9 +41,6 @@ </porous_medium> </porous_medium> <fluid_reference_density>rho_fluid</fluid_reference_density> - <solute_dispersivity_longitudinal>beta_l</solute_dispersivity_longitudinal> - <solute_dispersivity_transverse>beta_t</solute_dispersivity_transverse> - <molecular_diffusion_coefficient>Dm</molecular_diffusion_coefficient> <retardation_factor>retardation</retardation_factor> <decay_rate>decay</decay_rate> <specific_body_force>0 0 -9.81</specific_body_force> @@ -52,6 +49,39 @@ </secondary_variables> </process> </processes> + <media> + <medium id="0"> + <phases> + <phase> + <type>AqueousLiquid</type> + <components> + <component> + <name>Si</name> + <properties> + <property> + <name>molecular_diffusion</name> + <type>Constant</type> + <value>2e-9</value> + </property> + </properties> + </component> + </components> + </phase> + </phases> + <properties> + <property> + <name>longitudinal_dispersivity</name> + <type>Constant</type> + <value>1</value> + </property> + <property> + <name>transversal_dispersivity</name> + <type>Constant</type> + <value>0.1</value> + </property> + </properties> + </medium> + </media> <time_loop> <processes> <process ref="hc"> @@ -87,7 +117,7 @@ </pair> </timesteps> <variables> - <variable>concentration</variable> + <variable>Si</variable> <variable>pressure</variable> <variable>darcy_velocity</variable> </variables> @@ -99,11 +129,6 @@ <type>Constant</type> <value>1000</value> </parameter> - <parameter> - <name>Dm</name> - <type>Constant</type> - <value>2e-9</value> - </parameter> <parameter> <name>retardation</name> <type>Constant</type> @@ -114,16 +139,6 @@ <type>Constant</type> <value>0</value> </parameter> - <parameter> - <name>beta_l</name> - <type>Constant</type> - <value>1</value> - </parameter> - <parameter> - <name>beta_t</name> - <type>Constant</type> - <value>0.1</value> - </parameter> <parameter> <name>c1</name> <type>Constant</type> @@ -169,7 +184,7 @@ </parameters> <process_variables> <process_variable> - <name>concentration</name> + <name>Si</name> <components>1</components> <order>1</order> <initial_condition>c0</initial_condition> -- GitLab