Index: /issm/trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py
===================================================================
--- /issm/trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py	(revision 20176)
+++ /issm/trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py	(revision 20177)
@@ -30,4 +30,5 @@
 
 	#initialize mesh: 
+	#mesh=mesh3dsurface()
 	mesh=mesh2d()
 
@@ -35,51 +36,51 @@
 	fid=open('sphere.geo','w')
 
-	fid.write('Mesh.Algorithm = 1\n')
+	fid.write('Mesh.Algorithm = 1;\n')
 	if options.exist('refine'):
-		fid.write('Mesh.Algorithm = 7\n')
-		fid.write('Mesh.CharacteristicLengthFromPoints= 0\n')
-		fid.write('Mesh.SmoothRatio= 3\n')
-		fid.write('Mesh.RemeshAlgorithm= 1\n')
-	fid.write('resolution=#g\n',resolution)
-	fid.write('radius=#g\n',radius)
-	fid.write('Point(1) = [0.0,0.0,0.0,resolution]\n')
-	fid.write('Point(2) = [radius,0.0,0.0,resolution]\n')
-	fid.write('Point(3) = [0,radius,0.0,resolution]\n')
-	fid.write('Circle(1) = [2,1,3]\n')
-	fid.write('Point(4) = [-radius,0,0.0,resolution]\n')
-	fid.write('Point(5) = [0,-radius,0.0,resolution]\n')
-	fid.write('Circle(2) = [3,1,4]\n')
-	fid.write('Circle(3) = [4,1,5]\n')
-	fid.write('Circle(4) = [5,1,2]\n')
-	fid.write('Point(6) = [0,0,-radius,resolution]\n')
-	fid.write('Point(7) = [0,0,radius,resolution]\n')
-	fid.write('Circle(5) = [3,1,6]\n')
-	fid.write('Circle(6) = [6,1,5]\n')
-	fid.write('Circle(7) = [5,1,7]\n')
-	fid.write('Circle(8) = [7,1,3]\n')
-	fid.write('Circle(9) = [2,1,7]\n')
-	fid.write('Circle(10) = [7,1,4]\n')
-	fid.write('Circle(11) = [4,1,6]\n')
-	fid.write('Circle(12) = [6,1,2]\n')
-	fid.write('Line Loop(13) = [2,8,-10]\n')
-	fid.write('Ruled Surface(14) = [13]\n')
-	fid.write('Line Loop(15) = [10,3,7]\n')
-	fid.write('Ruled Surface(16) = [15]\n')
-	fid.write('Line Loop(17) = [-8,-9,1]\n')
-	fid.write('Ruled Surface(18) = [17]\n')
-	fid.write('Line Loop(19) = [-11,-2,5]\n')
-	fid.write('Ruled Surface(20) = [19]\n')
-	fid.write('Line Loop(21) = [-5,-12,-1]\n')
-	fid.write('Ruled Surface(22) = [21]\n')
-	fid.write('Line Loop(23) = [-3,11,6]\n')
-	fid.write('Ruled Surface(24) = [23]\n')
-	fid.write('Line Loop(25) = [-7,4,9]\n')
-	fid.write('Ruled Surface(26) = [25]\n')
-	fid.write('Line Loop(27) = [-4,12,-6]\n')
-	fid.write('Ruled Surface(28) = [27]\n')
-	fid.write('Surface Loop(29) = [28,26,16,14,20,24,22,18]\n')
-	fid.write('Volume(30) = [29]\n')
-	fid.write('Physical Surface(1) = [28,26,16,14,20,24,22,18]\n')
-	fid.write('Physical Volume(2) = 30\n')
+		fid.write('Mesh.Algorithm = 7;\n')
+		fid.write('Mesh.CharacteristicLengthFromPoints= 0;\n')
+		fid.write('Mesh.SmoothRatio= 3;\n')
+		fid.write('Mesh.RemeshAlgorithm= 1;\n')
+	fid.write('resolution=%g;\n'%resolution)
+	fid.write('radius=%g;\n'%radius)
+	fid.write('Point(1) = [0.0,0.0,0.0,resolution];\n')
+	fid.write('Point(2) = [radius,0.0,0.0,resolution];\n')
+	fid.write('Point(3) = [0,radius,0.0,resolution];\n')
+	fid.write('Circle(1) = [2,1,3];\n')
+	fid.write('Point(4) = [-radius,0,0.0,resolution];\n')
+	fid.write('Point(5) = [0,-radius,0.0,resolution];\n')
+	fid.write('Circle(2) = [3,1,4];\n')
+	fid.write('Circle(3) = [4,1,5];\n')
+	fid.write('Circle(4) = [5,1,2];\n')
+	fid.write('Point(6) = [0,0,-radius,resolution];\n')
+	fid.write('Point(7) = [0,0,radius,resolution];\n')
+	fid.write('Circle(5) = [3,1,6];\n')
+	fid.write('Circle(6) = [6,1,5];\n')
+	fid.write('Circle(7) = [5,1,7];\n')
+	fid.write('Circle(8) = [7,1,3];\n')
+	fid.write('Circle(9) = [2,1,7];\n')
+	fid.write('Circle(10) = [7,1,4];\n')
+	fid.write('Circle(11) = [4,1,6];\n')
+	fid.write('Circle(12) = [6,1,2];\n')
+	fid.write('Line Loop(13) = [2,8,-10];\n')
+	fid.write('Ruled Surface(14) = [13];\n')
+	fid.write('Line Loop(15) = [10,3,7];\n')
+	fid.write('Ruled Surface(16) = [15];\n')
+	fid.write('Line Loop(17) = [-8,-9,1];\n')
+	fid.write('Ruled Surface(18) = [17];\n')
+	fid.write('Line Loop(19) = [-11,-2,5];\n')
+	fid.write('Ruled Surface(20) = [19];\n')
+	fid.write('Line Loop(21) = [-5,-12,-1];\n')
+	fid.write('Ruled Surface(22) = [21];\n')
+	fid.write('Line Loop(23) = [-3,11,6];\n')
+	fid.write('Ruled Surface(24) = [23];\n')
+	fid.write('Line Loop(25) = [-7,4,9];\n')
+	fid.write('Ruled Surface(26) = [25];\n')
+	fid.write('Line Loop(27) = [-4,12,-6];\n')
+	fid.write('Ruled Surface(28) = [27];\n')
+	fid.write('Surface Loop(29) = [28,26,16,14,20,24,22,18];\n')
+	fid.write('Volume(30) = [29];\n')
+	fid.write('Physical Surface(1) = [28,26,16,14,20,24,22,18];\n')
+	fid.write('Physical Volume(2) = 30;\n')
 	fid.close()
 	#}}}
@@ -92,7 +93,7 @@
 		fid=open('sphere.pos','w')
 
-		fid.write('View "background mesh" [\n')
+		fid.write('View "background mesh" [;\n')
 		for i in range(meshini.numberofelements):
-			fid.write('ST(#g,#g,#g,#g,#g,#g,#g,#g,#g)[#g,#g,#g]\n',\
+			fid.write('ST(%g,%g,%g,%g,%g,%g,%g,%g,%g)[%g,%g,%g];\n',\
 			meshini.x(meshini.elements(i,0)), meshini.y(meshini.elements(i,0)), meshini.z(meshini.elements(i,0)),\
 			meshini.x(meshini.elements(i,1)), meshini.y(meshini.elements(i,1)), meshini.z(meshini.elements(i,1)),\
@@ -100,5 +101,5 @@
 			metric(meshini.elements(i,0)), metric(meshini.elements(i,1)), metric(meshini.elements(i,2))\
 			)
-		fid.write(']\n')
+		fid.write('];\n')
 		
 		fid.close()
@@ -107,8 +108,8 @@
 	#call gmsh
 	if options.exist('refine'):
-		eval(['!gmsh -tol 1e-8 -2 sphere.geo -bgm sphere.pos'])
+		eval('!gmsh -tol 1e-8 -2 sphere.geo -bgm sphere.pos')
 	else:
 		#call gmsh
-		eval(['!gmsh -tol 1e-8 -2 sphere.geo'])
+		eval('!gmsh -tol 1e-8 -2 sphere.geo')
 
 	#import mesh:  {{{
@@ -116,36 +117,36 @@
 
 	#Get Mesh format
-	A=fscanf(fid,'#s',1)
+	A=fscanf(fid,'%s',1)
 	if not strcmp(A,'$MeshFormat'):
 		raise RuntimeError(['Expecting $MeshFormat (', A, ')'])
 
-	A=fscanf(fid,'#f #i #i',[1, 3])
-	A=fscanf(fid,'#s',1)
+	A=fscanf(fid,'%f %i %i',[1, 3])
+	A=fscanf(fid,'%s',1)
 	if not strcmp(A,'$EndMeshFormat'):
 		raise RuntimeError(['Expecting $EndMeshFormat (', A, ')'])
 
 	#Nodes
-	A=fscanf(fid,'#s',1)
+	A=fscanf(fid,'%s',1)
 	if not strcmp(A,'$Nodes'):
 		raise RuntimeError(['Expecting $Nodes (', A, ')'])
 
-	mesh.numberofvertices=fscanf(fid,'#i',1)
-	A=fscanf(fid,'#i #f #f #f',[4, mesh.numberofvertices])
+	mesh.numberofvertices=fscanf(fid,'%i',1)
+	A=fscanf(fid,'%i %f %f %f',[4, mesh.numberofvertices])
 	mesh.x = transpose(A[1,:])
 	mesh.y = transpose(A[2,:])
 	mesh.z = transpose(A[3,:])
 
-	A=fscanf(fid,'#s',1)
+	A=fscanf(fid,'%s',1)
 	if not strcmp(A,'$EndNodes'):
 		raise RuntimeError(['Expecting $EndNodes (', A, ')'])
 
 	#Elements
-	A=fscanf(fid,'#s',1)
+	A=fscanf(fid,'%s',1)
 	if not strcmp(A,'$Elements'):
 		raise RuntimeError(['Expecting $Elements (', A, ')'])
-	mesh.numberofelements=fscanf(fid,'#i',1)
-	A=fscanf(fid,'#i #i #i #i #i #i #i #i',[8, mesh.numberofelements])
+	mesh.numberofelements=fscanf(fid,'%i',1)
+	A=fscanf(fid,'%i %i %i %i %i %i %i %i',[8, mesh.numberofelements])
 	mesh.elements=transpose(A[6:8,:]) 
-	A=fscanf(fid,'#s',1)
+	A=fscanf(fid,'%s',1)
 	if not strcmp(A,'$EndElements'):
 		raise RuntimeError(['Expecting $EndElements (', A, ')'])
@@ -159,5 +160,5 @@
 
 	#erase files: 
-	eval(['!rm -rf sphere.geo sphere.msh sphere.pos'])
+	eval('!rm -rf sphere.geo sphere.msh sphere.pos')
 
 
