Changeset 14179

Timestamp:

12/17/12 17:10:53 (12 years ago)

Author:

helsen

Message:

CHG: updating Michiel's NR + added check in runme so that the id makes sense

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• runme.m (modified) (1 diff)
• test328.m (modified) (1 diff)
• test329.m (modified) (2 diffs)

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

@@ -79 +79 @@
                         strncmp(fliplr(flist(i).name),fliplr('.m'),2)&...           %File name must end by '.m'
                         ~strcmp(flist(i).name,'test.m'))                            %File name must be different than 'test.m'
-                list_ids(end+1)=eval(flist(i).name(5:end-2));                  %Keep test id only (skip 'test' and '.m')
+                id=str2num(flist(i).name(5:end-2));
+                if isempty(id),
+                        disp(['WARNING: ignore file ' flist(i).name ]);
+                else
+                        list_ids(end+1)=eval(flist(i).name(5:end-2));                  %Keep test id only (skip 'test' and '.m')
+                end
         end
 end

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

@@ -4 +4 @@
 md=setflowequation(md,'macayeal','all');
 md.surfaceforcings.issmbgradients=1;
-md.surfaceforcings.smb_pos_max=5000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y;
-md.surfaceforcings.smb_pos_min=1250. + 0.00005*md.mesh.x -0.0001*md.mesh.y;
-md.surfaceforcings.a_pos=15000. - 0.000051*md.mesh.x + 0.00011*md.mesh.y;
 md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y;
-md.surfaceforcings.a_neg=-20000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y;
 md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y;
-md.surfaceforcings.hc=(md.surfaceforcings.a_pos-md.surfaceforcings.a_neg)./(md.surfaceforcings.b_neg-md.surfaceforcings.b_pos);
+md.surfaceforcings.href=md.geometry.surface;
+md.surfaceforcings.smbref= 1000 - 0.001*md.mesh.x - 0.005*md.mesh.y;
 md.transient.requested_outputs=TotalSmbEnum();
-md.surfaceforcings.href=md.geometry.surface;
-for i=1:size(md.surfaceforcings.hc),
-        if md.geometry.surface(i)<md.surfaceforcings.hc(i)
-                smbref(i)=md.surfaceforcings.a_neg(i)+md.surfaceforcings.b_neg(i)*md.geometry.surface(i);
-        else
-                smbref(i)=md.surfaceforcings.a_pos(i)+md.surfaceforcings.b_pos(i)*md.geometry.surface(i);
-        end
-end
-md.surfaceforcings.smbref=smbref';
 md.cluster=generic('name',oshostname(),'np',3);
 md=solve(md,TransientSolutionEnum());

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

@@ -5 +5 @@
 md=setflowequation(md,'pattyn','all');
 md.surfaceforcings.issmbgradients=1;
-md.surfaceforcings.smb_pos_max=5000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y;
-md.surfaceforcings.smb_pos_min=1250. + 0.00005*md.mesh.x -0.0001*md.mesh.y;
-md.surfaceforcings.a_pos=15000. - 0.000051*md.mesh.x + 0.00011*md.mesh.y;
 md.surfaceforcings.b_pos=-100. + 0.00005*md.mesh.x - 0.0001*md.mesh.y;
-md.surfaceforcings.a_neg=-20000. - 0.00005*md.mesh.x + 0.0001*md.mesh.y;
 md.surfaceforcings.b_neg=250. + 0.000051*md.mesh.x - 0.00011*md.mesh.y;
-md.surfaceforcings.hc=(md.surfaceforcings.a_pos-md.surfaceforcings.a_neg)./(md.surfaceforcings.b_neg-md.surfaceforcings.b_pos);
 md.surfaceforcings.href=md.geometry.surface;
-for i=1:size(md.surfaceforcings.hc),
-        if md.geometry.surface(i)<md.surfaceforcings.hc(i)
-                smbref(i)=md.surfaceforcings.a_neg(i)+md.surfaceforcings.b_neg(i)*md.geometry.surface(i);
-        else
-                smbref(i)=md.surfaceforcings.a_pos(i)+md.surfaceforcings.b_pos(i)*md.geometry.surface(i);
-        end
-end
-md.surfaceforcings.smbref=smbref';
+md.surfaceforcings.smbref= 1000 - 0.001*md.mesh.x - 0.005*md.mesh.y;
 md.transient.requested_outputs=TotalSmbEnum();
 md.cluster=generic('name',oshostname(),'np',3);
@@ -26 +14 @@
 
 %Fields and tolerances to track changes
-field_names     ={'Vx1','Vy1','Vz1','Vel1','Bed1','Surface1','Thickness1','Temperature1','SMB1','TotalSmb1','Vx2','Vy2','Vz2','Vel2','Bed2','Surface2','Thickness2','Temperature2','SMB2','TotalSmb1','Vx3','Vy3','Vz3','Vel3','Bed3','Surface3','Thickness3','Temperature3','SMB3','TotalSmb1'};
+field_names     ={'Vx1','Vy1','Vz1','Vel1','Bed1','Surface1','Thickness1','Temperature1','SMB1','TotalSmb1','Vx2','Vy2','Vz2','Vel2','Bed2','Surface2','Thickness2','Temperature2','SMB2','TotalSmb2','Vx3','Vy3','Vz3','Vel3','Bed3','Surface3','Thickness3','Temperature3','SMB3','TotalSmb3'};
 field_tolerances={1e-09,1e-09,1e-09,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...
         1e-09,1e-09,1e-10,1e-09,1e-10,1e-10,1e-10,1e-10,1e-10,1e-10,...