Merge branch 'work_natalja' into 'master'

simplified and switched on partition check for isolated nodes See merge request FESOM/fesom2!69
FESOM · Nov 8, 2018 · 356c3c1 · 356c3c1
2 parents ccdfba6 + 9b8b145
commit 356c3c1
Show file tree

Hide file tree

Showing 17 changed files with 1,213 additions and 121 deletions.
diff --git a/lib/parms/Makefile b/lib/parms/Makefile
@@ -30,7 +30,7 @@ OBJ1	=    ./src/parms_comm.o  \
              ./src/parms_qsplit.o ./src/parms_solver.o  \
              ./src/parms_table.o ./src/parms_timer.o  \
              ./src/parms_vec.o ./src/parms_viewer.o \
-	     ./src/fgmres.o ./src/bicgstab.o ./src/cg.o \
+	     ./src/fgmres.o ./src/bicgstab.o ./src/cg.o ./src/pbicgstab.o ./src/pbicgstab_ras.o\
              ./src/gmres.o ./src/parms_complex.o 
 #$(HYPRE_OBJ) \
 

diff --git a/lib/parms/README b/lib/parms/README
@@ -50,3 +50,19 @@ data->issetup for reusing of the LU-Facorization
 
 changed convergence criterion in fgmres.c, gmres.c (ro <= tol) instead of (ro
 <= eps1)
+
+///////////////////////////////////////////////////////////////////////////////
+
+additional routine implemented by Natalja Rakowsky, [email protected]
+
+Solver: PBICGS (pbicgstab.c)
+
+ Pipelined BiCGstab, overlapping global sums with computation. See:
+  Siegfried Cools, Wim Vanroose
+  The communication-hiding pipelined BiCGStab method for the parallel solution of large unsymmetric linear systems
+  Parallel Computing 65, pp. 1-20, July 2017
+
+Solver: PBICGS_RAS (pbicgstab_ras.c)
+
+ Pipelined BiCGstab with hard-coded RAS preconditioner. This allows to overlap the
+ halo communication for RAS with some computations in bicgstab.
diff --git a/lib/parms/include/fparms.h b/lib/parms/include/fparms.h
@@ -26,8 +26,8 @@
 	integer :: PCILU0, PCILUK, PCILUT, PCARMS
 	parameter(PCBJ=0, PCSCHUR=1, PCRAS=2, PCSCHURRAS=3)
 	parameter(PCILU0=0, PCILUK=1, PCILUT=2, PCARMS=3)
-        integer :: SOLFGMRES, SOLGMRES, SOLBICGS, SOLCG
+	  integer :: SOLFGMRES, SOLGMRES, SOLBICGS, SOLCG, SOLPBICGS, SOLPBICGS_RAS, SOLBICGS_RAS
 	integer :: MAXITS, KSIZE, DTOL, NEIG
-	  parameter(SOLFGMRES=0,SOLGMRES=1, SOLBICGS=2, SOLCG=3)
+	  parameter(SOLFGMRES=0,SOLGMRES=1, SOLBICGS=2, SOLCG=3, SOLPBICGS=4, SOLPBICGS_RAS=5, SOLBICGS_RAS=6)
 	parameter(MAXITS=0,KSIZE=1,DTOL=2,NEIG=3)
 
diff --git a/lib/parms/include/parms_sys.h b/lib/parms/include/parms_sys.h
@@ -59,7 +59,7 @@ typedef enum VARSTYPE   {INTERLACED, NONINTERLACED} VARSTYPE;
 typedef enum INSERTMODE {INSERT, ADD} INSERTMODE;
 typedef enum NNZSTRUCT {SAME_NONZERO_STRUCTURE, DIFFERENT_NONZERO_STRUCTURE} NNZSTRUCT;
 typedef enum COMMTYPE   {P2P, DERIVED} COMMTYPE;
-typedef enum SOLVERTYPE {SOLFGMRES, SOLGMRES, SOLBICGS, SOLCG} SOLVERTYPE;
+typedef enum SOLVERTYPE {SOLFGMRES, SOLGMRES, SOLBICGS, SOLCG, SOLPBICGS, SOLPBICGS_RAS, SOLBICGS_RAS} SOLVERTYPE;
 typedef enum PARAMTYPE  {MAXITS, KSIZE, DTOL, NEIG} PARAMTYPE;
 typedef enum MATTYPE    {MAT_NULL=-1, MAT_VCSR=0, MAT_CSR=1} MATTYPE;
 typedef enum PCTYPE     {PCBJ, PCSCHUR, PCRAS, PCSCHURRAS} PCTYPE;