From cd94abd55c3ed810ac911c019726f20bba0e1167 Mon Sep 17 00:00:00 2001
From: Wenqing Wang <wenqing.wang@ufz.de>
Date: Thu, 11 Jan 2018 16:21:08 +0100
Subject: [PATCH] [Test] Modified the project files and some parameter
documentations
---
.../convergence_criteria/i_convergence_criteria.md | 4 ++--
.../convergence_criteria/t_convergence_criterion.md | 2 +-
.../InjectionProduction1D/InjectionProduction1D.prj | 8 +++-----
.../InjectionProduction1DMono.prj | 6 ++----
4 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/Documentation/ProjectFile/prj/time_loop/global_process_coupling/convergence_criteria/i_convergence_criteria.md b/Documentation/ProjectFile/prj/time_loop/global_process_coupling/convergence_criteria/i_convergence_criteria.md
index cc1a434ed44..e9c1a0d5361 100644
--- a/Documentation/ProjectFile/prj/time_loop/global_process_coupling/convergence_criteria/i_convergence_criteria.md
+++ b/Documentation/ProjectFile/prj/time_loop/global_process_coupling/convergence_criteria/i_convergence_criteria.md
@@ -1,2 +1,2 @@
-Defines the convergence criteria of the global un-coupling loop of the staggered
- scheme.
+Defines the convergence criteria of all coupled processes in the staggered
+ scheme.
\ No newline at end of file
diff --git a/Documentation/ProjectFile/prj/time_loop/global_process_coupling/convergence_criteria/t_convergence_criterion.md b/Documentation/ProjectFile/prj/time_loop/global_process_coupling/convergence_criteria/t_convergence_criterion.md
index 5c47ba5b296..dc4ea7fcf43 100644
--- a/Documentation/ProjectFile/prj/time_loop/global_process_coupling/convergence_criteria/t_convergence_criterion.md
+++ b/Documentation/ProjectFile/prj/time_loop/global_process_coupling/convergence_criteria/t_convergence_criterion.md
@@ -1 +1 @@
-Defines the convergence criterion for each weakly coupled process.
+Defines the convergence criterion of each process in the staggered scheme.
\ No newline at end of file
diff --git a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D.prj b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D.prj
index 549ddabebae..f31d7d4408e 100644
--- a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D.prj
+++ b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/InjectionProduction1D.prj
@@ -4,7 +4,7 @@
<geometry>bar.gml</geometry>
<processes>
<process>
- <name>HM</name>
+ <name>InjectionProduction1D</name>
<type>HYDRO_MECHANICS</type>
<coupling_scheme>staggered</coupling_scheme>
<integration_order>3</integration_order>
@@ -60,7 +60,7 @@
<processes>
<!--For the equations of pressure-->
- <process ref="HM">
+ <process ref="InjectionProduction1D">
<nonlinear_solver>basic_newton_p</nonlinear_solver>
<convergence_criterion>
<type>DeltaX</type>
@@ -89,7 +89,7 @@
</time_stepping>
</process>
<!--For the equations of deformation-->
- <process ref="HM">
+ <process ref="InjectionProduction1D">
<nonlinear_solver>basic_newton_u</nonlinear_solver>
<convergence_criterion>
<type>DeltaX</type>
@@ -274,7 +274,6 @@
<linear_solvers>
<linear_solver>
<name>linear_solver_p</name>
- <lis>-i bicg -p jacobi -tol 1e-10 -maxiter 10000</lis>
<eigen>
<solver_type>CG</solver_type>
<precon_type>DIAGONAL</precon_type>
@@ -284,7 +283,6 @@
</linear_solver>
<linear_solver>
<name>linear_solver_u</name>
- <lis>-i bicg -p jacobi -tol 1e-16 -maxiter 10000</lis>
<eigen>
<solver_type>BiCGSTAB</solver_type>
<precon_type>ILUT</precon_type>
diff --git a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/RerefenceSolutionByMonolithicScheme/InjectionProduction1DMono.prj b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/RerefenceSolutionByMonolithicScheme/InjectionProduction1DMono.prj
index 784afa746b5..08315700ec8 100644
--- a/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/RerefenceSolutionByMonolithicScheme/InjectionProduction1DMono.prj
+++ b/Tests/Data/HydroMechanics/StaggeredScheme/InjectionProduction1D/RerefenceSolutionByMonolithicScheme/InjectionProduction1DMono.prj
@@ -4,7 +4,7 @@
<geometry>bar.gml</geometry>
<processes>
<process>
- <name>HM</name>
+ <name>InjectionProduction1D</name>
<type>HYDRO_MECHANICS</type>
<integration_order>3</integration_order>
<dimension>2</dimension>
@@ -41,7 +41,7 @@
<time_loop>
<processes>
<!--For the equations of deformation-->
- <process ref="HM">
+ <process ref="InjectionProduction1D">
<nonlinear_solver>basic_newton_u</nonlinear_solver>
<convergence_criterion>
<type>DeltaX</type>
@@ -228,7 +228,6 @@
<linear_solvers>
<linear_solver>
<name>linear_solver_p</name>
- <lis>-i bicg -p jacobi -tol 1e-10 -maxiter 10000</lis>
<eigen>
<solver_type>CG</solver_type>
<precon_type>DIAGONAL</precon_type>
@@ -238,7 +237,6 @@
</linear_solver>
<linear_solver>
<name>linear_solver_u</name>
- <lis>-i bicg -p jacobi -tol 1e-16 -maxiter 10000</lis>
<eigen>
<solver_type>BiCGSTAB</solver_type>
<precon_type>ILUT</precon_type>
--
GitLab