Changeset 2189

Timestamp:

09/10/09 15:44:01 (16 years ago)

Author:

Mathieu Morlighem

Message:

minor diffs

Location:

issm/trunk/src/m/utils

Files:

• Cluster/parallelrange.m (modified) (1 diff)
• Nightly/nightlyrun.m (modified) (1 diff)
• Nightly/runme.m (modified) (1 diff)
• OS/listfiles.m (modified) (1 diff)

issm/trunk/src/m/utils/Cluster/parallelrange.m

@@ -4 +4 @@
 % usage: [i1,i1]=parallelrange(rank,numprocs,globalsize)
 %
-
 
 num_local_rows=zeros(numprocs,1);

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

@@ -33 +33 @@
 if isempty(rank), rank=1; end
 numprocs=find_option(options,'numprocs');
-if isempty(numprocs), numprocs=1; end
+if (isempty(numprocs) | numprocs<rank), numprocs=1; end
 procedure=find_option(options,'procedure');
 if isempty(procedure), procedure='check'; end

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

@@ -232 +232 @@
 
                 %something went wrong, print failure message:
+                directory=strsplit(pwd,'/');
                 message=getReport(me)
+                fid=fopen([ISSM_DIR '/test/Verification/NightlyRun/matlaberror.log'], 'at');
+                fprintf(fid,'\nMatlab error occured in: %s\n\n',directory{end});
+                fprintf(fid,'%s',message);
+                fclose(fid);
                 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));

issm/trunk/src/m/utils/OS/listfiles.m

@@ -14 +14 @@
 
 for i=1:numel(first_list),
-        if ( strcmpi(first_list(i).name,'.') || strcmpi(first_list(i).name,'..') || strcmpi(first_list(i).name,'.svn') )
-        else
+        if (  ~strcmpi(first_list(i).name,'.') &...
+                        ~strcmpi(first_list(i).name,'..') &...
+                        ~strcmpi(first_list(i).name,'NightlyRun') &...
+                        ~strcmpi(first_list(i).name,'.svn')),
                 list{end+1}=first_list(i).name;
         end