Merge branch 'master' of https://github.com/INMOST-DEV/INMOST

.gitignore

@@ -5,7 +5,7 @@ SyncToy*
 
 *.iml
 
-*.xml
+.idea/*.xml
 
 Source/Solver/solver_fcbiilu2/fcbiilu2.cpp
 

Examples/MatSolve/database.txt

-PETSc: petsc_options.txt
-Trilinos_Ifpack: trilinos_ifpack_options.xml
-Trilinos_ML: 
-Trilinos_Aztec: 
-Trilinos_Belos: 
-FCBIILU2: ctrl_dat
-K3BIILU2: ctrl_dat
-inner_ilu2: inner_options.txt

Examples/MatSolve/database.xml

+<SolverParameters>
+    <inner_ilu2>
+        <test file="inner_options.txt" />
+    </inner_ilu2>
+    <inner_ddpqiluc2>
+        <test file="inner_options.txt" />
+    </inner_ddpqiluc2>
+    <inner_mptiluc>
+        <test file="inner_options.txt" />
+    </inner_mptiluc>
+    <inner_mptilu2>
+        <test file="inner_options.txt" />
+    </inner_mptilu2>
+    <fcbiilu2>
+        <test file="ctrl_dat" />
+    </fcbiilu2>
+    <k3biilu2>
+        <test file="ctrl_dat" />
+    </k3biilu2>
+    <petsc>
+        <test file="petsc_options.txt" />
+    </petsc>
+    <trilinos_ifpack>
+        <test file="trilinos_ifpack_options.xml" />
+    </trilinos_ifpack>
+</SolverParameters>
\ No newline at end of file

Examples/Solver/database.txt

-PETSc: petsc_options.txt
-Trilinos_Ifpack: trilinos_ifpack_options.xml
-Trilinos_ML: 
-Trilinos_Aztec: 
-Trilinos_Belos: 
-

Examples/Solver/database.xml

+<SolverParameters>
+    <inner_ilu2>
+        <test file="inner_options.txt" />
+    </inner_ilu2>
+    <inner_ddpqiluc2>
+        <test file="inner_options.txt" />
+    </inner_ddpqiluc2>
+    <inner_mptiluc>
+        <test file="inner_options.txt" />
+    </inner_mptiluc>
+    <inner_mptilu2>
+        <test file="inner_options.txt" />
+    </inner_mptilu2>
+    <fcbiilu2>
+        <test file="ctrl_dat" />
+    </fcbiilu2>
+    <k3biilu2>
+        <test file="ctrl_dat" />
+    </k3biilu2>
+    <petsc>
+        <test file="petsc_options.txt" />
+    </petsc>
+    <trilinos_ifpack>
+        <test file="trilinos_ifpack_options.xml" />
+    </trilinos_ifpack>
+</SolverParameters>
\ No newline at end of file

Examples/Solver/inner_options.txt

+maximum_iterations 300
+gmres_substeps 4
+relative_tolerance 1.0e-5
+absolute_tolerance 1.0e-10
+divergence_tolerance 1e+200
+
+reorder_nonzeros 0
+rescale_iterations 8
+adapt_ddpq_tolerance 0
+
+drop_tolerance 3.0e-5
+reuse_tolerance 1.0e-5
+ddpq_tolerance 0.0
+
+condition_estimation 1
+schwartz_overlap 6

Examples/Solver/main.cpp

@@ -147,7 +147,7 @@ Storage::real tensor_K_mat_rotOxy(Storage::integer mat)
 int main(int argc,char ** argv)
 {
     Mesh::Initialize(&argc,&argv);
-    Solver::Initialize(&argc,&argv,"database.txt");
+    Solver::Initialize(&argc,&argv,"database.xml");
 #if defined(USE_PARTITIONER)
     Partitioner::Initialize(&argc,&argv);
 #endif

Source/Solver/solver_fcbiilu2/SolverFCBIILU2.cpp

@@ -50,7 +50,7 @@ namespace INMOST {
 
     void SolverFCBIILU2::Setup(int *argc, char ***argv, SolverParameters &p) {
         SolverInitDataFcbiilu2(&solver_data, communicator, p.solverPrefix.c_str());
-        solver_data->kovl = 0;    // number of overlap layers: kovl=0,1,2,...
+        solver_data->kovl = 3;    // number of overlap layers: kovl=0,1,2,...
         solver_data->tau = 3e-3;  // the ILU2 precision (for the submatrix factorization); tau=3e-3
         solver_data->eps = 1e-5;  // the residual precision: ||r|| < eps * ||b||; eps=1e-6
         solver_data->nit = 999;   // number of iterations permitted; nit=999

Tests/solver_test000/main.cpp

@@ -11,7 +11,7 @@ int main(int argc,char ** argv)
 	std::string solver = "inner_ilu2";
 	int rank,procs,newrank;
 
-	Solver::Initialize(&argc,&argv,"database.txt"); // Initialize the solver and MPI activity
+	Solver::Initialize(&argc,&argv,"database.xml"); // Initialize the solver and MPI activity
 #if defined(USE_MPI)
 	MPI_Comm_rank(MPI_COMM_WORLD,&rank);  // Get the rank of the current process
 	MPI_Comm_size(MPI_COMM_WORLD,&procs); // Get the total number of processors used