[issm-svn] r12709 - issm/trunk/src/c/shared/Elements

[morlighe at issm.ess.uci.edu]

Author: morlighe
Date: 2012-07-24 10:43:44 -0700 (Tue, 24 Jul 2012)
New Revision: 12709

Modified:
   issm/trunk/src/c/shared/Elements/elements.h
Log:
fixed header file (conflict with trunk-jpl)

Modified: issm/trunk/src/c/shared/Elements/elements.h
===================================================================
--- issm/trunk/src/c/shared/Elements/elements.h	2012-07-24 17:38:45 UTC (rev 12708)
+++ issm/trunk/src/c/shared/Elements/elements.h	2012-07-24 17:43:44 UTC (rev 12709)
@@ -10,16 +10,10 @@
 class ElementMatrix;
 class ElementVector;
 
-<<<<<<< .working
-double Paterson(double temperature);
-double Arrhenius(double temperature,double depth,double n);
-double PddSurfaceMassBlance(double* monthlytemperatures,  double* monthlyprec, double* pdds, double* pds, double signorm, double yts, double h, double s, double rho_ice, double rho_water);
-void   GetVerticesCoordinates(double* xyz,  Node** nodes, int numvertices);
-=======
 IssmDouble Paterson(IssmDouble temperature);
 IssmDouble Arrhenius(IssmDouble temperature,IssmDouble depth,IssmDouble n);
+IssmDouble PddSurfaceMassBlance(IssmDouble* monthlytemperatures,  IssmDouble* monthlyprec, IssmDouble* pdds, IssmDouble* pds, IssmDouble signorm, IssmDouble yts, IssmDouble h, IssmDouble s, IssmDouble rho_ice, IssmDouble rho_water);
 void   GetVerticesCoordinates(IssmDouble* xyz,  Node** nodes, int numvertices);
->>>>>>> .merge-right.r12703
 int    GetNumberOfDofs( Node** nodes,int numnodes,int setenum,int approximation_enum);
 int*   GetLocalDofList( Node** nodes,int numnodes,int setenum,int approximation_enum);
 int*   GetGlobalDofList(Node** nodes,int numnodes,int setenum,int approximation_enum);