Update lis version 2.1.6

TLCFEM · Sep 20, 2024 · 4f15a90 · 4f15a90
1 parent 6d753aa
commit 4f15a90
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/Include/lis/lis.h b/Include/lis/lis.h
@@ -33,7 +33,7 @@ extern "C" {
 #endif
 
 /**************************************/
-#define LIS_VERSION	"2.1.3"
+#define LIS_VERSION "2.1.6"
 /**************************************/
 #include <stdio.h>
 #ifdef USE_COMPLEX

diff --git a/README.md b/README.md
@@ -278,7 +278,7 @@ Additional libraries used in **suanPan** are listed as follows.
 - [**SuperLU**](https://portal.nersc.gov/project/sparse/superlu/) version 6.0.1
 - [**SuperLU MT**](https://portal.nersc.gov/project/sparse/superlu/) version 3.1
 - [**OpenBLAS**](https://github.com/xianyi/OpenBLAS) version 0.3.28
-- [**Lis**](https://www.ssisc.org/lis/) version 2.1.3
+- [**Lis**](https://www.ssisc.org/lis/) version 2.1.6
 - [**TBB** Threading Building Blocks](https://github.com/oneapi-src/oneTBB) version 2021.12.0
 - [**HDF5**](https://www.hdfgroup.org/solutions/hdf5/) version 1.10.6
 - [**MUMPS**](https://mumps-solver.org/) version 5.7.3

diff --git a/Toolbox/lis-src/include/lis.h b/Toolbox/lis-src/include/lis.h
@@ -33,7 +33,7 @@ extern "C" {
 #endif
 
 /**************************************/
-#define LIS_VERSION	"2.1.3"
+#define LIS_VERSION "2.1.6"
 /**************************************/
 #include <stdio.h>
 #ifdef USE_COMPLEX

diff --git a/Toolbox/lis-src/precon/lis_precon_saamg.c b/Toolbox/lis-src/precon/lis_precon_saamg.c
@@ -91,7 +91,9 @@ LIS_INT lis_precon_create_saamg(LIS_SOLVER solver, LIS_PRECON precon) {
 	LIS_COMMTABLE table;
 	LIS_INT	unsym,sol;
 	LIS_INT	err;
-	LIS_REAL theta; 
+    LIS_REAL theta;
+    LIS_INT converted = LIS_FALSE;
+
 #ifdef USE_MPI
 		LIS_MPI_Fint comm;
 #endif
@@ -107,11 +109,10 @@ LIS_INT lis_precon_create_saamg(LIS_SOLVER solver, LIS_PRECON precon) {
 		err = lis_matrix_convert(A,B);
 		if( err ) return err;
 		solver->A = B;
-		lis_matrix_destroy(B);
-		solver->A = A;
-	}
-	precon->A       = solver->A;
-	precon->is_copy = LIS_FALSE;
+        converted = LIS_TRUE;
+    }
+    precon->A = solver->A;
+    precon->is_copy = LIS_FALSE;
 	A               = precon->A;
 	sol             = solver->options[LIS_OPTIONS_SOLVER];
 	unsym           = solver->options[LIS_OPTIONS_SAAMG_UNSYM];
@@ -176,8 +177,13 @@ LIS_INT lis_precon_create_saamg(LIS_SOLVER solver, LIS_PRECON precon) {
 		}
 #endif
 
-	LIS_DEBUG_FUNC_OUT;
-    return LIS_SUCCESS;
+        if(converted) {
+            lis_matrix_destroy(B);
+            solver->A = A;
+        }
+
+        LIS_DEBUG_FUNC_OUT;
+        return LIS_SUCCESS;
 #else
     LIS_DEBUG_FUNC_IN;