source: issm/oecreview/Archive/23390-24306/ISSM-24250-24251.diff@ 28275

../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py

@@ -39 +39 @@
     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('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')

../trunk-jpl/src/m/coordsystems/gmtmask.py

@@ -55 +55 @@
         putenv('DYLD_LIBRARY_PATH', issmdir + '/externalpackages/curl/install/lib:' + issmdir + '/externalpackages/hdf5/install/lib:' + issmdir + '/externalpackages/netcdf/install/lib')
 
     #figure out which vertices are on the ocean, which one on the continent:
-    subprocess.call(issmdir + '/externalpackages/gmt/install/bin/gmt gmtselect ./ all_vertices.txt -h0 -Df -R0/360/-90/90 -A0- JQ180/200 - Nk/s/s/k/s > ./oce_vertices.txt', shell=True)
+    subprocess.call(issmdir + '/externalpackages/gmt/install/bin/gmt gmtselect ./ all_vertices.txt -h0 -Df -R0/360/-90/90 -A0 -JQ180/200 -Nk/s/s/k/s > ./oce_vertices.txt', shell=True)
 
     #reset DYLD_LIBRARY_PATH to what it was:
     if ismac:

../trunk-jpl/src/m/os/issmscpin.py

@@ -32 +32 @@
             #use the putty project pscp.exe: it should be in the path.
             #get ISSM_DIR variable
             if 'ISSM_DIR_WIN' in os.environ:
-                ISSM_DIR = os.environ['ISSM_DIR_WIN'][1: - 2]
+                ISSM_DIR = os.environ['ISSM_DIR_WIN'][1:-2]
             else:
                 raise OSError("issmscpin error message: could not find ISSM_DIR_WIN environment variable.")
             username = eval(input('Username: (quoted string) '))