Index: /issm/trunk/template
===================================================================
--- /issm/trunk/template	(revision 9417)
+++ /issm/trunk/template	(revision 9418)
@@ -1,11 +1,17 @@
 mesh {{{
+
+	projection
+		lat
+		long
+		hemisphere
+
 	  x
 	  y
 	  z
-	  elements -> rename index?
-	  dim
-	  numlayers
+	  elements 
+	  dim -> rename dimension
+	  numlayers -> rename numberoflayers
 	  numberofelements
-	  numberofnodes -> rename all nodes vertices? (nodes in the C++ core are not the same as the ones in model)
+	  numberofnodes -> rename numberofvertices as well as nodeon...
 	  edges
 
@@ -20,7 +26,7 @@
 	  x2d
 	  y2d
-	  z2d
-
-	  extrusionexponent -> remove?
+	  z2d -> remove
+
+	  extrusionexponent -> remove
 	  elementonbed
 	  elementonsurface
@@ -30,5 +36,5 @@
 	  nodeconnectivity
 	  elementconnectivity
-	  connectivity
+	  connectivity ->investigate
 
 	  segments
@@ -36,13 +42,6 @@
 	  nodeonboundary
 
-	  bamg
-
 	  extractednodes
 	  extractedelements
-}}}
-projection{{{
-	lat
-	  long
-	  hemisphere
 }}}
 geometry {{{
@@ -52,18 +51,23 @@
 	  bathymetry
 
-	  bed_slopex
-	  bed_slopey
-	  surface_slopex
-	  surface_slopey
+	  bed_slopex ->remove
+	  bed_slopey ->remove
+	  surface_slopex->remove
+	  surface_slopey->remove
 
 	  thickness_coeff -> delete or rename (See with John)?
 }}}
-geography{{{ -> rename mask (as in SeaRISE)?
-	elementoniceshelf -> rename all as grounded and floating
-	  elementonicesheet
-	  elementonwater
-	  nodeoniceshelf
-	  nodeonicesheet
-	  nodeonwater
+mask{{{
+	elementoniceshelf -> rename elementonwater
+	elementonicesheet -> rename elementonground
+	elementonwater -> rename elementelementonground
+	nodeoniceshelf
+	nodeonicesheet
+	nodeonwater
+
+	elementongroundedice 
+	elementonfloatingice
+	elementonwater
+
 }}}
 rifts{{{
@@ -89,8 +93,8 @@
 }}}
 friction{{{
-	drag_type
-	  drag_coefficient
-	  drag_p
-	  drag_q
+	drag_type -> delete
+	drag_coefficient
+	drag_p
+	drag_q
 }}}
 surfaceforcings{{{
@@ -105,27 +109,25 @@
 	geothermalflux
 }}}
-
-flowapproximation{{{
-	elements_type -> change all type to approx?
-	vertices_type
-
-	ishutter
-	ismacayealpattyn
-	isstokes
-
-	elementonhutter
-	elementonmacayeal
-	elementonpattyn
-	elementonstokes
-
-	nodeonhutter
-	nodeonmacayeal
-	nodeonpattyn
-	nodeonstokes
-
-	borderstokes
-
-	elements_type2d -> remove
-	vertices_type2d -> remove
+flowequation{{{
+	private: 
+		ishutter
+		ismacayealpattyn
+		isstokes
+
+		elements_type -> change to element_equation
+		vertices_type -> rename to vertex_equation
+		borderstokes -> rename vertex_boundary_equation
+		
+		elementonhutter ->delete
+		elementonmacayeal->delete
+		elementonpattyn->delete
+		elementonstokes->delete
+
+		nodeonhutter ->delete
+		nodeonmacayeal->delete
+		nodeonpattyn->delete
+		nodeonstokes->delete
+		elements_type2d -> delete
+		vertices_type2d -> delete
 }}}
 diagnostic{{{
@@ -294,4 +296,5 @@
 	outputfilename -> same
 	solution_type -> rename solution
+	bamg
 }}}
 constants{{{