Changeset 23130

Timestamp:

08/18/18 14:05:21 (7 years ago)

Author:

kruegern

Message:

NEW: added python qmu linear tests (218,244,250,251,412,440) and made a minor change to runme.py to more gracefully handle misshapen test results and handle a simple error-case. Minor edits to other tests.

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• runme.py (modified) (1 diff)
• test218.py (added)
• test244.py (added)
• test250.py (added)
• test251.py (added)
• test412.py (added)
• test440.py (added)
• test511.py (modified) (2 diffs)
• test613.py (modified) (1 diff)
• test703.py (modified) (1 diff)

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

@@ -183 +183 @@
                                                 if str(archive) == 'None':
                                                         raise NameError("Field name '"+archive_name+'_field'+str(k+1)+"' does not exist in archive file.")
+                                                if np.shape(field) != np.shape(archive) and not np.shape(field) in [(1,1),(0,0),(1,0),(0,1)]:
+                                                        field = field.T
+                                                        if np.shape(field) != np.shape(archive):
+                                                                raise RuntimeError("Field '"+archive_name+"' from test is malformed; shape is "+str(np.shape(field.T))+", should be "+str(np.shape(archive))+" (or "+str(np.shape(archive.T))+").")
+                                                
                                                 error_diff=np.amax(np.abs(archive-field),axis=0)/(np.amax(np.abs(archive),axis=0)+float_info.epsilon)
+
                                                 if not np.isscalar(error_diff): error_diff=error_diff[0]
 

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

@@ -8 +8 @@
 from setflowequation import *
 from solve import *
-
 
 md=triangle(model(),'../Exp/Pig.exp',11000.)
@@ -41 +40 @@
 field_names     =['Gradient','Misfits','MaterialsRheologyB','Pressure','Vel','Vx','Vy']
 field_tolerances=[5e-11,5e-11,5e-11,1e-09,1e-11,5e-11,1e-11]
-field_values=[\
-        md.results.StressbalanceSolution.Gradient1,\
-        md.results.StressbalanceSolution.J,\
-        md.results.StressbalanceSolution.MaterialsRheologyBbar,\
-        md.results.StressbalanceSolution.Pressure,\
-        md.results.StressbalanceSolution.Vel,\
-        md.results.StressbalanceSolution.Vx,\
-        md.results.StressbalanceSolution.Vy,\
+field_values=[
+        md.results.StressbalanceSolution.Gradient1,
+        md.results.StressbalanceSolution.J,
+        md.results.StressbalanceSolution.MaterialsRheologyBbar,
+        md.results.StressbalanceSolution.Pressure,
+        md.results.StressbalanceSolution.Vel,
+        md.results.StressbalanceSolution.Vx,
+        md.results.StressbalanceSolution.Vy,
 ]

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

@@ -19 +19 @@
 
 #Ice sheet only
-md=md.extract(md.mask.groundedice_levelset>0.)
+md=model.extract(md,md.mask.groundedice_levelset>0.)
 pos=np.nonzero(md.mesh.vertexonboundary)
 md.balancethickness.spcthickness[pos]=md.geometry.thickness[pos]

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

@@ -59 +59 @@
 md.stressbalance.spcvz = np.nan * np.ones((md.mesh.numberofvertices))
 md.stressbalance.referential = np.nan * np.ones((md.mesh.numberofvertices,6))
-md.stressbalance.loadingforce = 0 * np.ones((md.mesh.numberofvertices,3))
+md.stressbalance.loadingforce = np.zeros((md.mesh.numberofvertices,3))
 md.stressbalance.spcvx[np.where(md.mesh.vertexflags(4))] = 800.
 md.stressbalance.spcvy[np.where(md.mesh.vertexflags(4))] = 0.