Changeset 4999

Timestamp:

08/05/10 14:55:55 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added New nightly runs

Location:

issm/trunk

Files:

• cron/configs/linux64_morlighem2 (added)
• cron/nightlyrun2.sh (added)
• cron/run2.sh (added)
• test/NightlyRun/runme.m (modified) (4 diffs)
• test/NightlyRun/test101.m (modified) (1 diff)
• test/NightlyRun/test111.m (modified) (1 diff)
• test/NightlyRun/test112.m (modified) (1 diff)
• test/Par/79North.par (modified) (1 diff)
• test/Par/Pig.par (modified) (1 diff)
• test/Par/SquareSheetConstrained.par (modified) (1 diff)
• test/Par/SquareSheetShelf.par (modified) (1 diff)
• test/Par/SquareShelf.par (modified) (1 diff)
• test/Par/SquareShelfConstrained.par (modified) (1 diff)

issm/trunk/test/NightlyRun/runme.m

@@ -54 +54 @@
 end
 
+%Get RANK and NUMPROCS for mutlithreaded runs
+rank=getfieldvalue(options,'rank',1);
+numprocs=getfieldvalue(options,'numprocs',1);
+if (numprocs<rank), numprocs=1; end
+
 %GET ids
 list=dir;%use dir, as it seems to act OS independent
@@ -61 +66 @@
                         strncmpi(fliplr(list(i).name),fliplr('.m'),2)&...           %File name must end by '.m'
                         ~strncmpi(fliplr(list(i).name),fliplr('_nightly.m'),10)),   %File name end should be different that '_nightly.m'
-                list_ids(end+1)=eval(list(i).name(end-4:end-2));             %Keep test id only (3 digits)
+                list_ids(end+1)=eval(list(i).name(end-4:end-2));               %Keep test id only (3 digits)
         end
 end
+[i1,i2]=parallelrange(rank,numprocs,length(list_ids));               %Get tests for this cpu only
+list_ids=list_ids(i1:i2);
+
 test_ids=getfieldvalue(options,'id',list_ids);
 test_ids=intersect(test_ids,list_ids);
@@ -94 +102 @@
                         for k=1:length(field_names),
 
-                                %Get field and tolerance
-                                field=field_values{k};
-                                fieldname=field_names{k};
-                                tolerance=field_tolerances{k};
+                                try,
+                                        %Get field and tolerance
+                                        field=field_values{k};
+                                        fieldname=field_names{k};
+                                        tolerance=field_tolerances{k};
 
-                                %compare to archive
-                                eval(['archive=' archive_name '_field' num2str(k) ';']);
-                                error_diff=full(max(abs(archive-field))/(max(abs(archive))+eps));
+                                        %compare to archive
+                                        eval(['archive=' archive_name '_field' num2str(k) ';']);
+                                        error_diff=full(max(abs(archive-field))/(max(abs(archive))+eps));
 
-                                %disp test result
-                                if (error_diff>tolerance);
-                                        disp(sprintf(['ERROR   difference: %-7.2g > %7.2g test id: %i test name: %s field: %s'],...
-                                                error_diff,tolerance,id,Id2Name(id),fieldname));
-                                else
-                                        disp(sprintf(['SUCCESS difference: %-7.2g < %7.2g test id: %i test name: %s field: %s'],...
-                                                error_diff,tolerance,id,Id2Name(id),fieldname));
+                                        %disp test result
+                                        if (error_diff>tolerance);
+                                                disp(sprintf(['ERROR   difference: %-7.2g > %7.2g test id: %i test name: %s field: %s'],...
+                                                        error_diff,tolerance,id,Id2Name(id),fieldname));
+                                        else
+                                                disp(sprintf(['SUCCESS difference: %-7.2g < %7.2g test id: %i test name: %s field: %s'],...
+                                                        error_diff,tolerance,id,Id2Name(id),fieldname));
+                                        end
+
+                                catch me2
+
+                                        %something went wrong, print failure message:
+                                        directory=strsplit(pwd,'/');
+                                        message=getReport(me2)
+                                        fid=fopen([ISSM_DIR '/TEMP/matlaberror.log'], 'at');
+                                        fprintf(fid,'%s',message);
+                                        fprintf(fid,'\n--------------------------------------------\n');
+                                        fclose(fid);
+                                        disp(sprintf(['FAILURE difference: N/A test id: %i test name: %s field: %s'],id,Id2Name(id),fieldname));
+
                                 end
                         end
@@ -119 +141 @@
                 directory=strsplit(pwd,'/');
                 message=getReport(me)
-                fid=fopen([ISSM_DIR '/test/Verification/NightlyRun/matlaberror.log'], 'at');
-                fprintf(fid,'\n\nMatlab error occured in: %s\n\n',directory{end});
+                fid=fopen([ISSM_DIR '/TEMP/matlaberror.log'], 'at');
                 fprintf(fid,'%s',message);
+                fprintf(fid,'\n--------------------------------------------\n');
                 fclose(fid);
-                %disp(sprintf(['\nFAILURE test: %s analysis_type: %s sub_analysis_type: %s qmu: %i control: %i control_fit: %s parallel: %i\n'],...
-                        %testname,EnumAsString(analysis_type),EnumAsString(sub_analysis_type),qmu,control,control_fit,parallel));
+                disp(sprintf(['FAILURE difference: N/A test id: %i test name: %s field: N/A'],id,Id2Name(id)));
         end
 end

issm/trunk/test/NightlyRun/test101.m

@@ -2 +2 @@
 md=geography(md,'all','');
 md=parameterize(md,'../Par/SquareShelfConstrained.par');
+return
 md=setelementstype(md,'macayeal','all');
 md.cluster='none';

issm/trunk/test/NightlyRun/test111.m

@@ -5 +5 @@
 md=setelementstype(md,'macayeal','all');
 md.cluster='none';
-md.prognostic_DG=1
+md.prognostic_DG=1;
 md=solve(md,'analysis_type',PrognosticSolutionEnum);

issm/trunk/test/NightlyRun/test112.m

@@ -5 +5 @@
 md=setelementstype(md,'macayeal','all');
 md.cluster=oshostname;
-md.prognostic_DG=1
+md.prognostic_DG=1;
 md=solve(md,'analysis_type',PrognosticSolutionEnum);

issm/trunk/test/Par/79North.par

@@ -46 +46 @@
 md.spcthickness(pos,1)=1;
 md.spcthickness(pos,2)=md.thickness(pos);
+
+%Change name so that no test have the same name
+A=dbstack;
+if (length(A)>2), md.name=A(3).file(1:end-2); end

issm/trunk/test/Par/Pig.par

@@ -42 +42 @@
 %Boundary conditions:
 md=SetMarineIceSheetBC(md);
+
+%Change name so that no test have the same name
+A=dbstack;
+if (length(A)==3), md.name=A(3).file(1:end-2); end

issm/trunk/test/Par/SquareSheetConstrained.par

@@ -46 +46 @@
 %Boundary conditions:
 md=SetIceSheetBC(md);
+
+%Change name so that no test have the same name
+A=dbstack;
+if (length(A)>2), md.name=A(3).file(1:end-2); end

issm/trunk/test/Par/SquareSheetShelf.par

@@ -53 +53 @@
 %Deal with boundary conditions:
 md=SetMarineIceSheetBC(md,'./../Exp/SquareFront.exp');
+
+%Change name so that no test have the same name
+A=dbstack;
+if (length(A)>2), md.name=A(3).file(1:end-2); end

issm/trunk/test/Par/SquareShelf.par

@@ -46 +46 @@
 %Boundary conditions:
 md=SetIceShelfBC(md,'./../Exp/SquareFront.exp');
+
+%Change name so that no test have the same name
+A=dbstack;
+if (length(A)>2), md.name=A(3).file(1:end-2); end

issm/trunk/test/Par/SquareShelfConstrained.par

@@ -50 +50 @@
 %Deal with boundary conditions:
 md=SetIceShelfBC(md);
+
+%Change name so that no test have the same name
+A=dbstack;
+if (length(A)>2), md.name=A(3).file(1:end-2); end