Changeset 25196 for issm/trunk-jpl/src/m/coordsystems/gmtmask.py

Timestamp:

07/02/20 10:53:58 (5 years ago)

Author:

jdquinn

Message:

CHG: Fixes for Linux solid earth binaries; applied similar changes to other packaging/testing scripts; clean up

File:

• issm/trunk-jpl/src/m/coordsystems/gmtmask.py (modified) (3 diffs)

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

@@ -1 @@
-from os import getenv, putenv
+import os
 import subprocess
 
 import numpy as np
 
+from issmdir import *
 from MatlabFuncs import *
 from model import *
@@ -44 +45 @@
 
     #Avoid bypassing of the ld library path by Matlab (:()
-    try:
-        issmdir
-    except NameError:
-        issmdir = getenv('ISSM_DIR')
+    issm_dir = issmdir()
+
     try:
         ismac
@@ -53 +52 @@
         ismac = False
 
+    # TODO: Do we really need this (we can/already set it in etc/environment.sh)?
     if ismac:
-        dyld_library_path_old = getenv('DYLD_LIBRARY_PATH')
-        putenv('DYLD_LIBRARY_PATH', issmdir + '/externalpackages/curl/install/lib:' + issmdir + '/externalpackages/hdf5/install/lib:' + issmdir + '/externalpackages/netcdf/install/lib')
+        dyld_library_path_old = os.getenv('DYLD_LIBRARY_PATH')
+        os.putenv('DYLD_LIBRARY_PATH', issm_dir + '/externalpackages/curl/install/lib:' + issm_dir + '/externalpackages/hdf5/install/lib:' + issm_dir + '/externalpackages/netcdf/install/lib')
+
+    #Find path to gmt (you may need to add yours to the list).
+    #
+    # NOTE: Assumes gmtselect is also in this directory.
+    #
+    gmtpaths = [
+        issm_dir + '/bin/gmt',
+        issm_dir + '/externalpackages/gmt/install/bin/gmt',
+        '/Applications/GMT-5.4.3.app/Contents/Resources/bin/gmt'
+    ]
+    gmtpath = ''
+    for i in range(len(gmtpaths)):
+        if os.path.isfile(gmtpaths[i]):
+            gmtpath = gmtpaths[i]
+            break
+
+    if gmtpath == '':
+        raise Exception('gmt not found! Make sure it is properly installed, or add its path to this file.')
 
     #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(gmtpath + ' 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:
-        putenv('DYLD_LIBRARY_PATH', dyld_library_path_old)
+        os.putenv('DYLD_LIBRARY_PATH', dyld_library_path_old)
 
     #read the con_vertices.txt file and flag our mesh vertices on the continent