Changeset 22338 for issm/trunk-jpl/test/NightlyRun/test443.m

Timestamp:

01/05/18 14:16:06 (7 years ago)

Author:

seroussi

Message:

CHG: added scaling in test443

File:

• issm/trunk-jpl/test/NightlyRun/test443.m (modified) (6 diffs)

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

@@ -14 +14 @@
 md.transient.isgroundingline=1;
 md.groundingline.migration='AggressiveMigration';
+md.mesh.scale_factor=1.1*ones(md.mesh.numberofvertices,1);
 
 md.settings.output_frequency=2;
@@ -23 +24 @@
 regionalmask(find(in))=1;
 md.transient.requested_outputs={'default','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1',...
-        'IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation2','IceVolumeAboveFloatation'};
+        'IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation2','IceVolumeAboveFloatation',...
+        'IceMassScaled1','IceVolumeScaled1','IceVolumeAboveFloatationScaled1','IceVolumeAboveFloatationScaled2'};
 md.outputdefinition.definitions{1}=regionaloutput('name','GroundedArea1','outputnamestring','GroundedArea','mask',regionalmask,...
         'definitionstring','Outputdefinition1');
@@ -42 +44 @@
 md.outputdefinition.definitions{9}=regionaloutput('name','IceVolumeAboveFloatation2','outputnamestring','IceVolumeAboveFloatation',...
         'maskexpstring','../Exp/SquareHalfRight.exp','definitionstring','Outputdefinition9','model',md);
+md.outputdefinition.definitions{10}=regionaloutput('name','IceMassScaled1','outputnamestring','IceMassScaled','mask',regionalmask,...
+        'definitionstring','Outputdefinition10');
+md.outputdefinition.definitions{11}=regionaloutput('name','IceVolumeScaled1','outputnamestring','IceVolumeScaled','mask',regionalmask,...
+        'definitionstring','Outputdefinition11');
+md.outputdefinition.definitions{12}=regionaloutput('name','IceVolumeAboveFloatationScaled1','outputnamestring','IceVolumeAboveFloatationScaled','mask',regionalmask,...
+        'definitionstring','Outputdefinition12');
+md.outputdefinition.definitions{13}=regionaloutput('name','IceVolumeAboveFloatationScaled2','outputnamestring','IceVolumeAboveFloatationScaled',...
+        'maskexpstring','../Exp/SquareHalfRight.exp','definitionstring','Outputdefinition13','model',md);
 
 md=extrude(md,3,1);
@@ -50 +60 @@
 field_names     ={'IceMass1','IceVolume1','IceVolumeAboveFloatation1','IceVolumeAboveFloatation21',...
         'Thickness1','GroundedArea1','FloatingArea1','TotalFloatingBmb1','TotalGroundedBmb1','TotalSmb1',...
+   'IceMassScaled1','IceVolumeScaled1','IceVolumeAboveFloatationScaled1','IceVolumeAboveFloatationScaled21',...
         'IceMass3','IceVolume3','IceVolumeAboveFloatation3','IceVolumeAboveFloatation23',...
         'Thickness3','GroundedArea3','FloatingArea3','TotalFloatingBmb3','TotalGroundedBmb3','TotalSmb3',...
+        'IceMassScaled3','IceVolumeScaled3','IceVolumeAboveFloatationScaled3','IceVolumeAboveFloatationScaled23',...
         'ExtrudedMask','CollapsedMask'};
-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};
+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,1e-13,1e-13,1e-13};
 field_values={...
         (md.results.TransientSolution(1).IceMass1),...
@@ -66 +78 @@
         (md.results.TransientSolution(1).TotalGroundedBmb1),...
         (md.results.TransientSolution(1).TotalSmb1),...
+        (md.results.TransientSolution(1).IceMassScaled1),...
+        (md.results.TransientSolution(1).IceVolumeScaled1),...
+        (md.results.TransientSolution(1).IceVolumeAboveFloatationScaled1),...
+        (md.results.TransientSolution(1).IceVolumeAboveFloatationScaled2),...
         (md.results.TransientSolution(3).IceMass1),...
         (md.results.TransientSolution(3).IceVolume1),...
@@ -76 +92 @@
         (md.results.TransientSolution(3).TotalGroundedBmb1),...
         (md.results.TransientSolution(3).TotalSmb1),...
+        (md.results.TransientSolution(3).IceMassScaled1),...
+        (md.results.TransientSolution(3).IceVolumeScaled1),...
+        (md.results.TransientSolution(3).IceVolumeAboveFloatationScaled1),...
+        (md.results.TransientSolution(3).IceVolumeAboveFloatationScaled2),...
         length(md.outputdefinition.definitions{1}.mask),...
         length(md2.outputdefinition.definitions{1}.mask),...