From 66c529686788abdd9e96f99b1d2ebaa1f97ff1db Mon Sep 17 00:00:00 2001
From: Dmitri Naumov <github@naumov.de>
Date: Sun, 16 Feb 2020 15:07:23 +0100
Subject: [PATCH] [T] Move RichardsFlow ctests.
Now the RichardsMechanics process is independent of
the richards flow material classes, the tests also
don't run, because the RichardsFlow process is not
build necessarily.
---
ProcessLib/RichardsFlow/Tests.cmake | 27 ++++++++++++++++++++++++
ProcessLib/RichardsMechanics/Tests.cmake | 25 ----------------------
2 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/ProcessLib/RichardsFlow/Tests.cmake b/ProcessLib/RichardsFlow/Tests.cmake
index 5887ec1c09a..e8e9ba7de94 100644
--- a/ProcessLib/RichardsFlow/Tests.cmake
+++ b/ProcessLib/RichardsFlow/Tests.cmake
@@ -61,6 +61,19 @@ AddTest(
# no longer be ambiguous.
)
+# Comparison test for richards mechanics w/o deformations.
+AddTest(
+ NAME RichardsMechanics_RichardsFlow_2d_richardsflow
+ PATH RichardsMechanics
+ EXECUTABLE ogs
+ EXECUTABLE_ARGS RichardsFlow_2d_richardsflow.prj
+ WRAPPER time
+ TESTER vtkdiff
+ REQUIREMENTS NOT OGS_USE_MPI
+ DIFF_DATA
+ GLOB RichardsFlow_2d_richardsflow_pcs_0_ts_*.vtu pressure pressure 5e-11 1e-15
+ GLOB RichardsFlow_2d_richardsflow_pcs_0_ts_*.vtu saturation saturation 1e-14 1e-15
+)
#PETSc/MPI
AddTest(
NAME 2D_RichardsFlow_h_us_quad_small_PID_adaptive_dt
@@ -74,3 +87,17 @@ AddTest(
DIFF_DATA
ref_t_1600.000000.vtu richards_pcs_0_ts_803_t_1600_000000_0.vtu pressure pressure 1e-8 1e-3
)
+
+# Comparison test for richards mechanics w/o deformations.
+AddTest(
+ NAME Parallel_RichardsMechanics_RichardsFlow_2d_richardsflow
+ PATH RichardsMechanics
+ EXECUTABLE_ARGS RichardsFlow_2d_richardsflow.prj
+ WRAPPER mpirun
+ WRAPPER_ARGS -np 1
+ TESTER vtkdiff
+ REQUIREMENTS OGS_USE_MPI
+ DIFF_DATA
+ RichardsFlow_2d_richardsflow_pcs_0_ts_99_t_1900.000000.vtu RichardsFlow_2d_richardsflow_pcs_0_ts_99_t_1900_000000_0.vtu pressure pressure 5e-8 1e-10
+ RichardsFlow_2d_richardsflow_pcs_0_ts_99_t_1900.000000.vtu RichardsFlow_2d_richardsflow_pcs_0_ts_99_t_1900_000000_0.vtu saturation saturation 1e-10 1e-11
+)
diff --git a/ProcessLib/RichardsMechanics/Tests.cmake b/ProcessLib/RichardsMechanics/Tests.cmake
index 5a9888aba7a..63c0203bab7 100644
--- a/ProcessLib/RichardsMechanics/Tests.cmake
+++ b/ProcessLib/RichardsMechanics/Tests.cmake
@@ -170,18 +170,6 @@ AddTest(
GLOB RichardsFlow_2d_quasinewton_pcs_0_ts_*.vtu HydraulicFlow HydraulicFlow 1e-15 0
GLOB RichardsFlow_2d_quasinewton_pcs_0_ts_*.vtu NodalForces NodalForces 1e-15 0
)
-AddTest(
- NAME RichardsMechanics_RichardsFlow_2d_richardsflow
- PATH RichardsMechanics
- EXECUTABLE ogs
- EXECUTABLE_ARGS RichardsFlow_2d_richardsflow.prj
- WRAPPER time
- TESTER vtkdiff
- REQUIREMENTS NOT OGS_USE_MPI
- DIFF_DATA
- GLOB RichardsFlow_2d_richardsflow_pcs_0_ts_*.vtu pressure pressure 5e-11 1e-15
- GLOB RichardsFlow_2d_richardsflow_pcs_0_ts_*.vtu saturation saturation 1e-14 1e-15
-)
AddTest(
NAME RichardsMechanics_deformation_dependent_porosity
PATH RichardsMechanics
@@ -200,16 +188,3 @@ AddTest(
GLOB deformation_dependent_porosity_pcs_0_ts_*.vtu porosity porosity 5e-14 1e-15
GLOB deformation_dependent_porosity_pcs_0_ts_*.vtu porosity_avg porosity_avg 1e-14 1e-15
)
-#PETSc
-AddTest(
- NAME Parallel_RichardsMechanics_RichardsFlow_2d_richardsflow
- PATH RichardsMechanics
- EXECUTABLE_ARGS RichardsFlow_2d_richardsflow.prj
- WRAPPER mpirun
- WRAPPER_ARGS -np 1
- TESTER vtkdiff
- REQUIREMENTS OGS_USE_MPI
- DIFF_DATA
- RichardsFlow_2d_richardsflow_pcs_0_ts_99_t_1900.000000.vtu RichardsFlow_2d_richardsflow_pcs_0_ts_99_t_1900_000000_0.vtu pressure pressure 5e-8 1e-10
- RichardsFlow_2d_richardsflow_pcs_0_ts_99_t_1900.000000.vtu RichardsFlow_2d_richardsflow_pcs_0_ts_99_t_1900_000000_0.vtu saturation saturation 1e-10 1e-11
-)
--
GitLab