Changeset 17806 for issm/trunk/test/NightlyRun/test236.m

Timestamp:

04/22/14 10:39:19 (11 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 17804

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• test (modified) (1 prop)
• test/NightlyRun/test236.m (modified) (5 diffs)

issm/trunk/test/NightlyRun/test236.m

@@ -1 +1 @@
 md=triangle(model(),'../Exp/Square.exp',150000.);
 md=setmask(md,'all','');
+md=parameterize(md,'../Par/SquareShelf.par');
 
 % Use of ispdd and isdelta18o methods
-md.surfaceforcings.ispdd=1;
+md.surfaceforcings = SMBpdd();
 md.surfaceforcings.isdelta18o=1;
-
-md=parameterize(md,'../Par/SquareShelf.par');
 
 % Add temperature, precipitation and delta18o needed to measure the surface mass balance
@@ -46 +45 @@
 
 % 
+md.transient.requested_outputs={'default','SurfaceforcingsMonthlytemperatures'};
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',3);
@@ -60 +60 @@
         (md.results.TransientSolution(1).Vel),...
         (md.results.TransientSolution(1).Pressure),...
-        (md.results.TransientSolution(1).Bed),...
+        (md.results.TransientSolution(1).Base),...
         (md.results.TransientSolution(1).Surface),...
         (md.results.TransientSolution(1).Thickness),...
@@ -69 +69 @@
         (md.results.TransientSolution(2).Vel),...
         (md.results.TransientSolution(2).Pressure),...
-        (md.results.TransientSolution(2).Bed),...
+        (md.results.TransientSolution(2).Base),...
         (md.results.TransientSolution(2).Surface),...
         (md.results.TransientSolution(2).Thickness),...
@@ -78 +78 @@
         (md.results.TransientSolution(3).Vel),...
         (md.results.TransientSolution(3).Pressure),...
-        (md.results.TransientSolution(3).Bed),...
+        (md.results.TransientSolution(3).Base),...
         (md.results.TransientSolution(3).Surface),...
         (md.results.TransientSolution(3).Thickness),...