Changeset 18536

Timestamp:

09/23/14 16:30:29 (10 years ago)

Author:

seroussi

Message:

BUG: fixed melting_rate size

File:

• issm/trunk-jpl/test/NightlyRun/test4001.m (modified) (5 diffs)

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

@@ -127 +127 @@
 % {{{ GetMITgcm: 
 if perform(org,'GetMITgcm'),
-  %system([pwd '/../MITgcm/get_mitgcm.sh']);
+  system([pwd '/../MITgcm/get_mitgcm.sh']);
 end
 % }}}
@@ -694 +694 @@
             draft=md.results.TransientSolution(end).Base;
             pos=find(md.mask.ice_levelset>0); draft(pos)=0;
-            if md.mesh.dimension==3, 
-                %collapse onto bottom layer: 
-                draft=project2d(md,draft,1);
-            end
             if t>start_time
                 old_draft=readbin('run/icetopo.bin',[Nx,Ny]);
@@ -840 +836 @@
             %downward fresh water flux (m/y):
             melting_rate=-melting_rate(:)*y2s/rho_ice;
-                if md.mesh.dimension==3,
-                        md.basalforcings.floatingice_melting_rate=project3d(md,'vector',melting_rate,'type','node');
-                else
-                        md.basalforcings.floatingice_melting_rate=melting_rate;
-                end
+                 md.basalforcings.floatingice_melting_rate=melting_rate;
 
             % {{{ run ISSM and recover results 
@@ -854 +846 @@
                 base=md.results.TransientSolution(end).Base;
                 thickness=md.results.TransientSolution(end).Thickness;
-                if md.mesh.dimension==3,
-                        md.mesh.z=base+thickness./md.geometry.thickness.*(md.mesh.z-md.geometry.bed);
-                        md.initialization.vz=md.results.TransientSolution(end).Vz;
-                end
                 md.geometry.base=base;
                 md.geometry.thickness=thickness;
@@ -879 +867 @@
 end
 % }}}
+
+%Fields and tolerances to track changes
+fnm=['run/SHICE_fwFluxtave_0000004380.data'];
+melting_rate_1=readbin(fnm,[Nx Ny]);
+fnm=['run/SHICE_fwFluxtave_0000008760.data'];
+melting_rate_2=readbin(fnm,[Nx Ny]);
+fnm=['run/SHICE_fwFluxtave_0000013140.data'];
+melting_rate_3=readbin(fnm,[Nx Ny]);
+fnm=['run/SHICE_fwFluxtave_0000017520.data'];
+melting_rate_4=readbin(fnm,[Nx Ny]);
+field_names     ={'Base1','Melting1','Vx2','Vy2','Thickness2','Base2','MaskGroundediceLevelset2','FloatingiceMeltingRate2',...
+        'Melting2','Vx3','Vy3','Thickness3','Base3','MaskGroundediceLevelset3','FloatingiceMeltingRate3',...
+        'Melting3','Vx4','Vy4','Thickness4','Base4','MaskGroundediceLevelset4','FloatingiceMeltingRate4','Melting4'};
+field_tolerances={2e-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(1).TransientSolution(end).Base),...
+        (melting_rate_1(:)),...
+        (md.results(2).TransientSolution(end).Vx),...
+        (md.results(2).TransientSolution(end).Vy),...
+        (md.results(2).TransientSolution(end).Thickness),...
+        (md.results(2).TransientSolution(end).Base),...
+        (md.results(2).TransientSolution(end).MaskGroundediceLevelset),...
+        (md.results(2).TransientSolution(end).FloatingiceMeltingRate),...
+        (melting_rate_2(:)),...
+        (md.results(3).TransientSolution(end).Vx),...
+        (md.results(3).TransientSolution(end).Vy),...
+        (md.results(3).TransientSolution(end).Thickness),...
+        (md.results(3).TransientSolution(end).Base),...
+        (md.results(3).TransientSolution(end).MaskGroundediceLevelset),...
+        (md.results(3).TransientSolution(end).FloatingiceMeltingRate),...
+        (melting_rate_3(:)),...
+        (md.results(4).TransientSolution(end).Vx),...
+        (md.results(4).TransientSolution(end).Vy),...
+        (md.results(4).TransientSolution(end).Thickness),...
+        (md.results(4).TransientSolution(end).Base),...
+        (md.results(4).TransientSolution(end).MaskGroundediceLevelset),...
+        (md.results(4).TransientSolution(end).FloatingiceMeltingRate),...
+        (melting_rate_4(:)),...
+        };