Changeset 16966

Timestamp:

11/27/13 14:01:46 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added 'rand' option to bamg so that NR tests work on multiple platforms

Location:

issm/trunk-jpl/test

Files:

• Archives/Archive119.nc (modified) ( previous)
• NightlyRun/runme.m (modified) (4 diffs)
• NightlyRun/test119.m (modified) (2 diffs)

issm/trunk-jpl/test/NightlyRun/runme.m

@@ -13 +13 @@
 %      'exclude'       ids to be excluded from the test
 %      'benchmark'     'all' (all of them)
-%                      'nightly' (nightly run/ daily run)
+%                      'nightly' (nightly run)
 %                      'ismip'  : validation of ismip-hom tests
 %                      'eismint': validation of eismint tests
@@ -65 +65 @@
 %GET output {{{
 output=getfieldvalue(options,'output','none');
-if ~ismember(output,{'nightly','daily','none'})
+if ~ismember(output,{'nightly','none'})
         disp('runme warning: output not supported, defaulting to test ''none''')
         output='none';
@@ -239 +239 @@
                                                 fclose(fid);
                                                 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');
-                                                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,id_string,fieldname));
                                         else
                                                 disp(sprintf(['FAILURE difference: N/A test id: %i test name: %s field: %s'],id,id_string,fieldname));
-                                                rethrow(me2);
+                                                fprintf('%s',message);
                                                 if(getfieldvalue(options,'stoponerror',0)), disp('STOP'); return; end
                                         end
+                                        continue;
                                 end
                         end
@@ -262 +257 @@
                 if strcmpi(output,'nightly')
                         fid=fopen([ISSM_DIR '/nightlylog/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,id_string,'N/A'));
-                elseif strcmpi(output,'daily');
-                        fid=fopen([ISSM_DIR '/dailylog/matlaberror.log'], 'at');
                         fprintf(fid,'%s',message);
                         fprintf(fid,'\n------------------------------------------------------------------\n');

issm/trunk-jpl/test/NightlyRun/test119.m

@@ -1 +1 @@
 
 %Simple mesh
-md=bamg(model(),'domain','../Exp/Square.exp','hmax',100000.);
+md=bamg(model(),'domain','../Exp/Square.exp','hmax',100000.,'rand',false);
 x1=md.mesh.x;
 y1=md.mesh.y;
 
 %hVertices
-md=bamg(model(),'domain','../Exp/Square.exp','hmax',300000.,'hVertices',[10000. 100000. 400000. 100000.]');
+md=bamg(model(),'domain','../Exp/Square.exp','hmax',300000.,'hVertices',[10000. 100000. 400000. 100000.]','rand',false);
 x2=md.mesh.x;
 y2=md.mesh.y;
@@ -12 +12 @@
 %big mesh
 t0=clock;
-md=bamg(model(),'domain','../Exp/Square.exp','hmax',3000.);
+md=bamg(model(),'domain','../Exp/Square.exp','hmax',3000.,'rand',false);
 nbelements=md.mesh.numberofelements;
 elapsedtime=etime(clock,t0);