Changeset 24313 for issm/trunk/test/NightlyRun/test240.m

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/test240.m (modified) (5 diffs)

issm/trunk/test/NightlyRun/test240.m

@@ -45 +45 @@
 md.timestepping.interp_forcings=0;
 
-% 
-md.transient.requested_outputs={'default','SmbMonthlytemperatures'};
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',1); % 3 for the cluster
@@ -52 +50 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMonthlytemperatures1','SmbMassBalance1',...
-              'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMonthlytemperatures2','SmbMassBalance2',...
-              'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMonthlytemperatures3','SmbMassBalance3'};
-field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
-           1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
-           1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13};
+field_names     ={'Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','SmbMassBalance1',...
+              'Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','SmbMassBalance2',...
+              'Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3','SmbMassBalance3'};
+field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
+           1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,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),...
@@ -66 +64 @@
         (md.results.TransientSolution(1).Surface),...
         (md.results.TransientSolution(1).Thickness),...
-        (md.results.TransientSolution(1).SmbMonthlytemperatures),...
         (md.results.TransientSolution(1).SmbMassBalance),...
         (md.results.TransientSolution(2).Vx),...
@@ -75 +72 @@
         (md.results.TransientSolution(2).Surface),...
         (md.results.TransientSolution(2).Thickness),...
-        (md.results.TransientSolution(2).SmbMonthlytemperatures),...
         (md.results.TransientSolution(2).SmbMassBalance),...
         (md.results.TransientSolution(3).Vx),...
@@ -84 +80 @@
         (md.results.TransientSolution(3).Surface),...
         (md.results.TransientSolution(3).Thickness),...
-        (md.results.TransientSolution(3).SmbMonthlytemperatures),...
         (md.results.TransientSolution(3).SmbMassBalance),...
         };