Changeset 146

Timestamp:

04/30/09 08:11:54 (16 years ago)

Author:

seroussi

Message:

new Archives and rum to allow the comparison of several fields

Location:

issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12

Files:

• Archiveicediagnostic.mat (modified) ( previous)
• Archiveiceprognostic.mat (modified) ( previous)
• runme.m (modified) (2 diffs)
• updatearchive.m (modified) (1 diff)

issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/runme.m

@@ -60 +60 @@
                 %compute field to be checked
                 if strcmpi(solution,'diagnostic'),
-                        fieldtest=md.vel;
+                        fields={'vel'};
                 elseif strcmpi(solution,'prognostic'),
-                        fieldtest=md.new_thickness';
+                        fields={'new_thickness'};
                 end
 
@@ -68 +68 @@
                 eval(['load Archive' package solution ]);
 
-                %compare to archive
-                eval(['pos=find(Archive' package solution ');']);
-                eval(['error_diff=abs(norm((Archive' package solution '(pos)-fieldtest(pos))./Archive' package solution '(pos),2));']);
+                for k=1:length(fields),
+                        field=fields{k};
 
-                %disp test result
-                if (error_diff>tolerance);
-                        disp(sprintf(['\n\nERROR (difference = %8.3g > %g)   --->   test: ' testname ', solution: ' solution  ', package: ' package '.\n\n'],error_diff,tolerance));
-                else
-                        disp(sprintf(['\n\nSUCCESS (difference = %8.3g < %g)   --->   test: ' testname ', solution: ' solution  ', package: ' package '.\n\n'],error_diff,tolerance));
+                        %compare to archive
+                        eval(['Archive=Archive' package solution '_field' num2str(k) ';']);
+                        eval(['error_diff=abs(norm((Archive(find(Archive))-md.' field  '(find(Archive)))./Archive(find(Archive)),2));']);
+
+                        %disp test result
+                        if (error_diff>tolerance);
+                                disp(sprintf(['\n\nERROR (difference = %8.3g > %g)   --->   test: ' testname ', solution: ' solution  ', package: ' package ', field tested: ' field  '.\n\n'],error_diff,tolerance));
+                        else
+                                disp(sprintf(['\n\nSUCCESS (difference = %8.3g < %g)   --->   test: ' testname ', solution: ' solution  ', package: ' package ', field tested: ' field  '.\n\n'],error_diff,tolerance));
+                        end
+
                 end
         end

issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/updatearchive.m

@@ -51 +51 @@
                 end
 
+                %field to be saved
+                if strcmpi(solution,'diagnostic'),
+                        fields={'vel'};
+                elseif strcmpi(solution,'prognostic'),
+                        fields={'new_thickness'};
+                end
+
                 %save new archive
-                if strcmpi(solution,'diagnostic'),
-                        fieldtest=md.vel;
-                elseif strcmpi(solution,'prognostic'),
-                        fieldtest=md.new_thickness';
+                for k=1:length(fields),
+                        field=fields{k};
+                        eval(['Archive' package solution '_field' num2str(k) '=md.' field  ';']);
                 end
-                eval(['Archive' package solution '=fieldtest;']);
-                eval(['save Archive' package solution ' Archive' package solution]);
+                eval(['save Archive' package solution ' Archive' package solution '_field*']);
         end
 end