Index: /issm/trunk/src/c/objects/Loads/Icefront.cpp
===================================================================
--- /issm/trunk/src/c/objects/Loads/Icefront.cpp	(revision 5700)
+++ /issm/trunk/src/c/objects/Loads/Icefront.cpp	(revision 5701)
@@ -18,4 +18,12 @@
 #include "../../include/include.h"
 /*}}}*/	
+
+/*Load macros*/
+#define NUMVERTICESSEG 2
+#define NUMVERTICESQUA 4
+#define NDOF1 1
+#define NDOF2 2
+#define NDOF3 3
+#define NDOF4 4
 
 /*Icefront constructors and destructor*/
@@ -389,9 +397,8 @@
 
 	int       i;
-	const int numgrids = 2;
-	const int NDOF2    = 2;
-	const int numdofs = numgrids *NDOF2;
+	const int numnodes= NUMVERTICESSEG;
+	const int numdofs = numnodes *NDOF2;
 	int*      doflist=NULL;
-	double    xyz_list[numgrids][3];
+	double    xyz_list[numnodes][3];
 
 	/*Objects: */
@@ -444,10 +451,10 @@
 	/* Get dof list and node coordinates: */
 	GetDofList(&doflist,MacAyealApproximationEnum);
-	GetVerticesCoordinates(&xyz_list[0][0],nodes,numgrids);
+	GetVerticesCoordinates(&xyz_list[0][0],nodes,numnodes);
 	
 	/*Get Matpar parameters*/
 	rho_water=matpar->GetRhoWater();
-	rho_ice=matpar->GetRhoIce();
-	gravity=matpar->GetG();
+	rho_ice  =matpar->GetRhoIce();
+	gravity  =matpar->GetG();
 
 	/*Get normal*/
@@ -495,5 +502,5 @@
 		beam->GetNodalFunctions(&L[0],gauss_coord);
 
-		for (i=0;i<numgrids;i++){
+		for (i=0;i<numnodes;i++){
 			pe_g[2*i+0]+= pressure*Jdet*gauss_weights[ig]*normal[0]*L[i];
 			pe_g[2*i+1]+= pressure*Jdet*gauss_weights[ig]*normal[1]*L[i];
@@ -517,11 +524,10 @@
 	int i,j;
 
-	const int numgrids=4;
-	const int NDOF2=2;
-	const int numdofs=numgrids*NDOF2;
+	const int numnodes=NUMVERTICESQUA;
+	const int numdofs=numnodes*NDOF2;
 	int*      doflist=NULL;
 
-	double xyz_list[numgrids][3];
-	double xyz_list_quad[numgrids+1][3]; //center node
+	double xyz_list[numnodes][3];
+	double xyz_list_quad[numnodes+1][3]; //center node
 
 	double thickness_list[6]; //from penta element
@@ -567,5 +573,5 @@
 	/* Get dof list and node coordinates: */
 	GetDofList(&doflist,PattynApproximationEnum);
-	GetVerticesCoordinates(&xyz_list[0][0], nodes, numgrids);
+	GetVerticesCoordinates(&xyz_list[0][0], nodes, numnodes);
 	
 	//Identify which grids are comprised in the quad: 
@@ -654,11 +660,10 @@
 	int i,j;
 
-	const int numgrids=4;
-	const int NDOF4=4;
-	const int numdofs=numgrids*NDOF4;
+	const int numnodes=4;
+	const int numdofs=numnodes*NDOF4;
 	int*      doflist=NULL;
 
-	double xyz_list[numgrids][3];
-	double xyz_list_quad[numgrids+1][3]; //center node
+	double xyz_list[numnodes][3];
+	double xyz_list_quad[numnodes+1][3]; //center node
 
 	double thickness_list[6]; //from penta element
@@ -706,5 +711,5 @@
 	/* Get dof list and node coordinates: */
 	GetDofList(&doflist,StokesApproximationEnum);
-	GetVerticesCoordinates(&xyz_list[0][0], nodes, numgrids);
+	GetVerticesCoordinates(&xyz_list[0][0], nodes, numnodes);
 	
 	//Identify which grids are comprised in the quad: 
@@ -1382,5 +1387,5 @@
 
 	/*Build unit outward pointing vector*/
-	const int numgrids=2;
+	const int numnodes=NUMVERTICESSEG;
 	double vector[2];
 	double norm;