Changeset 2181

Timestamp:

09/09/09 17:40:12 (16 years ago)

Author:

Mathieu Morlighem

Message:

minor

File:

• issm/trunk/src/m/utils/Nightly/runme.m (modified) (6 diffs)

issm/trunk/src/m/utils/Nightly/runme.m

@@ -114 +114 @@
         end
 
-        %initialize model, using presolve if need be, or just the piece of generic code below.
+        %beginning of the test
+
+        %initialize model
         md=model;
         if ~rifts,
@@ -127 +129 @@
         eval(['md=setelementstype(md,' elementstype ');']);
 
+        %parallel run?
         if parallel, 
                 %this run will be done in parallel
                 md.cluster=oshostname;
+                md.name=testname;
                 %check and modify number of cpus if necessary
                 np=feature('numCores');
@@ -136 +140 @@
                         md.np=np;
                 end
-                runtype='parallel';
-        else
-                runtype='serial';
-        end
-
-        %some solution checks;
+        end
+
+        %steady option?
         if (  (strcmpi(analysis_type,'thermal') & strcmpi(sub_analysis_type,'steady')) | ...
                         (strcmpi(analysis_type,'steadystate'))...
@@ -148 +149 @@
         end
 
+        %control ?
         if control,
                 md.control_analysis=1;
@@ -218 +220 @@
                                 %disp test result
                                 if (error_diff>tolerance);
-                                        disp(sprintf(['\nERROR   difference: %-7.2g > %7.2g test: %-25s solution: %-16s type: %-9s field: ' field  '.\n\n'],error_diff,tolerance,testname,[analysis_type '_' sub_analysis_type],runtype));
+                                        disp(sprintf(['\nERROR   difference: %-7.2g > %7.2g test: %-15s analysis_type: %-10s sub_analysis_type: %-9s qmu: %i control: %i control_fit: %-12s parallel: %i field: %s\n'],...
+                                                error_diff,tolerance,testname,analysis_type,sub_analysis_type,qmu,control,control_fit,parallel,field));
                                 else
-                                        disp(sprintf(['\nSUCCESS difference: %-7.2g < %7.2g test: %-25s solution: %-16s type: %-9s field: ' field  '.\n\n'],error_diff,tolerance,testname,[analysis_type '_' sub_analysis_type],runtype));
+                                        disp(sprintf(['\nSUCCESS difference: %-7.2g < %7.2g test: %-15s analysis_type: %-10s sub_analysis_type: %-9s qmu: %i control: %i control_fit: %-12s parallel: %i field: %s\n'],...
+                                                error_diff,tolerance,testname,analysis_type,sub_analysis_type,qmu,control,control_fit,parallel,field));
                                 end
                         end
@@ -229 +233 @@
                 %something went wrong, print failure message:
                 message=getReport(me)
-                disp(sprintf(['\n\nFAILURE difference: %-16s test: %-25s solution: %-16s type: %-9s field: N/A.\n\n'],'N/A',testname,[analysis_type '_' sub_analysis_type],runtype));
+                disp(sprintf(['\nFAILURE test: %-15s analysis_type: %-10s sub_analysis_type: %-9s qmu: %i control: %i control_fit: %-12s parallel: %i\n.'],...
+                        testname,analysis_type,sub_analysis_type,qmu,control,control_fit,parallel));
         end
 end