Changeset 24313 for issm/trunk/test/NightlyRun/test245.py

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun/test245.py (modified) (2 diffs)

issm/trunk/test/NightlyRun/test245.py

@@ -11 +11 @@
 from SMBpddSicopolis import *
 
-md = triangle(model(),'../Exp/Square.exp',150000.)
-md = setmask(md,'all','')
-md = parameterize(md,'../Par/SquareShelf.py')
+md = triangle(model(), '../Exp/Square.exp', 150000.)
+md = setmask(md, 'all', '')
+md = parameterize(md, '../Par/SquareShelf.py')
 
 # Use of SMBpddSicopolis
-md.smb  =  SMBpddSicopolis()
+md.smb = SMBpddSicopolis()
 # initalize pdd fields
 md.smb.initialize(md)
-md.smb.s0p = md.geometry.surface
-md.smb.s0t = md.geometry.surface
+md.smb.s0p = md.geometry.surface.reshape(-1, 1)
+md.smb.s0t = md.geometry.surface.reshape(-1, 1)
 
-# 
-md.smb.monthlytemperatures = np.empty((md.mesh.numberofvertices+1,12))
-md.smb.precipitation = np.empty((md.mesh.numberofvertices+1,12))
-temp_ma_present = -10. * np.ones((md.mesh.numberofvertices,)) - md.smb.rlaps * md.geometry.surface / 1000.
-temp_mj_present = 10. * np.ones((md.mesh.numberofvertices,)) - md.smb.rlaps * md.geometry.surface / 1000.
-precipitation = 5. * np.ones((md.mesh.numberofvertices,))
-for imonth in range(12): 
-        md.smb.monthlytemperatures[0:md.mesh.numberofvertices,imonth] = md.materials.meltingpoint + temp_ma_present + (temp_mj_present - temp_ma_present) * np.sin((imonth + 1. - 4.) * np.pi / 6.0)
-        md.smb.monthlytemperatures[md.mesh.numberofvertices,imonth] = ((imonth+1)/12.)
-        md.smb.precipitation[0:md.mesh.numberofvertices,imonth] = precipitation
-        md.smb.precipitation[md.mesh.numberofvertices,imonth] = ((imonth+1)/12.)
+
+md.smb.monthlytemperatures = np.empty((md.mesh.numberofvertices + 1, 12))
+md.smb.precipitation = np.empty((md.mesh.numberofvertices + 1, 12))
+temp_ma_present = -10. * np.ones((md.mesh.numberofvertices, )) - md.smb.rlaps * md.geometry.surface / 1000.
+temp_mj_present = 10. * np.ones((md.mesh.numberofvertices, )) - md.smb.rlaps * md.geometry.surface / 1000.
+precipitation = 5. * np.ones((md.mesh.numberofvertices, ))
+for imonth in range(12):
+    md.smb.monthlytemperatures[0:md.mesh.numberofvertices, imonth] = md.materials.meltingpoint + temp_ma_present + (temp_mj_present - temp_ma_present) * np.sin((imonth + 1. - 4.) * np.pi / 6.0)
+    md.smb.monthlytemperatures[md.mesh.numberofvertices, imonth] = ((imonth + 1) / 12.)
+    md.smb.precipitation[0:md.mesh.numberofvertices, imonth] = precipitation
+    md.smb.precipitation[md.mesh.numberofvertices, imonth] = ((imonth + 1) / 12.)
 
 # time steps and resolution
@@ -44 +44 @@
 md.transient.isthermal = 0
 
-md.transient.requested_outputs = ['default','TemperaturePDD']
-md.cluster = generic('name',gethostname(),'np',1) # 3 for the cluster
-md = solve(md,'Transient')
+md.transient.requested_outputs = ['default', 'TemperaturePDD']
+md.cluster = generic('name', gethostname(), 'np', 1)  # 3 for the cluster
+md = solve(md, 'Transient')
 
 #Fields and tolerances to track changes
-field_names      = ['TemperaturePDD1','SmbMassBalance1','TemperaturePDD2','SmbMassBalance2']
-field_tolerances = [1e-13,1e-13,1e-13,1e-13]
-field_values = [
-        md.results.TransientSolution[0].TemperaturePDD,
-        md.results.TransientSolution[0].SmbMassBalance,
-        md.results.TransientSolution[1].TemperaturePDD,
-        md.results.TransientSolution[1].SmbMassBalance,
-        ]
-
+field_names = ['TemperaturePDD1', 'SmbMassBalance1', 'TemperaturePDD2', 'SmbMassBalance2']
+field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13]
+field_values = [md.results.TransientSolution[0].TemperaturePDD,
+                md.results.TransientSolution[0].SmbMassBalance,
+                md.results.TransientSolution[1].TemperaturePDD,
+                md.results.TransientSolution[1].SmbMassBalance]