Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/src/m/coordsystems/gmtmask.py

Timestamp:

06/07/17 10:50:54 (8 years ago)

Author:

Eric.Larour

Message:

CHG: merged branch back to trunk-jpl 21754.

File:

• issm/branches/trunk-larour-NatGeoScience2016/src/m/coordsystems/gmtmask.py (modified) (4 diffs)

issm/branches/trunk-larour-NatGeoScience2016/src/m/coordsystems/gmtmask.py

@@ -1 +1 @@
 from MatlabFuncs import *
 from model import *
-from numpy import *
+import numpy as np
 from os import getenv, putenv
 import subprocess
@@ -12 +12 @@
 #
         lenlat=len(lat)
-        mask=empty(lenlat)
+        mask=np.empty(lenlat)
         
         #are we doing a recursive call? 
@@ -38 +38 @@
         #First, write our lat,long file for gmt:
         nv=lenlat
-        savetxt('./all_vertices.txt',transpose([long, lat, arange(1,nv+1)]),delimiter='\t',fmt='%.10f')
+        np.savetxt('./all_vertices.txt',np.transpose([long, lat, np.arange(1,nv+1)]),delimiter='\t',fmt='%.10f')
 
         #Avoid bypassing of the ld library path by Matlab (:()
@@ -72 +72 @@
         fid.close()
 
-        mask=zeros([nv,1])
+        mask=np.zeros([nv,1])
         mask[oce_vertices]=1