Changeset 22331 for issm/trunk-jpl/test/NightlyRun/test506.m

Timestamp:

01/04/18 16:06:16 (7 years ago)

Author:

seroussi

Message:

NEW: added test for new scaled routines

File:

• issm/trunk-jpl/test/NightlyRun/test506.m (modified) (3 diffs)

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

@@ -3 +3 @@
 md=setmask(md,'../Exp/PigShelves.exp','../Exp/PigIslands.exp');
 md=parameterize(md,'../Par/Pig.par');
+md.mesh.scale_factor=0.9*ones(md.mesh.numberofvertices,1);
 md=extrude(md,2,1.);
 md=setflowequation(md,'HO','all');
 md.cluster=generic('name',oshostname(),'np',3);
+md.transient.requested_outputs={'default','IceVolume','IceVolumeScaled','TotalSmb','TotalSmbScaled','TotalFloatingBmb','TotalFloatingBmbScaled','FloatingArea','FloatingAreaScaled','GroundedArea','GroundedAreaScaled'};
 md=solve(md,'Transient');
 
 %Fields and tolerances to track changes
-field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1', ...
-                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2'};
-field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-12,1e-11,2e-12,1e-11,1e-12,1e-09,...
-                                                1e-11,1e-11,1e-09,1e-11,1e-11,1e-10,1e-11,1e-10,1e-11,2e-08};
+field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1','IceVolume1','IceVolumeScaled1','GroundedArea1','GroundedAreaScaled1','FloatingArea1','FloatingAreaScaled1','TotalSmb1','TotalSmbScaled1','TotalFloatingBmb1','TotalFloatingBmbScaled1', ...
+                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2','IceVolume2','IceVolumeScaled2','GroundedArea2','GroundedAreaScaled2','FloatingArea2','FloatingAreaScaled2','TotalSmb2','TotalSmbScaled2','TotalFloatingBmb2','TotalFloatingBmbScaled2'};
+field_tolerances={1e-10,1e-10,1e-10,1e-10,1e-12,1e-11,2e-12,1e-11,1e-12,1e-09,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
+                                                1e-11,1e-11,1e-09,1e-11,1e-11,1e-10,1e-11,1e-10,1e-11,2e-08,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
 field_values={...
         (md.results.TransientSolution(1).Vx),...
@@ -24 +26 @@
         (md.results.TransientSolution(1).Temperature),...
         (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
+        (md.results.TransientSolution(1).IceVolume),...
+        (md.results.TransientSolution(1).IceVolumeScaled),...
+        (md.results.TransientSolution(1).GroundedArea),...
+        (md.results.TransientSolution(1).GroundedAreaScaled),...
+        (md.results.TransientSolution(1).FloatingArea),...
+        (md.results.TransientSolution(1).FloatingAreaScaled),...
+        (md.results.TransientSolution(1).TotalSmb),...
+        (md.results.TransientSolution(1).TotalSmbScaled),...
+        (md.results.TransientSolution(1).TotalFloatingBmb),...
+        (md.results.TransientSolution(1).TotalFloatingBmbScaled),...
         (md.results.TransientSolution(2).Vx),...
         (md.results.TransientSolution(2).Vy),...
@@ -34 +46 @@
         (md.results.TransientSolution(2).Temperature),...
         (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
+        (md.results.TransientSolution(2).IceVolume),...
+        (md.results.TransientSolution(2).IceVolumeScaled),...
+        (md.results.TransientSolution(2).GroundedArea),...
+        (md.results.TransientSolution(2).GroundedAreaScaled),...
+        (md.results.TransientSolution(2).FloatingArea),...
+        (md.results.TransientSolution(2).FloatingAreaScaled),...
+        (md.results.TransientSolution(2).TotalSmb),...
+        (md.results.TransientSolution(2).TotalSmbScaled),...
+        (md.results.TransientSolution(2).TotalFloatingBmb),...
+        (md.results.TransientSolution(2).TotalFloatingBmbScaled),...
         };