Changeset 21281

Timestamp:

10/17/16 02:44:43 (8 years ago)

Author:

bdef

Message:

NEW: adding python Nightlies that were missing

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test3300.py (added)
• test333.m (modified) (1 diff)
• test333.py (modified) (3 diffs)
• test334.py (added)
• test335.py (added)

issm/trunk-jpl/test/NightlyRun/test333.m ¶

@@ -41 +41 @@
 %                       mean(md.results.HydrologySolution(i).SedimentHead)*sedstore-0.4*i)
 %end
-
 %Fields and tolerances to track changes
 field_names     ={'SedimentWaterHead1','EplWaterHead1','SedimentHeadResidual1',...

issm/trunk-jpl/test/NightlyRun/test333.py ¶

@@ -1 +1 @@
 #Test Name: SquareSheetHydrologyDCTwoLayers
-import numpy
+import numpy as np
 from model import *
 from triangle import *
@@ -26 +26 @@
 md.hydrology.sedimentlimit_flag=1
 md.hydrology.sedimentlimit=800.0
-md.initialization.sediment_head=numpy.zeros((md.mesh.numberofvertices,1))
-md.hydrology.spcsediment_head=float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
+md.initialization.sediment_head=np.zeros((md.mesh.numberofvertices,1))
+md.hydrology.spcsediment_head=float('NaN')*np.ones((md.mesh.numberofvertices,1))
 
-md.basalforcings.groundedice_melting_rate = 2.0*numpy.ones((md.mesh.numberofvertices,1))
-md.basalforcings.floatingice_melting_rate = 0.0*numpy.ones((md.mesh.numberofvertices,1))
-md.hydrology.sediment_transmitivity= 3.0*numpy.ones((md.mesh.numberofvertices,1))
+md.basalforcings.groundedice_melting_rate = 2.0*np.ones((md.mesh.numberofvertices,1))
+md.basalforcings.floatingice_melting_rate = 0.0*np.ones((md.mesh.numberofvertices,1))
+md.hydrology.sediment_transmitivity= 3.0*np.ones((md.mesh.numberofvertices,1))
 
-md.initialization.epl_head=numpy.zeros((md.mesh.numberofvertices,1))
-md.initialization.epl_thickness=numpy.ones((md.mesh.numberofvertices,1))
-md.hydrology.spcepl_head=float('NaN')*numpy.ones((md.mesh.numberofvertices,1))
-md.hydrology.mask_eplactive_node=numpy.zeros((md.mesh.numberofvertices,1))
+md.initialization.epl_head=np.zeros((md.mesh.numberofvertices,1))
+md.initialization.epl_thickness=np.ones((md.mesh.numberofvertices,1))
+md.hydrology.spcepl_head=float('NaN')*np.ones((md.mesh.numberofvertices,1))
+md.hydrology.mask_eplactive_node=np.zeros((md.mesh.numberofvertices,1))
 md.hydrology.epl_conductivity=30
 md.hydrology.epl_initial_thickness=1
@@ -47 +47 @@
 md=solve(md,'Transient')
 
-field_names     =['SedimentWaterHead1','EplWaterHead1','SedimentHeadResidual1', \
-                                                'SedimentWaterHead4','EplWaterHead4','SedimentHeadResidual4', \
-                                                'SedimentWaterHead5','EplWaterHead5','SedimentHeadResidual5', \
-                                                'SedimentWaterHead9','EplWaterHead9','SedimentHeadResidual9']
-field_tolerances=[ \
-        1e-13, 1e-13, 1e-13, \
-        1e-13, 1e-13, 1e-13, \
-        1e-13, 5e-12, 1e-11, \
-        1e-13, 5e-12, 1e-11]
-field_values=[md.results.TransientSolution[0].SedimentHead, \
-                                                        md.results.TransientSolution[0].EplHead, \
-                                                        md.results.TransientSolution[0].SedimentHeadResidual, \
-                                                        md.results.TransientSolution[3].SedimentHead, \
-                                                        md.results.TransientSolution[3].EplHead, \
-                                                        md.results.TransientSolution[3].SedimentHeadResidual, \
-                                                        md.results.TransientSolution[4].SedimentHead, \
-                                                        md.results.TransientSolution[4].EplHead, \
-                                                        md.results.TransientSolution[4].SedimentHeadResidual, \
-                                                        md.results.TransientSolution[8].SedimentHead, \
-                                                        md.results.TransientSolution[8].EplHead, \
+sedvol=np.zeros(10)
+eplvol=np.zeros(10)
+time=np.arange(0.2,2.1,0.2)
+store=md.constants.g*md.hydrology.sediment_porosity*md.materials.rho_freshwater*((md.hydrology.sediment_compressibility/md.hydrology.sediment_porosity)+md.hydrology.water_compressibility);
+sedstore=20.0*store;
+for i in range(0,10):
+        sedvol[i]=np.mean(md.results.TransientSolution[i].SedimentHead)*sedstore
+        eplvol[i]=np.mean(md.results.TransientSolution[i].EplHead)*store*np.mean(md.results.TransientSolution[i].HydrologydcEplThickness)
+
+field_names=['SedimentWaterHead1','EplWaterHead1','SedimentHeadResidual1',
+                                                 'SedimentWaterHead4','EplWaterHead4','SedimentHeadResidual4',
+                                                 'SedimentWaterHead5','EplWaterHead5','SedimentHeadResidual5',
+                                                 'SedimentWaterHead9','EplWaterHead9','SedimentHeadResidual9']
+field_tolerances=[1e-13, 1e-13, 1e-13,
+                                                                        1e-13, 1e-13, 1e-13,
+                                                                        1e-13, 5e-12, 1e-11,
+                                                                        1e-13, 5e-12, 1e-11]
+field_values=[md.results.TransientSolution[0].SedimentHead,
+                                                        md.results.TransientSolution[0].EplHead,
+                                                        md.results.TransientSolution[0].SedimentHeadResidual,
+                                                        md.results.TransientSolution[3].SedimentHead,
+                                                        md.results.TransientSolution[3].EplHead,
+                                                        md.results.TransientSolution[3].SedimentHeadResidual,
+                                                        md.results.TransientSolution[4].SedimentHead,
+                                                        md.results.TransientSolution[4].EplHead,
+                                                        md.results.TransientSolution[4].SedimentHeadResidual,
+                                                        md.results.TransientSolution[8].SedimentHead,
+                                                        md.results.TransientSolution[8].EplHead,
                                                         md.results.TransientSolution[8].SedimentHeadResidual]