[Test] Added a new test to solve the HT monolithic test with the stag…

…gered scheme

and removed the tests for the staggered scheme from LiquidFlow temporarily.

ProcessLib/HT/Tests.cmake

@@ -8,11 +8,26 @@ AddTest(
     REQUIREMENTS NOT (OGS_USE_LIS OR OGS_USE_MPI)
     ABSTOL 1e-10 RELTOL 1e-16
     DIFF_DATA
-    ThermalConvection_const_viscosity_expected.vtu ConstViscosityThermalConvection_pcs_0_ts_149_t_50000000000.000000.vtu temperature T
+    square_5500x5500.vtu ConstViscosityThermalConvection_pcs_0_ts_149_t_50000000000.000000.vtu T_ref T
     VIS ConstViscosityThermalConvection_pcs_0_ts_149_t_50000000000.000000.vtu
 )
 
-# MPI tests
+AddTest(
+    NAME LARGE_2D_ThermalConvection_constviscosityStaggeredScheme
+    PATH Parabolic/HT/StaggeredCoupling/ConstViscosity
+    EXECUTABLE ogs
+    EXECUTABLE_ARGS square_5500x5500_staggered_scheme.prj
+    WRAPPER time
+    TESTER vtkdiff
+    REQUIREMENTS NOT (OGS_USE_LIS OR OGS_USE_MPI)
+    ABSTOL 1e-10 RELTOL 1.e-9
+    DIFF_DATA
+    square_5500x5500.vtu ConstViscosityThermalConvection_pcs_1_ts_149_t_50000000000.000000.vtu T_ref T
+    square_5500x5500.vtu ConstViscosityThermalConvection_pcs_1_ts_149_t_50000000000.000000.vtu p_ref p
+    VIS ConstViscosityThermalConvection_pcs_1_ts_149_t_50000000000.000000.vtu
+)
+
+# MPI/PETSc tests
 AddTest(
     NAME Parallel_LARGE_2D_ThermalConvection_constviscosity
     PATH Parabolic/HT/ConstViscosity
@@ -32,3 +47,18 @@ AddTest(
     ConstViscosityThermalConvection_pcs_0_ts_149_t_50000000000_000000_2.vtu ConstViscosityThermalConvection_pcs_0_ts_149_t_50000000000_000000_2.vtu T T
     ConstViscosityThermalConvection_pcs_0_ts_149_t_50000000000_000000_3.vtu ConstViscosityThermalConvection_pcs_0_ts_149_t_50000000000_000000_3.vtu T T
 )
+
+AddTest(
+    NAME LARGE_2D_ThermalConvection_constviscosityStaggeredScheme
+    PATH Parabolic/HT/StaggeredCoupling/ConstViscosity
+    EXECUTABLE_ARGS square_5500x5500_staggered_scheme.prj
+    WRAPPER mpirun
+    WRAPPER_ARGS -np 1
+    TESTER vtkdiff
+    REQUIREMENTS OGS_USE_MPI
+    ABSTOL 1e-10 RELTOL 1.e-9
+    DIFF_DATA
+    square_5500x5500.vtu ConstViscosityThermalConvection_pcs_1_ts_149_t_50000000000_000000_0.vtu T_ref T
+    square_5500x5500.vtu ConstViscosityThermalConvection_pcs_1_ts_149_t_50000000000_000000_0.vtu p_ref p
+    VIS ConstViscosityThermalConvection_pcs_1_ts_149_t_50000000000.000000_0.vtu
+)

ProcessLib/LiquidFlow/Tests.cmake

@@ -76,65 +76,6 @@ AddTest(
     hex.vtu isotropic_gravity_driven3D_pcs_0_ts_1_t_1.000000.vtu analytic_pressure pressure
 )
 
-# Coupling
-AddTest(
-    NAME StaggeredTH_ThermalDensityDrivenFlow2D
-    PATH StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D
-    EXECUTABLE ogs
-    EXECUTABLE_ARGS thermal_gravity_driven_flow2d.prj
-    WRAPPER time
-    TESTER vtkdiff
-    REQUIREMENTS NOT OGS_USE_MPI
-    ABSTOL 1.1 RELTOL 1e-7
-    DIFF_DATA
-    mesh2D.vtu gravity_driven_pcs_1_ts_10_t_300.000000.vtu OGS5_PRESSURE1 pressure
-    mesh2D.vtu gravity_driven_pcs_1_ts_10_t_300.000000.vtu OGS5_TEMPERATURE1 temperature
-    mesh2D.vtu gravity_driven_pcs_1_ts_10_t_300.000000.vtu v_ref v
-)
-
-AddTest(
-    NAME Adaptive_dt_StaggeredTH_ThermalDensityDrivenFlow2D
-    PATH StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D
-    EXECUTABLE ogs
-    EXECUTABLE_ARGS thermal_gravity_driven_flow2d_adaptive_dt.prj
-    WRAPPER time
-    TESTER vtkdiff
-    REQUIREMENTS NOT OGS_USE_MPI
-    ABSTOL 1.1 RELTOL 1e-6
-    DIFF_DATA
-    mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_10_t_300.000000.vtu OGS5_PRESSURE1 pressure
-    mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_10_t_300.000000.vtu OGS5_TEMPERATURE1 temperature
-    mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_10_t_300.000000.vtu v_ref v
-)
-
-AddTest(
-    NAME Adaptive_dt_ThermalConvectionFlow2D
-    PATH StaggeredCoupledProcesses/TH/ThermalConvection2D
-    EXECUTABLE ogs
-    EXECUTABLE_ARGS quad_5500x5500_adaptive_dt.prj
-    WRAPPER time
-    TESTER vtkdiff
-    REQUIREMENTS NOT OGS_USE_MPI
-    ABSTOL 1.e-3 RELTOL 1e-10
-    DIFF_DATA
-    ThermalConvection_pcs_1_ts_232_t_50000000000.000000_non_const_mu.vtu  ThermalConvection_pcs_1_ts_223_t_50000000000.000000.vtu  pressure pressure
-    ThermalConvection_pcs_1_ts_232_t_50000000000.000000_non_const_mu.vtu  ThermalConvection_pcs_1_ts_223_t_50000000000.000000.vtu  temperature temperature
-)
-
-AddTest(
-    NAME Adaptive_dt_ThermalConvectionFlow2D_Constant_Viscosity
-    PATH StaggeredCoupledProcesses/TH/ThermalConvection2D
-    EXECUTABLE ogs
-    EXECUTABLE_ARGS quad_5500x5500_adaptive_dt_constant_viscosity.prj
-    WRAPPER time
-    TESTER vtkdiff
-    REQUIREMENTS NOT OGS_USE_MPI
-    ABSTOL 1.e-16 RELTOL 1e-9 ### increased RETOL for the case of lis solver
-    DIFF_DATA
-    ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000.000000.vtu  ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000.000000.vtu  pressure pressure
-    ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000.000000.vtu  ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000.000000.vtu  temperature temperature
-)
-
 #===============================================================================
 # PETSc/MPI
 AddTest(
@@ -212,64 +153,3 @@ AddTest(
     DIFF_DATA
     hex.vtu isotropic_gravity_driven3D_pcs_0_ts_1_t_1_000000_0.vtu analytic_pressure pressure
 )
-
-# Coupling
-AddTest(
-    NAME StaggeredTH_ThermalDensityDrivenFlow2D
-    PATH StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D
-    EXECUTABLE_ARGS thermal_gravity_driven_flow2d.prj
-    WRAPPER mpirun
-    WRAPPER_ARGS -np 1
-    TESTER vtkdiff
-    REQUIREMENTS OGS_USE_MPI
-    ABSTOL 1.1 RELTOL 1e-7
-    DIFF_DATA
-    mesh2D.vtu gravity_driven_pcs_1_ts_10_t_300_000000_0.vtu OGS5_PRESSURE1  pressure
-    mesh2D.vtu gravity_driven_pcs_1_ts_10_t_300_000000_0.vtu OGS5_TEMPERATURE1 temperature
-# To be activated when the output of velocity is correct under PETSc version.
-#    mesh2D.vtu gravity_driven_pcs_1_ts_10_t_300_000000_0.vtu v_ref v
-
-)
-
-AddTest(
-    NAME Adaptive_dt_StaggeredTH_ThermalDensityDrivenFlow2D
-    PATH StaggeredCoupledProcesses/TH/ThermalDensityDrivenFlow2D
-    EXECUTABLE_ARGS thermal_gravity_driven_flow2d_adaptive_dt.prj
-    WRAPPER mpirun
-    WRAPPER_ARGS -np 1
-    TESTER vtkdiff
-    REQUIREMENTS OGS_USE_MPI
-    ABSTOL 1.1 RELTOL 1e-7
-    DIFF_DATA
-    mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_10_t_300_000000_0.vtu OGS5_PRESSURE1 pressure
-    mesh2D.vtu gravity_driven_adaptive_dt_pcs_1_ts_10_t_300_000000_0.vtu OGS5_TEMPERATURE1 temperature
-# To be activated when the output of velocity is correct under PETSc version.
-#    mesh2D.vtu gravity_driven_pcs_1_ts_5_t_300_000000_0.vtu v_ref v
-)
-AddTest(
-    NAME Adaptive_dt_ThermalConvectionFlow2D
-    PATH StaggeredCoupledProcesses/TH/ThermalConvection2D
-    EXECUTABLE_ARGS quad_5500x5500_adaptive_dt.prj
-    WRAPPER mpirun
-    WRAPPER_ARGS -np 1
-    TESTER vtkdiff
-    REQUIREMENTS OGS_USE_MPI
-    ABSTOL 1.e-3 RELTOL 1e-10
-    DIFF_DATA
-    ThermalConvection_pcs_1_ts_232_t_50000000000.000000_non_const_mu.vtu  ThermalConvection_pcs_1_ts_223_t_50000000000_000000_0.vtu  pressure pressure
-    ThermalConvection_pcs_1_ts_232_t_50000000000.000000_non_const_mu.vtu  ThermalConvection_pcs_1_ts_223_t_50000000000_000000_0.vtu  temperature temperature
-)
-
-AddTest(
-    NAME Adaptive_dt_ThermalConvectionFlow2D_Constant_Viscosity
-    PATH StaggeredCoupledProcesses/TH/ThermalConvection2D
-    EXECUTABLE_ARGS quad_5500x5500_adaptive_dt_constant_viscosity.prj
-    WRAPPER mpirun
-    WRAPPER_ARGS -np 1
-    TESTER vtkdiff
-    REQUIREMENTS OGS_USE_MPI
-    ABSTOL 1.e-9 RELTOL 1e-9
-    DIFF_DATA
-    ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000.000000.vtu  ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000_000000_0.vtu  pressure pressure
-    ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000.000000.vtu  ConstViscosityThermalConvection_pcs_1_ts_137_t_50000000000_000000_0.vtu  temperature temperature
-)