Changeset 5501

Timestamp:

08/23/10 09:45:22 (15 years ago)

Author:

Mathieu Morlighem

Message:

Improved runme (string id won't failed and we allows go back to where we started in case qmu crashes, which happens very often ;)) and updated some tests now that vz is spcd

Location:

issm/trunk/test

Files:

• Archives/Archive225.mat (modified) ( previous)
• Archives/Archive227.mat (modified) ( previous)
• Archives/Archive228.mat (modified) ( previous)
• Archives/Archive339.mat (modified) ( previous)
• Archives/Archive340.mat (modified) ( previous)
• Archives/Archive341.mat (modified) ( previous)
• Archives/Archive342.mat (modified) ( previous)
• Archives/Archive523.mat (modified) ( previous)
• Archives/Archive524.mat (modified) ( previous)
• Archives/Archive525.mat (modified) ( previous)
• Archives/Archive526.mat (modified) ( previous)
• NightlyRun/runme.m (modified) (6 diffs)

issm/trunk/test/NightlyRun/runme.m

@@ -109 +109 @@
 
 %Loop over tests and launch sequence
+root=pwd;
 for id=test_ids,
         try,
 
                 %Execute test
+                eval(['cd ' root ]);
+                id_string=IdToName(id);
                 eval(['test' num2str(id)]);
 
@@ -147 +150 @@
                                         if (error_diff>tolerance);
                                                 disp(sprintf(['ERROR   difference: %-7.2g > %7.2g test id: %i test name: %s field: %s'],...
-                                                        error_diff,tolerance,id,IdToName(id),fieldname));
+                                                        error_diff,tolerance,id,id_string,fieldname));
                                         else
                                                 disp(sprintf(['SUCCESS difference: %-7.2g < %7.2g test id: %i test name: %s field: %s'],...
-                                                        error_diff,tolerance,id,IdToName(id),fieldname));
+                                                        error_diff,tolerance,id,id_string,fieldname));
                                         end
 
@@ -163 +166 @@
                                                 fprintf(fid,'\n------------------------------------------------------------------\n');
                                                 fclose(fid);
-                                                disp(sprintf(['FAILURE difference: N/A test id: %i test name: %s field: %s'],id,IdToName(id),fieldname));
+                                                disp(sprintf(['FAILURE difference: N/A test id: %i test name: %s field: %s'],id,id_string,fieldname));
                                         elseif strcmpi(output,'daily');
                                                 fid=fopen([ISSM_DIR '/dailylog/matlaberror.log'], 'at');
@@ -169 +172 @@
                                                 fprintf(fid,'\n------------------------------------------------------------------\n');
                                                 fclose(fid);
-                                                disp(sprintf(['FAILURE difference: N/A test id: %i test name: %s field: %s'],id,IdToName(id),fieldname));
+                                                disp(sprintf(['FAILURE difference: N/A test id: %i test name: %s field: %s'],id,id_string,fieldname));
                                         else
                                                 rethrow(me2);
@@ -187 +190 @@
                         fprintf(fid,'\n------------------------------------------------------------------\n');
                         fclose(fid);
-                        disp(sprintf(['FAILURE difference: N/A test id: %i test name: %s field: %s'],id,IdToName(id),'N/A'));
+                        disp(sprintf(['FAILURE difference: N/A test id: %i test name: %s field: %s'],id,id_string,'N/A'));
                 elseif strcmpi(output,'daily');
                         fid=fopen([ISSM_DIR '/dailylog/matlaberror.log'], 'at');
@@ -193 +196 @@
                         fprintf(fid,'\n------------------------------------------------------------------\n');
                         fclose(fid);
-                        disp(sprintf(['FAILURE difference: N/A test id: %i test name: %s field: %s'],id,IdToName(id),'N/A'));
+                        disp(sprintf(['FAILURE difference: N/A test id: %i test name: %s field: %s'],id,id_string,'N/A'));
                 else
                         rethrow(me);