diff --git a/ProcessLib/ComponentTransport/Tests.cmake b/ProcessLib/ComponentTransport/Tests.cmake index 965fe2438da09bfa637d5126dbb4fa6bb5f760c9..ee88567aba5470f51552eba934326f84f99907ea 100644 --- a/ProcessLib/ComponentTransport/Tests.cmake +++ b/ProcessLib/ComponentTransport/Tests.cmake @@ -1117,41 +1117,9 @@ AddTest( RUNTIME 20 ) -AddTest( - NAME 1D_ReactiveMassTransport_KineticReactantBlockTest_AllAsComponents - PATH Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents - EXECUTABLE ogs - EXECUTABLE_ARGS KineticReactant2.prj - WRAPPER time - TESTER vtkdiff - REQUIREMENTS NOT OGS_USE_MPI - DIFF_DATA - KineticReactant2_ts_42_t_4200.000000_expected.vtu KineticReactant2_ts_42_t_4200.000000.vtu pressure pressure 1e-6 1e-10 - KineticReactant2_ts_84_t_8400.000000_expected.vtu KineticReactant2_ts_84_t_8400.000000.vtu pressure pressure 1e-6 1e-10 - KineticReactant2_ts_126_t_12600.000000_expected.vtu KineticReactant2_ts_126_t_12600.000000.vtu pressure pressure 1e-6 1e-10 - KineticReactant2_ts_168_t_16800.000000_expected.vtu KineticReactant2_ts_168_t_16800.000000.vtu pressure pressure 1e-6 1e-10 - KineticReactant2_ts_210_t_21000.000000_expected.vtu KineticReactant2_ts_210_t_21000.000000.vtu pressure pressure 1e-6 1e-10 - KineticReactant2_ts_42_t_4200.000000_expected.vtu KineticReactant2_ts_42_t_4200.000000.vtu Synthetica Synthetica 1e-10 1e-16 - KineticReactant2_ts_84_t_8400.000000_expected.vtu KineticReactant2_ts_84_t_8400.000000.vtu Synthetica Synthetica 1e-10 1e-16 - KineticReactant2_ts_126_t_12600.000000_expected.vtu KineticReactant2_ts_126_t_12600.000000.vtu Synthetica Synthetica 1e-10 1e-16 - KineticReactant2_ts_168_t_16800.000000_expected.vtu KineticReactant2_ts_168_t_16800.000000.vtu Synthetica Synthetica 1e-10 1e-16 - KineticReactant2_ts_210_t_21000.000000_expected.vtu KineticReactant2_ts_210_t_21000.000000.vtu Synthetica Synthetica 1e-10 1e-16 - KineticReactant2_ts_42_t_4200.000000_expected.vtu KineticReactant2_ts_42_t_4200.000000.vtu Syntheticb Syntheticb 1e-10 1e-16 - KineticReactant2_ts_84_t_8400.000000_expected.vtu KineticReactant2_ts_84_t_8400.000000.vtu Syntheticb Syntheticb 1e-10 1e-16 - KineticReactant2_ts_126_t_12600.000000_expected.vtu KineticReactant2_ts_126_t_12600.000000.vtu Syntheticb Syntheticb 1e-10 1e-16 - KineticReactant2_ts_168_t_16800.000000_expected.vtu KineticReactant2_ts_168_t_16800.000000.vtu Syntheticb Syntheticb 1e-10 1e-16 - KineticReactant2_ts_210_t_21000.000000_expected.vtu KineticReactant2_ts_210_t_21000.000000.vtu Syntheticb Syntheticb 1e-10 1e-16 - KineticReactant2_ts_42_t_4200.000000_expected.vtu KineticReactant2_ts_42_t_4200.000000.vtu Productd Productd 1e-10 1e-16 - KineticReactant2_ts_84_t_8400.000000_expected.vtu KineticReactant2_ts_84_t_8400.000000.vtu Productd Productd 1e-10 1e-16 - KineticReactant2_ts_126_t_12600.000000_expected.vtu KineticReactant2_ts_126_t_12600.000000.vtu Productd Productd 1e-10 1e-16 - KineticReactant2_ts_168_t_16800.000000_expected.vtu KineticReactant2_ts_168_t_16800.000000.vtu Productd Productd 1e-10 1e-16 - KineticReactant2_ts_210_t_21000.000000_expected.vtu KineticReactant2_ts_210_t_21000.000000.vtu Productd Productd 1e-10 1e-16 - KineticReactant2_ts_42_t_4200.000000_expected.vtu KineticReactant2_ts_42_t_4200.000000.vtu H H 1e-10 1e-16 - KineticReactant2_ts_84_t_8400.000000_expected.vtu KineticReactant2_ts_84_t_8400.000000.vtu H H 1e-10 1e-16 - KineticReactant2_ts_126_t_12600.000000_expected.vtu KineticReactant2_ts_126_t_12600.000000.vtu H H 1e-10 1e-16 - KineticReactant2_ts_168_t_16800.000000_expected.vtu KineticReactant2_ts_168_t_16800.000000.vtu H H 1e-10 1e-16 - KineticReactant2_ts_210_t_21000.000000_expected.vtu KineticReactant2_ts_210_t_21000.000000.vtu H H 1e-10 1e-16 -) +if (NOT OGS_USE_MPI) + OgsTest(PROJECTFILE Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2.prj) +endif() AddTest( NAME LARGE_2D_ReactiveMassTransport_Phreeqc_KineticReactantBlockTest_AllAsComponents diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2.prj b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2.prj index 6b9ee2368b0ac3d3b89944255299a35b44d66703..497199976d1f7ae7814db2030921db76f44fc89a 100644 --- a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2.prj +++ b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2.prj @@ -540,4 +540,36 @@ </petsc--> </linear_solver> </linear_solvers> + <test_definition> + <vtkdiff> + <regex>KineticReactant2_ts_[0-9]*_t_[0-9]*.000000.vtu</regex> + <field>pressure</field> + <absolute_tolerance>1e-6</absolute_tolerance> + <relative_tolerance>1e-10</relative_tolerance> + </vtkdiff> + <vtkdiff> + <regex>KineticReactant2_ts_[0-9]*_t_[0-9]*.000000.vtu</regex> + <field>Synthetica</field> + <absolute_tolerance>1e-10</absolute_tolerance> + <relative_tolerance>1e-16</relative_tolerance> + </vtkdiff> + <vtkdiff> + <regex>KineticReactant2_ts_[0-9]*_t_[0-9]*.000000.vtu</regex> + <field>Syntheticb</field> + <absolute_tolerance>1e-10</absolute_tolerance> + <relative_tolerance>1e-16</relative_tolerance> + </vtkdiff> + <vtkdiff> + <regex>KineticReactant2_ts_[0-9]*_t_[0-9]*.000000.vtu</regex> + <field>Productd</field> + <absolute_tolerance>1e-10</absolute_tolerance> + <relative_tolerance>1e-16</relative_tolerance> + </vtkdiff> + <vtkdiff> + <regex>KineticReactant2_ts_[0-9]*_t_[0-9]*.000000.vtu</regex> + <field>H</field> + <absolute_tolerance>1e-10</absolute_tolerance> + <relative_tolerance>1e-16</relative_tolerance> + </vtkdiff> + </test_definition> </OpenGeoSysProject> diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_0_t_0.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_0_t_0.000000.vtu similarity index 100% rename from Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_0_t_0.000000_expected.vtu rename to Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_0_t_0.000000.vtu diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_126_t_12600.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_126_t_12600.000000.vtu similarity index 100% rename from Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_126_t_12600.000000_expected.vtu rename to Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_126_t_12600.000000.vtu diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_168_t_16800.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_168_t_16800.000000.vtu similarity index 100% rename from Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_168_t_16800.000000_expected.vtu rename to Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_168_t_16800.000000.vtu diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_210_t_21000.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_210_t_21000.000000.vtu similarity index 100% rename from Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_210_t_21000.000000_expected.vtu rename to Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_210_t_21000.000000.vtu diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_42_t_4200.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_42_t_4200.000000.vtu similarity index 100% rename from Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_42_t_4200.000000_expected.vtu rename to Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_42_t_4200.000000.vtu diff --git a/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_84_t_8400.000000_expected.vtu b/Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_84_t_8400.000000.vtu similarity index 100% rename from Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_84_t_8400.000000_expected.vtu rename to Tests/Data/Parabolic/ComponentTransport/ReactiveTransport/KineticReactant_AllAsComponents/KineticReactant2_ts_84_t_8400.000000.vtu