Changeset 22869

Timestamp:

06/22/18 03:05:38 (7 years ago)

Author:

bdef

Message:

BUG: replacing scipy calls by numpy

Location:

issm/trunk-jpl/test

Files:

• Data/gemb_input.npy (added)
• NightlyRun/test243.py (modified) (2 diffs)
• NightlyRun/test701.py (modified) (2 diffs)
• NightlyRun/test703.py (modified) (2 diffs)

issm/trunk-jpl/test/NightlyRun/test243.py

@@ -1 +1 @@
 #Test Name: SquareShelfSMBGemb
 import numpy as np
-import scipy as sci
-import sci.io as spio
 from model import *
 from socket import gethostname
@@ -24 +22 @@
 
 #load hourly surface forcing date from 1979 to 2009:
-inputs = spio.loadmat('../Data/gemb_input.mat',squeeze_me=True)
+inputs = np.load('../Data/gemb_input.npy').item()
 
 #setup the inputs:

issm/trunk-jpl/test/NightlyRun/test701.py

@@ -1 +1 @@
 #Test Name: FlowbandFSshelf
 import numpy as np
-import scipy as sci
-from sci.interpolate import interp1d
 from model import *
 from solve import *
@@ -16 +14 @@
 
 #Geometry           #interp1d returns a function to be called on md.mesh.x
-md.geometry.surface = interp1d(x,b+h)(md.mesh.x)
-md.geometry.base = interp1d(x,b)(md.mesh.x)
+md.geometry.surface = np.interp(md.mesh.x,x,b+h)
+md.geometry.base = np.interp(md.mesh.x,x,b)
 md.geometry.thickness = md.geometry.surface-md.geometry.base
 

issm/trunk-jpl/test/NightlyRun/test703.py

@@ -1 +1 @@
 #Test Name: FlowbandFSsheetshelfTrans
 import numpy as np
-import scipy as sci
-from sci.interpolate import interp1d
 from model import  *
 from setflowequation import  *
@@ -35 +33 @@
 
 #geometry
-md.geometry.surface = interp1d(x,b+h)(md.mesh.x)
-md.geometry.base = interp1d(x,b)(md.mesh.x)
+md.geometry.surface = np.interp(md.mesh.x,x,b+h)
+md.geometry.base = np.interp(md.mesh.x,x,b)
 md.geometry.thickness = md.geometry.surface - md.geometry.base