Changeset 22868

Timestamp:

06/22/18 02:31:58 (7 years ago)

Author:

bdef

Message:

BUG:trying to get scipy to load properly

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test1104.py (modified) (1 diff)
• test243.py (modified) (3 diffs)
• test701.py (modified) (1 diff)
• test703.py (modified) (1 diff)

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

@@ -50 +50 @@
         md=solve(md,'Stressbalance')
         pos=np.where(np.logical_or.reduce((md.mesh.x==0.,md.mesh.y==0.,md.mesh.x==np.max(md.mesh.x),md.mesh.y==np.max(md.mesh.y))))
-        md.stressbalance.spcvx[pos]=md.results.StressbalanceSolution.Vx[pos]
-        md.stressbalance.spcvy[pos]=md.results.StressbalanceSolution.Vy[pos]
+        md.stressbalance.spcvx[pos]=md.results.StressbalanceSolution.Vx[pos][:,0]
+        md.stressbalance.spcvy[pos]=md.results.StressbalanceSolution.Vy[pos][:,0]
         md.stressbalance.vertex_pairing=np.empty((0,2),int)
         md=setflowequation(md,'FS','all')

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

@@ -1 +1 @@
 #Test Name: SquareShelfSMBGemb
 import numpy as np
-import scipy.io as spio
+import scipy as sci
+import sci.io as spio
 from model import *
 from socket import gethostname
@@ -25 +26 @@
 inputs = spio.loadmat('../Data/gemb_input.mat',squeeze_me=True)
 
-#setup the inputs: 
+#setup the inputs:
 md.smb.Ta = np.append(np.tile(np.conjugate(inputs['Ta0']),(md.mesh.numberofelements,1)),np.conjugate([inputs['dateN']]),axis=0)
 md.smb.V = np.append(np.tile(np.conjugate(inputs['V0']),(md.mesh.numberofelements,1)),np.conjugate([inputs['dateN']]),axis=0)
@@ -42 +43 @@
 md.smb.requested_outputs = ['SmbDz','SmbT','SmbD','SmbRe','SmbGdn','SmbGsp','SmbEC','SmbA','SmbMassBalance','SmbMAdd','SmbDzAdd','SmbFAC']
 
-#only run smb core: 
+#only run smb core:
 md.transient.isstressbalance = 0
 md.transient.ismasstransport = 0
 md.transient.isthermal = 0
 
-#time stepping: 
+#time stepping:
 md.timestepping.start_time = 1965.
 md.timestepping.final_time = 1966.

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

@@ -1 +1 @@
 #Test Name: FlowbandFSshelf
 import numpy as np
-from scipy.interpolate import interp1d
+import scipy as sci
+from sci.interpolate import interp1d
 from model import *
 from solve import *

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

@@ -1 +1 @@
 #Test Name: FlowbandFSsheetshelfTrans
 import numpy as np
-from scipy.interpolate import interp1d
+import scipy as sci
+from sci.interpolate import interp1d
 from model import  *
 from setflowequation import  *