Changeset 22594

Timestamp:

03/21/18 13:04:11 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: reenable petsc dev

File:

• issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscSolver.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscSolver.cpp

@@ -55 +55 @@
         IS         isv=NULL;
         IS         isp=NULL;
-
-        #if _PETSC_MAJOR_ >= 3 
         char ksp_type[50];
-        #endif
 
         /*Display message*/
@@ -80 +77 @@
         /*Initial guess */
         /*Now, check that we are not giving an initial guess to the solver, if we are running a direct solver: */
-        #if _PETSC_MAJOR_ >= 3 
-                #if _PETSC_MINOR_<7
-                PetscOptionsGetString(PETSC_NULL,"-ksp_type",ksp_type,49,&flg);
-                #else
-                PetscOptionsGetString(NULL,PETSC_NULL,"-ksp_type",ksp_type,49,&flg);
-                #endif
+        #if _PETSC_MINOR_<7
+        PetscOptionsGetString(PETSC_NULL,"-ksp_type",ksp_type,49,&flg);
+        #else
+        PetscOptionsGetString(NULL,PETSC_NULL,"-ksp_type",ksp_type,49,&flg);
+        #endif
         if (strcmp(ksp_type,"preonly")==0)uf0=NULL;
-        #endif
 
         /*If initial guess for the solution exists, use it to create uf, otherwise, 
@@ -103 +98 @@
         /*Check the solver is available*/
         if(solver_type==MUMPSPACKAGE_LU || solver_type==MUMPSPACKAGE_CHOL){
-                #if _PETSC_MAJOR_ >=3
-                        #ifndef _HAVE_MUMPS_
-                        _error_("requested MUMPS solver, which was not compiled into ISSM!\n");
-                        #endif
+                #ifndef _HAVE_MUMPS_
+                _error_("requested MUMPS solver, which was not compiled into ISSM!\n");
                 #endif
         }
@@ -119 +112 @@
         KSPSetFromOptions(ksp);
 
-        #if _PETSC_MAJOR_==3
         /*Specific solver?: */
         KSPGetPC(ksp,&pc);
         if (solver_type==MUMPSPACKAGE_LU){
-                #if _PETSC_MINOR_==1
-                PCFactorSetMatSolverPackage(pc,MAT_SOLVER_MUMPS);
+                #if defined(_HAVE_PETSCDEV_)
+                PCFactorSetMatSolverType(pc,MATSOLVERMUMPS);
                 #else
                 PCFactorSetMatSolverPackage(pc,MATSOLVERMUMPS);
@@ -147 +139 @@
 
         }
-        #endif
 
         /*If there is an initial guess for the solution, use it