Changeset 451 for issm/trunk/test/Verification/IceShelfIceFrontM3d_2/updatearchive.m

Timestamp:

05/15/09 14:29:09 (17 years ago)

Author:

Mathieu Morlighem

Message:

fixed cielo_parallel in tests + cpsmetics

File:

• issm/trunk/test/Verification/IceShelfIceFrontM3d_2/updatearchive.m (modified) (4 diffs)

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

@@ -7 +7 @@
 
 %packages and solutions to be tested
-packages={'macayeal','ice','cielo_serial','cielo_parallel'};
+packages={'ice','cielo_serial','cielo_parallel'};
+packages={'cielo_parallel'};
 solutions={'diagnostic','thermalsteady','thermaltransient','prognostic','transient'};
 
@@ -19 +20 @@
 
                 %check package
-                if ~(strcmpi(package,'macayeal') | strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
+                if ~(strcmpi(package,'ice') | strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel'));
                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
                         %check solution
@@ -27 +28 @@
                 end
                 %check solution requested
-                if (~(strcmpi(package,'ice') | (strcmpi(package,'cielo_serial') & strcmpi(solution,'diagnostic'))) | strcmpi(solution,'transient')),
+                if (~(strcmpi(package,'ice') | strcmpi(solution,'diagnostic')) | strcmpi(solution,'transient')),
                         disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
                         continue
@@ -45 +46 @@
 
                 %compute solution
-                if strcmpi(package,'cielo_parallel') & strcmpi(solution,'diagnostic'),
-                        md=solve(md,'diagnostic_horiz','cielo');
-                elseif strcmpi(package,'cielo_serial'),
-                        eval(['md=solve(md,''' solution ''',''cielo'');']);
+                if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')),
+                        md=solve(md,solution,'cielo');
                 else
-                        eval(['md=solve(md,''' solution ''',''' package ''');']);
+                        md=solve(md,solution,package);
                 end