Index: /issm/trunk/test/NightlyRun/Id2Name.m =================================================================== --- /issm/trunk/test/NightlyRun/Id2Name.m (revision 5054) +++ /issm/trunk/test/NightlyRun/Id2Name.m (revision 5055) @@ -206,4 +206,5 @@ elseif (id==1202), name='EISMINTDiag1'; elseif (id==1203), name='EISMINTDiag2'; +elseif (id==1203), name='EISMINTRoundIceSheet'; elseif (id==1301), name='ThermalMelting'; elseif (id==1302), name='ThermalAdvection'; Index: /issm/trunk/test/NightlyRun/test1101_nightly.m =================================================================== --- /issm/trunk/test/NightlyRun/test1101_nightly.m (revision 5054) +++ /issm/trunk/test/NightlyRun/test1101_nightly.m (revision 5055) @@ -1,10 +1,10 @@ -field_names ={... +field_names ={ ... 'Vx5km','Vy5km','Vz5km',... 'Vx10km','Vy10km','Vz10km',... 'Vx20km','Vy20km','Vz20km',... 'Vx40km','Vy40km','Vz40km',... - 'Vx80km','Vy80km','Vz80km' + 'Vx80km','Vy80km','Vz80km',... 'Vx160km','Vy160km','Vz160km' -} +}; field_tolerances={... 1e-13,1e-13,1e-13,... @@ -17,9 +17,9 @@ field_values={}; for i=1:6, - result=results{i} - field_values={field_values,... - PatchToVec(result.DiagnosticSolution.Vx),... - PatchToVec(result.DiagnosticSolution.Vy),... - PatchToVec(result.DiagnosticSolution.Vz),... + result=results{i}; + field_values={field_values{:},... + PatchToVec(result.Vx),... + PatchToVec(result.Vy),... + PatchToVec(result.Vz),... }; end Index: /issm/trunk/test/NightlyRun/test1102.m =================================================================== --- /issm/trunk/test/NightlyRun/test1102.m (revision 5054) +++ /issm/trunk/test/NightlyRun/test1102.m (revision 5055) @@ -2,5 +2,5 @@ %Pattyn and Payne 2006 -L_list={5000,10000,20000,40000,80000,160000} +L_list={5000,10000,20000,40000,80000,160000}; results={}; Index: /issm/trunk/test/NightlyRun/test1102_nightly.m =================================================================== --- /issm/trunk/test/NightlyRun/test1102_nightly.m (revision 5054) +++ /issm/trunk/test/NightlyRun/test1102_nightly.m (revision 5055) @@ -4,5 +4,5 @@ 'Vx20km','Vy20km','Vz20km',... 'Vx40km','Vy40km','Vz40km',... - 'Vx80km','Vy80km','Vz80km' + 'Vx80km','Vy80km','Vz80km',... 'Vx160km','Vy160km','Vz160km' } @@ -17,9 +17,9 @@ field_values={}; for i=1:6, - result=results{i} - field_values={field_values,... - PatchToVec(result.DiagnosticSolution.Vx),... - PatchToVec(result.DiagnosticSolution.Vy),... - PatchToVec(result.DiagnosticSolution.Vz),... + result=results{i}; + field_values={field_values{:},... + PatchToVec(result.Vx),... + PatchToVec(result.Vy),... + PatchToVec(result.Vz),... }; end Index: /issm/trunk/test/NightlyRun/test1103_nightly.m =================================================================== --- /issm/trunk/test/NightlyRun/test1103_nightly.m (revision 5054) +++ /issm/trunk/test/NightlyRun/test1103_nightly.m (revision 5055) @@ -4,5 +4,5 @@ 'Vx20km','Vy20km','Vz20km',... 'Vx40km','Vy40km','Vz40km',... - 'Vx80km','Vy80km','Vz80km' + 'Vx80km','Vy80km','Vz80km',... 'Vx160km','Vy160km','Vz160km' } @@ -17,9 +17,9 @@ field_values={}; for i=1:6, - result=results{i} - field_values={field_values,... - PatchToVec(result.DiagnosticSolution.Vx),... - PatchToVec(result.DiagnosticSolution.Vy),... - PatchToVec(result.DiagnosticSolution.Vz),... + result=results{i}; + field_values={field_values{:},... + PatchToVec(result.Vx),... + PatchToVec(result.Vy),... + PatchToVec(result.Vz),... }; end Index: /issm/trunk/test/NightlyRun/test1104_nightly.m =================================================================== --- /issm/trunk/test/NightlyRun/test1104_nightly.m (revision 5054) +++ /issm/trunk/test/NightlyRun/test1104_nightly.m (revision 5055) @@ -4,5 +4,5 @@ 'Vx20km','Vy20km','Vz20km',... 'Vx40km','Vy40km','Vz40km',... - 'Vx80km','Vy80km','Vz80km' + 'Vx80km','Vy80km','Vz80km',... 'Vx160km','Vy160km','Vz160km' } @@ -17,9 +17,9 @@ field_values={}; for i=1:6, - result=results{i} - field_values={field_values,... - PatchToVec(result.DiagnosticSolution.Vx),... - PatchToVec(result.DiagnosticSolution.Vy),... - PatchToVec(result.DiagnosticSolution.Vz),... + result=results{i}; + field_values={field_values{i},... + PatchToVec(result.Vx),... + PatchToVec(result.Vy),... + PatchToVec(result.Vz),... }; end Index: /issm/trunk/test/NightlyRun/test1105_nightly.m =================================================================== --- /issm/trunk/test/NightlyRun/test1105_nightly.m (revision 5054) +++ /issm/trunk/test/NightlyRun/test1105_nightly.m (revision 5055) @@ -4,5 +4,5 @@ 'Vx20km','Vy20km','Vz20km',... 'Vx40km','Vy40km','Vz40km',... - 'Vx80km','Vy80km','Vz80km' + 'Vx80km','Vy80km','Vz80km',... 'Vx160km','Vy160km','Vz160km' } @@ -17,9 +17,9 @@ field_values={}; for i=1:6, - result=results{i} - field_values={field_values,... - PatchToVec(result.DiagnosticSolution.Vx),... - PatchToVec(result.DiagnosticSolution.Vy),... - PatchToVec(result.DiagnosticSolution.Vz),... + result=results{i}; + field_values={field_values{:},... + PatchToVec(result.Vx),... + PatchToVec(result.Vy),... + PatchToVec(result.Vz),... }; end Index: /issm/trunk/test/NightlyRun/test1106_nightly.m =================================================================== --- /issm/trunk/test/NightlyRun/test1106_nightly.m (revision 5054) +++ /issm/trunk/test/NightlyRun/test1106_nightly.m (revision 5055) @@ -4,5 +4,5 @@ 'Vx20km','Vy20km','Vz20km',... 'Vx40km','Vy40km','Vz40km',... - 'Vx80km','Vy80km','Vz80km' + 'Vx80km','Vy80km','Vz80km',... 'Vx160km','Vy160km','Vz160km' } @@ -17,9 +17,9 @@ field_values={}; for i=1:6, - result=results{i} - field_values={field_values,... - PatchToVec(result.DiagnosticSolution.Vx),... - PatchToVec(result.DiagnosticSolution.Vy),... - PatchToVec(result.DiagnosticSolution.Vz),... + result=results{i}; + field_values={field_values{:},... + PatchToVec(result.Vx),... + PatchToVec(result.Vy),... + PatchToVec(result.Vz),... }; end Index: /issm/trunk/test/NightlyRun/test1107_nightly.m =================================================================== --- /issm/trunk/test/NightlyRun/test1107_nightly.m (revision 5054) +++ /issm/trunk/test/NightlyRun/test1107_nightly.m (revision 5055) @@ -4,5 +4,5 @@ 'Vx20km','Vy20km','Vz20km',... 'Vx40km','Vy40km','Vz40km',... - 'Vx80km','Vy80km','Vz80km' + 'Vx80km','Vy80km','Vz80km',... 'Vx160km','Vy160km','Vz160km' } @@ -17,9 +17,9 @@ field_values={}; for i=1:6, - result=results{i} - field_values={field_values,... - PatchToVec(result.DiagnosticSolution.Vx),... - PatchToVec(result.DiagnosticSolution.Vy),... - PatchToVec(result.DiagnosticSolution.Vz),... + result=results{i}; + field_values={field_values{:},... + PatchToVec(result.Vx),... + PatchToVec(result.Vy),... + PatchToVec(result.Vz),... }; end Index: /issm/trunk/test/NightlyRun/test1108_nightly.m =================================================================== --- /issm/trunk/test/NightlyRun/test1108_nightly.m (revision 5054) +++ /issm/trunk/test/NightlyRun/test1108_nightly.m (revision 5055) @@ -4,5 +4,5 @@ 'Vx20km','Vy20km','Vz20km',... 'Vx40km','Vy40km','Vz40km',... - 'Vx80km','Vy80km','Vz80km' + 'Vx80km','Vy80km','Vz80km',... 'Vx160km','Vy160km','Vz160km' } @@ -17,9 +17,9 @@ field_values={}; for i=1:6, - result=results{i} - field_values={field_values,... - PatchToVec(result.DiagnosticSolution.Vx),... - PatchToVec(result.DiagnosticSolution.Vy),... - PatchToVec(result.DiagnosticSolution.Vz),... + result=results{i}; + field_values={field_values{:},... + PatchToVec(result.Vx),... + PatchToVec(result.Vy),... + PatchToVec(result.Vz),... }; end