Changeset 21759 for issm/branches/trunk-larour-NatGeoScience2016/test/NightlyRun/test1301.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/test/NightlyRun/test1301.py (modified) (5 diffs)

issm/branches/trunk-larour-NatGeoScience2016/test/NightlyRun/test1301.py

@@ -1 +1 @@
 #Test Name: ThermalMelting
-import numpy
+import numpy as np
 from model import *
+from socket import gethostname
 from triangle import *
 from setmask import *
@@ -8 +9 @@
 from paterson import *
 from solve import *
-from MatlabFuncs import *
+
 
 """
@@ -27 +28 @@
 
 #Some conditions specific to melting test
-md.initialization.pressure=numpy.zeros((md.mesh.numberofvertices,1),int)
-md.initialization.temperature=273.15*numpy.ones((md.mesh.numberofvertices,1))
-pos=numpy.nonzero(md.mesh.vertexonsurface)[0]
+md.initialization.pressure=np.zeros((md.mesh.numberofvertices,1),int)
+md.initialization.temperature=273.15*np.ones((md.mesh.numberofvertices))
+pos=np.nonzero(md.mesh.vertexonsurface)[0]
 md.thermal.spctemperature[pos]=md.initialization.temperature[pos]
 md.materials.rheology_B=paterson(md.initialization.temperature)
@@ -39 +40 @@
 
 #modeled results
-md.cluster=generic('name',oshostname(),'np',2)
+md.cluster=generic('name',gethostname(),'np',2)
 md=solve(md,'Thermal')
 
 #plot results
 comp_melting=md.results.ThermalSolution.BasalforcingsGroundediceMeltingRate
-relative=numpy.abs((comp_melting-melting)/melting)*100.
-relative[numpy.nonzero(comp_melting==melting)[0]]=0.
+relative=np.abs((comp_melting-melting)/melting)*100.
+relative[np.nonzero(comp_melting==melting)[0]]=0.
 #plotmodel(md,'data',comp_melting,'title','Modeled melting','data',melting,'title','Analytical melting',...
 #       'data',comp_melting-melting,'title','Absolute error','data',relative,'title','Relative error [%]',...
@@ -52 +53 @@
         pass
 #       set(gcf,'Color','w')
-#       printmodel('thermalmelting','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off');
-#       system(['mv thermalmelting.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Thermal ']);
+#       printmodel('thermalmelting','png','margin','on','marginsize',25,'frame','off','resolution',0.7,'hardcopy','off')
+#       system(['mv thermalmelting.png ' ISSM_DIR '/website/doc_pdf/validation/Images/Thermal '])
 
 #Fields and tolerances to track changes