Changeset 2160

Timestamp:

09/09/09 15:36:12 (15 years ago)

Author:

Mathieu Morlighem

Message:

changed archives names

Location:

issm/trunk/src/m/utils/Nightly

Files:

• nightlyrun.m (modified) (1 diff)
• runme_core.m (modified) (7 diffs)

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

@@ -56 +56 @@
                         runme(packages(i),varargin{2});
                 else
-                        runme(packages(i));
+                        updatearchive
                 end
                 cd ..

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

@@ -37 +37 @@
 
 %read configuration
-configuration;
+if ~exist('./configuration.m')
+        error('runme_core error message: configuration file ''configuration.m'' not found');
+else
+        configuration;
+end
 
 %go through the sequences requested.
@@ -80 +84 @@
                 md=mesh(md,domainname,resolution);
         else
-                md=mesh(md,domainname,riftoutline,resolution);
+                md=mesh(md,domainname,riftname,resolution);
                 md=meshprocessrifts(md);
         end
@@ -141 +145 @@
                 fields=testsgetfields2(md,sequence);
 
+                %get Archive name
+                archive_name='Archive';
+                for i=1:length(sequence),
+                        if ischar(sequence{i}),
+                                archive_name=[archive_name '_' sequence{i}];
+                        else
+                                archive_name=[archive_name '_' num2str(sequence{i})];
+                        end
+                end
+
                 %CHECK TEST?
                 if strcmpi(testtype,'check'),
 
                         %load archive
-                        eval(['load Archive_'  analysis_type '_' sub_analysis_type '_' runtype ]);
+                        eval(['load ' archive_name ]);
 
                         for k=1:length(fields),
@@ -154 +168 @@
 
                                 %compare to archive
-                                eval(['Archive=Archive_'  analysis_type '_' sub_analysis_type '_' runtype '_field' num2str(k) ';']);
+                                eval(['Archive=' archive_name '_field' num2str(k) ';']);
                                 eval(['error_diff=full(max(abs(Archive-md.results.' field '))/(max(abs(Archive))+eps));']);
 
@@ -165 +179 @@
                         end
 
-
-
                 %UPDATE ARCHIVE?
                 elseif strcmpi(testtype,'update'),
@@ -172 +184 @@
                         for k=1:length(fields),
                                 field=fields{k};
-                                eval(['Archive_'  analysis_type '_' sub_analysis_type '_' runtype '_field' num2str(k) ' = md.results. ' field  ';']);
+                                eval([ archive_name '_field' num2str(k) ' = md.results. ' field  ';']);
                         end
-                        eval(['save Archive_'  analysis_type '_' sub_analysis_type '_' runtype ' Archive_'  analysis_type '_' sub_analysis_type '_' runtype '_field*']);
-                        disp(sprintf(['File Archive_'  analysis_type '_' sub_analysis_type '_' runtype ' saved\n']));
+                        eval(['save ' archive_name ' ' archive_name '_field*']);
+                        disp(sprintf(['File ' archive_name ' saved\n']));
 
                 else
@@ -187 +199 @@
                 %something went wrong, print failure message:
                 message=getReport(me)
-                disp(sprintf(['\n\nFAILURE difference: %-16s test: %-25s solution: %-16s type: %-9s field: ' field  '.\n\n'],'N/A',testname,[analysis_type '_' sub_analysis_type],runtype));
-        end
-end
+                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));
+        end
+end