Changeset 21820

Timestamp:

07/19/17 13:24:09 (8 years ago)

Author:

schlegel

Message:

NEW: add testing for regional outputs, test for output frequency > 1, and test extrude/collapse of regional output

Location:

issm/trunk-jpl/test

Files:

• Archives/Archive426.arch (modified) ( previous)
• Archives/Archive443.arch (added)
• Archives/Archive444.arch (added)
• NightlyRun/test408.m (modified) (2 diffs)
• NightlyRun/test426.m (modified) (5 diffs)
• NightlyRun/test443.m (added)
• NightlyRun/test444.m (added)

issm/trunk-jpl/test/NightlyRun/test408.m

@@ -11 +11 @@
 md.friction.q=ones(md.mesh.numberofelements,1);
 md.friction.coefficientcoulomb=0.02*ones(md.mesh.numberofvertices,1);
-md=extrude(md,3,1);
 md.transient.isthermal=0;
 md.transient.isgroundingline=1;
@@ -17 +16 @@
 md.cluster=generic('name',oshostname(),'np',3);
 md.transient.requested_outputs={'default','GroundedArea','FloatingArea','TotalFloatingBmb','TotalGroundedBmb','TotalSmb'};
+md=extrude(md,3,1);
 md=solve(md,'Transient');
 

issm/trunk-jpl/test/NightlyRun/test426.m

@@ -10 +10 @@
 md.geometry.surface=md.geometry.base+md.geometry.thickness;
 md.smb.mass_balance(:)=100.;
-md=extrude(md,3,1.);
 md=setflowequation(md,'SSA','all');
 md.transient.isstressbalance=0;
 md.transient.isgroundingline=1;
 md.groundingline.migration='AggressiveMigration';
-md.transient.requested_outputs={'IceVolume','IceVolumeAboveFloatation'};
+md.transient.requested_outputs={'IceVolume','IceVolumeAboveFloatation','IceMass'};
+md=extrude(md,3,1.);
 md.cluster=generic('name',oshostname(),'np',3);
 
@@ -21 +21 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Bed1','Surface1','Thickness1','Floatingice1','IceVolume1','IceVolumeAboveFloatation1',...
-        'Bed2','Surface2','Thickness2','Floatingice2','IceVolume2','IceVolumeAboveFloatation2',...
-        'Bed3','Surface3','Thickness3','Floatingice3','IceVolume3','IceVolumeAboveFloatation3'};
-field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
-        1e-11,1e-10,1e-11,3e-11,2e-12,5e-12,...
-        1e-10,1e-10,1e-10,5e-11,2e-12,5e-12};
+field_names     ={'Bed1','Surface1','Thickness1','Floatingice1','IceVolume1','IceVolumeAboveFloatation1','IceMass1',...
+        'Bed2','Surface2','Thickness2','Floatingice2','IceVolume2','IceVolumeAboveFloatation2','IceMass2',...
+        'Bed3','Surface3','Thickness3','Floatingice3','IceVolume3','IceVolumeAboveFloatation3','IceMass3'};
+field_tolerances={1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,...
+        1e-11,1e-10,1e-11,3e-11,2e-12,5e-12,2e-12,...
+        1e-10,1e-10,1e-10,5e-11,2e-12,5e-12,2e-12};
 field_values={...
         (md.results.TransientSolution(1).Base),...
@@ -34 +34 @@
         (md.results.TransientSolution(1).IceVolume),...
         (md.results.TransientSolution(1).IceVolumeAboveFloatation),...
+        (md.results.TransientSolution(1).IceMass),...
         (md.results.TransientSolution(2).Base),...
         (md.results.TransientSolution(2).Surface),...
@@ -40 +41 @@
         (md.results.TransientSolution(2).IceVolume),...
         (md.results.TransientSolution(2).IceVolumeAboveFloatation),...
+        (md.results.TransientSolution(2).IceMass),...
         (md.results.TransientSolution(3).Base),...
         (md.results.TransientSolution(3).Surface),...
@@ -46 +48 @@
         (md.results.TransientSolution(3).IceVolume),...
         (md.results.TransientSolution(3).IceVolumeAboveFloatation),...
+        (md.results.TransientSolution(3).IceMass),...
         };