Index: /issm/trunk-jpl/src/c/cores/love_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/cores/love_core.cpp	(revision 26236)
+++ /issm/trunk-jpl/src/c/cores/love_core.cpp	(revision 26237)
@@ -9,6 +9,5 @@
 #include "../modules/modules.h"
 #include "../solutionsequences/solutionsequences.h"
-#include "petscblaslapack.h"
-
+#include <petscblaslapack.h>
 
 void love_init(FemModel* femmodel, Matlitho* matlitho){/*{{{*/
@@ -42,6 +41,5 @@
 	femmodel->parameters->SetParam(nyi,LoveNYiEquationsEnum);
 	femmodel->parameters->SetParam(starting_layer,LoveStartingLayerEnum);
-}
-
+}/*}}}*/
 void GetEarthRheology(IssmDouble* pla, IssmDouble* pmu, int layer_index, IssmDouble omega,FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
 
@@ -103,6 +101,4 @@
 
 } /*}}}*/
-
-
 IssmDouble GetGravity(IssmDouble r2, int layer_index, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
 	//computes gravity at radius r2
@@ -124,5 +120,4 @@
 	return	g= GG*M/pow(r2,2.0);
 }/*}}}*/
-
 void fill_yi_prefactor(IssmDouble* yi_prefactor, int* pdeg, IssmDouble* pomega, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
 	//precalculates partial derivative factors for function yi_derivatives
@@ -265,5 +260,4 @@
 	}
 }/*}}}*/
-
 IssmDouble* yi_derivatives(IssmDouble* y, int layer_index, int n, IssmDouble* yi_prefactor, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
 	//computes yi derivatives at r=radius[layer_index]+ n/nstep*(radius[layer_index+1]-radius[layer_index])
@@ -355,5 +349,4 @@
 	return dydx;
 }/*}}}*/
-
 void propagate_yi_euler(IssmDouble* y, IssmDouble xmin, IssmDouble xmax, int layer_index, IssmDouble* yi_prefactor, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
 	//yields this: if we have y[j]=1.0 and y[!j]=0.0 at the bottom of the layer, what is y at the top of the layer?
@@ -374,5 +367,4 @@
 	xDelete<IssmDouble>(dydx);
 }/*}}}*/
-
 void propagate_yi_RK2(IssmDouble* y, IssmDouble xmin, IssmDouble xmax, int layer_index, IssmDouble* yi_prefactor, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
 	//yields this: if we have y[j]=1.0 and y[!j]=0.0 at the bottom of the layer, what is y at the top of the layer?
@@ -409,5 +401,4 @@
 	xDelete<IssmDouble>(y3);
 }/*}}}*/
-
 void propagate_yi_RK4(IssmDouble* y, IssmDouble xmin, IssmDouble xmax, int layer_index, IssmDouble* yi_prefactor, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
 	//yields this: if we have y[j]=1.0 and y[!j]=0.0 at the bottom of the layer, what is y at the top of the layer?
@@ -465,5 +456,4 @@
 	xDelete<IssmDouble>(y3);
 }/*}}}*/
-
 void Innersphere_boundaryconditions(IssmDouble* yi, int layer_index, int deg, IssmDouble omega, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
 	//fills the boundary conditions at the bottom of layer[layer_index] in yi[0:2][0:5]
@@ -517,5 +507,4 @@
 	yi[5+nyi*2]=deg/(r*g0);
 }/*}}}*/
-
 void build_yi_system(IssmDouble* yi, int deg, IssmDouble omega, IssmDouble* yi_prefactor, FemModel* femmodel, Matlitho* matlitho) { /*{{{*/
 
@@ -581,5 +570,5 @@
 		if (matlitho->issolid[i]){
 			one = -1.0;
-			if (i>0 & !matlitho->issolid[i-1]) one = 1.0;
+			if (i>0 && !matlitho->issolid[i-1]) one = 1.0;
 			for (int j=0;j<6;j++){
 				yi[(j+6*ici)+ nyi*(j+6*ici+3)] = one;
@@ -627,5 +616,4 @@
 	}
 }/*}}}*/
-
 void yi_boundary_conditions(IssmDouble* yi_righthandside, int deg, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
 
@@ -710,6 +698,4 @@
 	}
 }/*}}}*/
-
-
 void solve_yi_system(IssmDouble* loveh, IssmDouble* lovel, IssmDouble* lovek, int deg, IssmDouble omega, IssmDouble* yi, IssmDouble* rhs, FemModel* femmodel, Matlitho* matlitho){ /*{{{*/
 
@@ -831,5 +817,4 @@
 	xDelete<IssmDouble>(frequencies);	
 }/*}}}*/
-
 IssmDouble factorial(int n){ /*{{{*/
 	IssmDouble prod=1;
@@ -837,5 +822,4 @@
 	return prod;
 }/*}}}*/
-
 IssmDouble n_C_r(int n, int r){ /*{{{*/ 
 	//n choose r
@@ -879,6 +863,4 @@
 	return res = num/den;
 }/*}}}*/
-
-
 IssmDouble* postwidder_coef(int NTit){ /*{{{*/
 	//Coefficients of the Post-Widder method through Saltzer summation for inverse Laplace transform:
@@ -903,5 +885,4 @@
 	return xi;
 }/*}}}*/
-
 void postwidder_transform(IssmDouble* Lovet, IssmDouble* Lovef,int d, int t, int NTit, IssmDouble* xi, FemModel* femmodel){ /*{{{*/
 	//Computes Lovet for time step t and degree d from the PW coefficients xi and the corresponding 2*NTit frequency samples in Lovef
@@ -934,5 +915,4 @@
 	Lovet[d*nt+t]=LoveM[NTit-1];
 }/*}}}*/
-
 void love_freq_to_temporal(IssmDouble* LoveHt,IssmDouble* LoveLt,IssmDouble* LoveKt,IssmDouble* LoveHf,IssmDouble* LoveLf,IssmDouble* LoveKf, FemModel* femmodel){ /*{{{*/
 	//Transforms all frequency-dependent love numbers into time-dependent love numbers
@@ -957,7 +937,4 @@
 	xDelete<IssmDouble>(xi);
 }/*}}}*/
-
-
-
 void love_core(FemModel* femmodel){ /*{{{*/
 
@@ -1120,3 +1097,2 @@
 	xDelete<IssmDouble>(LoveKernelsImag);
 } /*}}}*/
-
