Changeset 21614

Timestamp:

03/16/17 02:50:05 (8 years ago)

Author:

bdef

Message:

BUG: fixing tests 1601, 1602 and adding referential in the python runme possibilities

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• runme.py (modified) (1 diff)
• test1601.py (modified) (4 diffs)
• test1602.py (modified) (2 diffs)
• test201.py (modified) (1 diff)

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

@@ -53 +53 @@
         #Process options
         #GET benchmark {{{
-        if not benchmark in ['all','nightly','ismip','eismint','thermal','mesh','validation','tranforcing','adolc','slr']:
+        if not benchmark in ['all','nightly','ismip','eismint','thermal','mesh','validation','tranforcing','adolc','slr','referential']:
                 print("runme warning: benchmark '{}' not supported, defaulting to test 'nightly'.".format(benchmark))
                 benchmark='nightly'

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

@@ -18 +18 @@
 md.initialization.vx[:]=0.
 md.initialization.vy[:]=0.
-md.initialization.vel=np.zeros_like(md.initialization.vx)
+md.initialization.vel=np.zeros((md.mesh.numberofvertices))
 
 md.cluster=generic('name',gethostname(),'np',2)
@@ -30 +30 @@
 md.mesh.y=np.sin(theta)*x+np.cos(theta)*y
 
-md.stressbalance.referential[:,0:3]=np.tile([np.cos(theta),np.sin(theta),0],(md.mesh.numberofvertices))
-md.stressbalance.referential[:,3: ]=np.tile([0,0,1],(md.mesh.numberofvertices))
+rotation_array=np.array([np.cos(theta),np.sin(theta),0])
+md.stressbalance.referential[:,0:3]=(np.tile(rotation_array,(md.mesh.numberofvertices,1)))
+md.stressbalance.referential[:,3: ]=np.tile([0,0,1],(md.mesh.numberofvertices,1))
 md=solve(md,'Stressbalance')
 vel1=md.results.StressbalanceSolution.Vel
@@ -39 +40 @@
 
 #Now, put CS back to normal except on the side where the spc are applied
-pos=np.nonzero(np.logical_or.reduce(x==0.,x==1000000.))[0]
+pos=np.where(np.logical_or(x==0.,x==1000000.))[0]
 md.stressbalance.referential[:]=np.nan
-md.stressbalance.referential[pos,0:3]=np.tile([np.cos(theta),np.sin(theta),0],(len(pos)))
-md.stressbalance.referential[pos,3: ]=np.tile([0,0,1],(len(pos)))
+md.stressbalance.referential[pos,0:3]=np.tile([np.cos(theta),np.sin(theta),0],(len(pos),1))
+md.stressbalance.referential[pos,3: ]=np.tile([0,0,1],(len(pos),1))
 md=solve(md,'Stressbalance')
 vel2=md.results.StressbalanceSolution.Vel
@@ -52 +53 @@
 field_names     =['vel1','vel2']
 field_tolerances=[1e-11,1e-11]
-field_values=[\
-        vel1, \
-        vel2, \
-        ]
+field_values=[vel1,vel2]

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

@@ -31 +31 @@
 md.mesh.y=np.sin(theta)*x+np.cos(theta)*y
 
-md.stressbalance.referential[:,0:3]=np.tile([np.cos(theta),np.sin(theta),0],(md.mesh.numberofvertices))
-md.stressbalance.referential[:,3: ]=np.tile([0,0,1],(md.mesh.numberofvertices))
+md.stressbalance.referential[:,0:3]=np.tile([np.cos(theta),np.sin(theta),0],(md.mesh.numberofvertices,1))
+md.stressbalance.referential[:,3: ]=np.tile([0,0,1],(md.mesh.numberofvertices,1))
 md=solve(md,'Stressbalance')
 vel1=md.results.StressbalanceSolution.Vel
@@ -42 +42 @@
 field_names     =['vel1']
 field_tolerances=[1e-9]
-field_values=[\
-        vel1, \
-        ]
+field_values=[vel1]

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

@@ -20 +20 @@
 field_names     =['Vx','Vy','Vel','Pressure']
 field_tolerances=[1e-13,1e-13,1e-13,1e-13]
-field_values=[\
-        md.results.StressbalanceSolution.Vx,\
-        md.results.StressbalanceSolution.Vy,\
-        md.results.StressbalanceSolution.Vel,\
-        md.results.StressbalanceSolution.Pressure,\
-        ]
+field_values=[md.results.StressbalanceSolution.Vx,
+                                                        md.results.StressbalanceSolution.Vy,
+                                                        md.results.StressbalanceSolution.Vel,
+                                                        md.results.StressbalanceSolution.Pressure]