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

Last change on this file was 24307, checked in by Mathieu Morlighem, 5 years ago

NEW: adding Archive/23390-24306
File size: 2.7 KB
RevLine 
[24307]1Index: ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py
2===================================================================
3--- ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py (revision 24250)
4+++ ../trunk-jpl/src/m/mesh/planet/gmsh/gmshplanet.py (revision 24251)
5@@ -39,11 +39,11 @@
6 fid.write('Mesh.Algorithm = 1;\n')
7 if options.exist('refine'):
8 fid.write('Mesh.Algorithm = 7;\n')
9- fid.write('Mesh.CharacteristicLengthFromPoints= 0;\n')
10- fid.write('Mesh.SmoothRatio= 3;\n')
11- fid.write('Mesh.RemeshAlgorithm= 1;\n')
12- fid.write('resolution=%g;\n' % resolution)
13- fid.write('radius=%g;\n' % radius)
14+ fid.write('Mesh.CharacteristicLengthFromPoints = 0;\n')
15+ fid.write('Mesh.SmoothRatio = 3;\n')
16+ fid.write('Mesh.RemeshAlgorithm = 1;\n')
17+ fid.write('resolution = %g;\n' % resolution)
18+ fid.write('radius = %g;\n' % radius)
19 fid.write('Point(1) = {0.0, 0.0, 0.0, resolution};\n')
20 fid.write('Point(2) = {radius, 0.0, 0.0, resolution};\n')
21 fid.write('Point(3) = {0, radius, 0.0, resolution};\n')
22Index: ../trunk-jpl/src/m/coordsystems/gmtmask.py
23===================================================================
24--- ../trunk-jpl/src/m/coordsystems/gmtmask.py (revision 24250)
25+++ ../trunk-jpl/src/m/coordsystems/gmtmask.py (revision 24251)
26@@ -55,7 +55,7 @@
27 putenv('DYLD_LIBRARY_PATH', issmdir + '/externalpackages/curl/install/lib:' + issmdir + '/externalpackages/hdf5/install/lib:' + issmdir + '/externalpackages/netcdf/install/lib')
28
29 #figure out which vertices are on the ocean, which one on the continent:
30- 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)
31+ 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)
32
33 #reset DYLD_LIBRARY_PATH to what it was:
34 if ismac:
35Index: ../trunk-jpl/src/m/os/issmscpin.py
36===================================================================
37--- ../trunk-jpl/src/m/os/issmscpin.py (revision 24250)
38+++ ../trunk-jpl/src/m/os/issmscpin.py (revision 24251)
39@@ -32,7 +32,7 @@
40 #use the putty project pscp.exe: it should be in the path.
41 #get ISSM_DIR variable
42 if 'ISSM_DIR_WIN' in os.environ:
43- ISSM_DIR = os.environ['ISSM_DIR_WIN'][1: - 2]
44+ ISSM_DIR = os.environ['ISSM_DIR_WIN'][1:-2]
45 else:
46 raise OSError("issmscpin error message: could not find ISSM_DIR_WIN environment variable.")
47 username = eval(input('Username: (quoted string) '))
Note: See TracBrowser for help on using the repository browser.