Changeset 18301 for issm/trunk/test/NightlyRun/test317.m

Timestamp:

07/30/14 14:22:43 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 18299

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun/test317.m (modified) (4 diffs)

issm/trunk/test/NightlyRun/test317.m

@@ -8 +8 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1',...
-        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2',...
-        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'};
+field_names     ={'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsGroundediceMeltingRate1',...
+        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsGroundediceMeltingRate2',...
+        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsGroundediceMeltingRate3'};
 field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
         1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
@@ -24 +24 @@
         (md.results.TransientSolution(1).Thickness),...
         (md.results.TransientSolution(1).Temperature),...
-        (md.results.TransientSolution(1).BasalforcingsMeltingRate),...
+        (md.results.TransientSolution(1).BasalforcingsGroundediceMeltingRate),...
         (md.results.TransientSolution(2).Vx),...
         (md.results.TransientSolution(2).Vy),...
@@ -34 +34 @@
         (md.results.TransientSolution(2).Thickness),...
         (md.results.TransientSolution(2).Temperature),...
-        (md.results.TransientSolution(2).BasalforcingsMeltingRate),...
+        (md.results.TransientSolution(2).BasalforcingsGroundediceMeltingRate),...
         (md.results.TransientSolution(3).Vx),...
         (md.results.TransientSolution(3).Vy),...
@@ -44 +44 @@
         (md.results.TransientSolution(3).Thickness),...
         (md.results.TransientSolution(3).Temperature),...
-        (md.results.TransientSolution(3).BasalforcingsMeltingRate),...
+        (md.results.TransientSolution(3).BasalforcingsGroundediceMeltingRate),...
         };