Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 13783)
+++ /issm/trunk-jpl/src/c/classes/FemModel.cpp	(revision 13784)
@@ -333,5 +333,4 @@
 		results->AddObject(new GenericExternalResult<IssmDouble>(results->Size()+1, ProfilingCurrentFlopsEnum, solution_flops, 1, 0));
 	}
-
 }
 /*}}}*/
@@ -857,5 +856,5 @@
 
 
-	int        i,j,k;
+	int        i,j;
 	int        my_rank;
 	bool       process_units = true;
Index: /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp	(revision 13783)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscMat.cpp	(revision 13784)
@@ -133,7 +133,5 @@
 PetscMat* PetscMat::Duplicate(void){
 
-	PetscMat* output=NULL;
-
-	output=new PetscMat();
+	PetscMat* output=new PetscMat();
 	_assert_(this->matrix);
 	MatDuplicate(this->matrix,MAT_COPY_VALUES,&output->matrix);
Index: /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.cpp	(revision 13783)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/objects/PetscVec.cpp	(revision 13784)
@@ -129,9 +129,8 @@
 PetscVec* PetscVec::Duplicate(void){
 
-	PetscVec* output=NULL;
 	_assert_(this->vector);
 	Vec vec_output=NULL;
 	VecDuplicate(this->vector,&vec_output);
-	output=new PetscVec(vec_output);
+	PetscVec* output=new PetscVec(vec_output);
 	VecFree(&vec_output);
 
Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/GetOwnershipBoundariesFromRange.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/patches/GetOwnershipBoundariesFromRange.cpp	(revision 13783)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/GetOwnershipBoundariesFromRange.cpp	(revision 13784)
@@ -26,10 +26,6 @@
 	int lower_row,upper_row;
 
-	/*intermediary :*/
-	int i;
-	int* allranges=NULL;
-
 	/*Gather all range values into allranges, for all nodes*/
-	allranges=xNew<int>(num_procs);
+	int* allranges=xNew<int>(num_procs);
 	MPI_Allgather(&range,1,MPI_INT,allranges,1,MPI_INT,comm);
 
@@ -37,5 +33,5 @@
 	lower_row=0;
 	upper_row=lower_row+allranges[0];
-	for (i=1;i<=my_rank;i++){
+	for(int i=1;i<=my_rank;i++){
 		lower_row=lower_row+allranges[i-1];
 		upper_row=upper_row+allranges[i];
Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/KSPFree.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/patches/KSPFree.cpp	(revision 13783)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/KSPFree.cpp	(revision 13784)
@@ -10,7 +10,7 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 void KSPFree(KSP* pksp){
Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/MatFree.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/patches/MatFree.cpp	(revision 13783)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/MatFree.cpp	(revision 13784)
@@ -10,7 +10,7 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscmat.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscmat.h>
+#include <petscksp.h>
 
 void MatFree(Mat* pmat){
Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/MatMultPatch.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/patches/MatMultPatch.cpp	(revision 13783)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/MatMultPatch.cpp	(revision 13784)
@@ -10,7 +10,7 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 #include "../../../shared/shared.h"
Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp	(revision 13783)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/NewMat.cpp	(revision 13784)
@@ -10,7 +10,7 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 #include "./petscpatches.h"
Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscMatrixToDoubleMatrix.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscMatrixToDoubleMatrix.cpp	(revision 13783)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscMatrixToDoubleMatrix.cpp	(revision 13784)
@@ -12,7 +12,7 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 /*Petsc includes: */
@@ -22,17 +22,13 @@
 
 	/*output: */
+	int     i;
 	double* matrix=NULL;
 	int     rows,cols;
-
-	/*intermediary: */
-	int     i;
-	int*    idxm=NULL;
-	int*    idxn=NULL;
 
 	/*Some needed information: */
 	MatGetSize(petsc_matrix,&rows,&cols);
 
-	idxm=xNew<int>(rows);
-	idxn=xNew<int>(cols);
+	int* idxm=xNew<int>(rows);
+	int* idxn=xNew<int>(cols);
 
 	for(i=0;i<rows;i++)idxm[i]=i;
Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp	(revision 13783)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscOptionsInsertMultipleString.cpp	(revision 13784)
@@ -10,7 +10,7 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 #include "./petscpatches.h"
@@ -29,5 +29,4 @@
 	char* first=NULL;
 	char* second=NULL;
-	char* final=NULL;
 	size_t len;
 	int first_token=1;
Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscVectorToDoubleVector.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscVectorToDoubleVector.cpp	(revision 13783)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/PetscVectorToDoubleVector.cpp	(revision 13784)
@@ -11,7 +11,7 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 #include "../../../shared/shared.h"
@@ -19,7 +19,5 @@
 void PetscVectorToDoubleVector(double** pvector, int* prows, Vec petsc_vector){
 
-	int     i;
 	int     rows;
-	int    *idxm   = NULL;
 	double *vector = NULL;
 
@@ -28,7 +26,7 @@
 		VecGetSize(petsc_vector,&rows);
 		if(rows){
-			idxm=xNew<int>(rows);
+			int* idxm=xNew<int>(rows);
 			vector=xNew<double>(rows);
-			for(i=0;i<rows;i++)idxm[i]=i;
+			for(int i=0;i<rows;i++)idxm[i]=i;
 			VecGetValues(petsc_vector,rows,idxm,vector);
 			xDelete<int>(idxm);
Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecDuplicatePatch.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecDuplicatePatch.cpp	(revision 13783)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecDuplicatePatch.cpp	(revision 13784)
@@ -10,7 +10,7 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 void VecDuplicatePatch(Vec* output, Vec input){
Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecFree.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecFree.cpp	(revision 13783)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecFree.cpp	(revision 13784)
@@ -10,7 +10,7 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 void VecFree(Vec* pvec){
Index: /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecMerge.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecMerge.cpp	(revision 13783)
+++ /issm/trunk-jpl/src/c/toolkits/petsc/patches/VecMerge.cpp	(revision 13784)
@@ -10,7 +10,7 @@
 
 /*Petsc includes: */
-#include "petscmat.h"
-#include "petscvec.h"
-#include "petscksp.h"
+#include <petscmat.h>
+#include <petscvec.h>
+#include <petscksp.h>
 
 #include "./petscpatches.h"
@@ -20,6 +20,4 @@
 
 void VecMerge(Vec A, Vec B, double* row_partition_vector,int row_partition_size){
-
-	int i;
 
 	/*Petsc matrix*/
@@ -34,5 +32,5 @@
 
 	/*If the dimension of the partitioning vector is not the same as that of vector B, we have a problem: */
-	if ( (row_partition_size !=MB) ){
+	if ((row_partition_size !=MB) ){
 		_error_("Dimensions of partitioning vector incompatible with dimensions of input vector\n");
 	}
@@ -47,11 +45,11 @@
 		idxm=xNew<int>(range);
 		values=xNew<double>(range);
-		for (i=0;i<range;i++){
-			*(idxm+i)=lower_row+i;
+		for(int i=0;i<range;i++){
+			idxm[i]=lower_row+i;
 		}
 		VecGetValues(B,range,idxm,values);
 		/*Now, modify idxm using the partition vector, and plug values into A*/
-		for (i=0;i<range;i++){
-			*(idxm+i)=(int)*(row_partition_vector+lower_row+i)-1; //-1 because partition vector comes from Matlab, where indices start at 1.
+		for(int i=0;i<range;i++){
+			idxm[i]=int(row_partition_vector[lower_row+i])-1; //-1 because partition vector comes from Matlab, where indices start at 1.
 		}
 		VecSetValues(A,range,idxm,values,INSERT_VALUES);
Index: /issm/trunk-jpl/src/c/toolkits/plapack/patches/CyclicalFactorization.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/plapack/patches/CyclicalFactorization.cpp	(revision 13783)
+++ /issm/trunk-jpl/src/c/toolkits/plapack/patches/CyclicalFactorization.cpp	(revision 13784)
@@ -39,9 +39,8 @@
 int PrimeDecomp(int** pdecomp,int* pdecomp_size,int input){
 
-	int* decomp=NULL;
 	int prime_factor;
 	int i;
 
-	decomp=xNew<int>(input);
+	int* decomp=xNew<int>(input);
 	*decomp=input;
 	for (i=0;i<input;i++){
Index: /issm/trunk-jpl/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp	(revision 13783)
+++ /issm/trunk-jpl/src/c/toolkits/plapack/patches/PlapackInvertMatrix.cpp	(revision 13784)
@@ -24,5 +24,5 @@
 	int mA,nA;
 	int local_mA,local_nA;
-	int lower_row,upper_row,range;
+	int lower_row,upper_row;
 	MatType type;
 
@@ -36,5 +36,4 @@
 	int nb,nb_alg;
 	int nprows,npcols;
-	int initialized=0;
 
 	/*Petsc to Plapack: */
@@ -96,5 +95,4 @@
 	MatGetOwnershipRange(*A,&lower_row,&upper_row);
 	upper_row--; 
-	range=upper_row-lower_row+1;
 	arrayA = xNew<double>(nA);
 	idxnA  = xNew<int>(nA);
Index: /issm/trunk-jpl/src/c/toolkits/plapack/patches/PlapackToPetsc.cpp
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/plapack/patches/PlapackToPetsc.cpp	(revision 13783)
+++ /issm/trunk-jpl/src/c/toolkits/plapack/patches/PlapackToPetsc.cpp	(revision 13784)
@@ -10,5 +10,5 @@
 	int i;
 
-	int lower_row,upper_row,range;
+	int lower_row,upper_row;
 	int* row_nodes=NULL;
 	int* col_nodes=NULL;
@@ -34,5 +34,4 @@
 	MatGetOwnershipRange(*A,&lower_row,&upper_row);
 	upper_row--;
-	range=upper_row-lower_row+1;
 
 	/*Build the Plapack row and column indices corresponding to the local_buffer stored in a. 
Index: /issm/trunk-jpl/src/c/toolkits/plapack/plapackincludes.h
===================================================================
--- /issm/trunk-jpl/src/c/toolkits/plapack/plapackincludes.h	(revision 13783)
+++ /issm/trunk-jpl/src/c/toolkits/plapack/plapackincludes.h	(revision 13784)
@@ -12,5 +12,5 @@
 #endif
 
-#include "PLA.h"
+#include <PLA.h>
 
 /* missing Plapack prototypes: */
@@ -19,5 +19,5 @@
 /*our own patches: */
 #ifdef _HAVE_PETSC_
-#include "patches/petscpatches.h"
+#include "./patches/petscpatches.h"
 #endif