Changeset 21408 for issm/trunk-jpl/test/NightlyRun/test1201.py

Timestamp:

11/22/16 02:31:19 (8 years ago)

Author:

bdef

Message:

CHG: uniformization fix

File:

• issm/trunk-jpl/test/NightlyRun/test1201.py (modified) (7 diffs)

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

@@ -1 +1 @@
 #Test Name: EISMINTMassConservation
-import numpy
+import numpy as np
 from model import *
+from socket import gethostname
 from bamg import *
 from setmask import *
@@ -7 +8 @@
 from setflowequation import *
 from solve import *
-from MatlabFuncs import *
+
 
 """
@@ -14 +15 @@
 
 printingflag=False
-
 results=[]
 
@@ -24 +24 @@
         md.smb.mass_balance[:]=0.
         md=setflowequation(md,'SSA','all')
-        md.cluster=generic('name',oshostname(),'np',8)
+        md.cluster=generic('name',gethostname(),'np',8)
 
         print "      initial velocity"
-        md.initialization.vx=numpy.zeros((md.mesh.numberofvertices,1))
-        md.initialization.vy=-400.*numpy.ones((md.mesh.numberofvertices,1))
+        md.initialization.vx=np.zeros((md.mesh.numberofvertices))
+        md.initialization.vy=-400.*np.ones((md.mesh.numberofvertices))
 
         #Stabilization
@@ -37 +37 @@
 
         #spc thickness
-        pos=numpy.nonzero(md.mesh.y>199999.9)[0]
-        times=numpy.arange(0,501)
-        md.masstransport.spcthickness=float('NaN')*numpy.ones((md.mesh.numberofvertices+1,numpy.size(times)))
+        pos=np.where(md.mesh.y>199999.9)[0]
+        times=np.arange(0,501)
+        md.masstransport.spcthickness=float('NaN')*np.ones((md.mesh.numberofvertices+1,np.size(times)))
         md.masstransport.spcthickness[-1,:]=times
-        md.masstransport.spcthickness[pos,:]=numpy.tile(500.+100.*numpy.sin(2.*numpy.pi*times/200.),(numpy.size(pos),1))
+        md.masstransport.spcthickness[pos,:]=500.+100.*np.sin(2.*np.pi*times/200.)
         if stabilization==3:
-                pos=numpy.nonzero(numpy.isnan(md.masstransport.spcthickness))
+                pos=np.nonzero(np.isnan(md.masstransport.spcthickness))
                 md.masstransport.spcthickness[pos]=500.    #No NaN for DG
 
@@ -54 +54 @@
 
 #plot results
-#[elements,x,y,z,s,h1]=SectionValues(md,results[0],'../Exp/CrossLineEISMINT.exp',100.);
-#[elements,x,y,z,s,h2]=SectionValues(md,results[1],'../Exp/CrossLineEISMINT.exp',100.);
-#[elements,x,y,z,s,h3]=SectionValues(md,results[2],'../Exp/CrossLineEISMINT.exp',100.);
-#[elements,x,y,z,s,hth]=SectionValues(md, 500+100*sin(2*pi/200*(500-md.mesh.y/400)),'../Exp/CrossLineEISMINT.exp',100.);
+#[elements,x,y,z,s,h1]=SectionValues(md,results[0],'../Exp/CrossLineEISMINT.exp',100.)
+#[elements,x,y,z,s,h2]=SectionValues(md,results[1],'../Exp/CrossLineEISMINT.exp',100.)
+#[elements,x,y,z,s,h3]=SectionValues(md,results[2],'../Exp/CrossLineEISMINT.exp',100.)
+#[elements,x,y,z,s,hth]=SectionValues(md, 500+100*sin(2*pi/200*(500-md.mesh.y/400)),'../Exp/CrossLineEISMINT.exp',100.)
 #plot(s,h1,'r',s,h2,'b',s,h3,'g',s,hth,'k')
 #legend('Art. diff.','No Art. diff.','D.G.','Theoretical')
@@ -63 +63 @@
         pass
 #       set(gcf,'Color','w')
-#       export_fig([issmdir() '/website/doc_pdf/validation/Images/EISMINT/IceShelf/eismintmasscthickness.pdf']);
+#       export_fig([issmdir() '/website/doc_pdf/validation/Images/EISMINT/IceShelf/eismintmasscthickness.pdf'])
 
 #Fields and tolerances to track changes
-field_names     =[ \
-        'ThicknessArtDiff','ThicknessNoArtDiff','ThicknessDG' \
-]
-field_tolerances=[\
-        1e-13, 1e-13, 1e-13\
-]
-field_values=[
-        results[0], \
-        results[1], \
-        results[2], \
-]
+field_names     =['ThicknessArtDiff','ThicknessNoArtDiff','ThicknessDG']
+field_tolerances=[1e-13, 1e-13, 1e-13]
+field_values=[results[0],results[1],results[2]]