Index: ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py =================================================================== --- ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py (revision 24249) +++ ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py (revision 24250) @@ -7,9 +7,9 @@ def gmshplanet(* varargin): - #GMSHPLANET - mesh generation for a sphere. Very specific code for gmsh. From demo / sphere.geo + #GMSHPLANET - mesh generation for a sphere. Very specific code for gmsh. From demo/sphere.geo # - # Available options (for more details see ISSM website http: / / issm.jpl.nasa.gov / ): + # Available options (for more details see ISSM website http://issm.jpl.nasa.gov/): # # - radius: radius of the planet in km # - resolution: resolution in km @@ -48,12 +48,12 @@ 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('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(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') @@ -63,21 +63,21 @@ 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('Line Loop(13) = {2, 8, -10};\n') fid.write('Surface(14) = {13};\n') fid.write('Line Loop(15) = {10, 3, 7};\n') fid.write('Surface(16) = {15};\n') - fid.write('Line Loop(17) = { - 8, - 9, 1};\n') + fid.write('Line Loop(17) = { -8, -9, 1};\n') fid.write('Surface(18) = {17};\n') - fid.write('Line Loop(19) = { - 11, - 2, 5};\n') + fid.write('Line Loop(19) = { -11, -2, 5};\n') fid.write('Surface(20) = {19};\n') - fid.write('Line Loop(21) = { - 5, - 12, - 1};\n') + fid.write('Line Loop(21) = { -5, -12, -1};\n') fid.write('Surface(22) = {21};\n') - fid.write('Line Loop(23) = { - 3, 11, 6};\n') + fid.write('Line Loop(23) = { -3, 11, 6};\n') fid.write('Surface(24) = {23};\n') - fid.write('Line Loop(25) = { - 7, 4, 9};\n') + fid.write('Line Loop(25) = { -7, 4, 9};\n') fid.write('Surface(26) = {25};\n') - fid.write('Line Loop(27) = { - 4, 12, - 6};\n') + fid.write('Line Loop(27) = { -4, 12, -6};\n') fid.write('Surface(28) = {27};\n') fid.write('Surface Loop(29) = {28, 26, 16, 14, 20, 24, 22, 18};\n') fid.write('Volume(30) = {29};\n') @@ -106,10 +106,10 @@ #call gmsh if options.exist('refine'): - subprocess.call('gmsh - tol 1e-8 - 2 sphere.geo - bgm sphere.pos', shell=True) + subprocess.call('gmsh -tol 1e-8 -2 sphere.geo -bgm sphere.pos', shell=True) else: #call gmsh - subprocess.call('gmsh - tol 1e-8 - 2 sphere.geo', shell=True) + subprocess.call('gmsh -tol 1e-8 -2 sphere.geo', shell=True) #import mesh: {{{ fid = open('sphere.msh', 'r')