Index: /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscSolver.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscSolver.cpp	(revision 22593)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscSolver.cpp	(revision 22594)
@@ -55,8 +55,5 @@
 	IS         isv=NULL;
 	IS         isp=NULL;
-
-	#if _PETSC_MAJOR_ >= 3 
 	char ksp_type[50];
-	#endif
 
 	/*Display message*/
@@ -80,12 +77,10 @@
 	/*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,8 +98,6 @@
 	/*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,10 +112,9 @@
 	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,5 +139,4 @@
 
 	}
-	#endif
 
 	/*If there is an initial guess for the solution, use it