Changeset 153

Timestamp:

04/30/09 10:27:53 (16 years ago)

Author:

seroussi

Message:

finalized test

Location:

issm/trunk/test/Verification/IceSheetIceFrontM3d_8

Files:

• Archiveicediagnostic.mat (modified) ( previous)
• Archiveiceprognostic.mat (modified) ( previous)
• Archivemacayealdiagnostic.mat (deleted)
• Velocities.mat (modified) ( previous)
• runme.m (modified) (4 diffs)
• updatearchive.m (modified) (4 diffs)

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

@@ -12 +12 @@
 %packages and solutions to be tested
 packages={'macayeal','ice','cielo_serial','cielo_parallel'};
-solutions={'diagnostic','thermal_steady','thermal_transient','prognostic','transient'};
+solutions={'diagnostic','thermalsteady','thermaltransient','prognostic','transient'};
 
 %Initialize log message for nightly runs.
@@ -29 +29 @@
                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
                 %check solution
-                elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermal_steady') | strcmpi(solution,'thermal_transient') |...
+                elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
                 end
                 %check solution requested
-                if (~strcmpi(package,'ice')),
+                if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
                         disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
                         continue
@@ -41 +41 @@
                 %initialize model
                 md=model;
-                md=mesh(md,'DomainOutline.exp',50000);
+                md=mesh(md,'DomainOutline.exp',100000);
                 md=geography(md,'','');
                 md=parameterize(md,'Square.par');
-                md=extrude(md,10,3);
+                md=extrude(md,8,4);
                 md=setelementstype(md,'macayeal','all');
                 if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end
-                if md.numberofgrids==3880
-                        load Velocities; md.vx=1.2*vx; md.vy=1.2*vy;
+                if md.numberofgrids==832
+                        load Velocities; md.vx=0.8*vx; md.vy=0.8*vy; md.vz=0.8*vz; md.temperature=temperature-1; md.pressure=pressure;
                 end
 
@@ -63 +63 @@
                 if strcmpi(solution,'diagnostic'),
                         fields={'vy','vz'};
-                elseif strcmpi(solution,'thermal_steady'),
+                elseif strcmpi(solution,'thermalsteady'),
                         fields={'temperature','melting'};
-                elseif strcmpi(solution,'thermal_transient'),
+                elseif strcmpi(solution,'thermaltransient'),
                         fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'};
                 elseif strcmpi(solution,'prognostic'),

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

@@ -8 +8 @@
 %packages and solutions to be tested
 packages={'macayeal','ice','cielo_serial','cielo_parallel'};
-solutions={'diagnostic','thermal_steady','thermal_transient','prognostic','transient'};
+solutions={'diagnostic','thermalsteady','thermaltransient','prognostic','transient'};
 
 %go through the solutions requested
@@ -22 +22 @@
                         error(['package: ' package  ' in test: ' testname  ' not supported yet']);
                         %check solution
-                elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermal_steady') | strcmpi(solution,'thermal_transient') |...
+                elseif ~(strcmpi(solution,'diagnostic') | strcmpi(solution,'thermalsteady') | strcmpi(solution,'thermaltransient') |...
                                 strcmpi(solution,'prognostic') | strcmpi(solution,'transient'));
                         error(['solution: ' solution  ' in test: ' testname  ' not supported yet']);
                 end
                 %check solution requested
-                if (~strcmpi(package,'ice')),
+                if (~strcmpi(package,'ice') | strcmpi(solution,'transient')),
                         disp(sprintf(['\nsolution: ' solution  ', with package: ' package  ', in test: ' testname  ', not supported yet.\n']));
                         continue
@@ -34 +34 @@
                 %initialize model
                 md=model;
-                md=mesh(md,'DomainOutline.exp',50000);
+                md=mesh(md,'DomainOutline.exp',100000);
                 md=geography(md,'','');
                 md=parameterize(md,'Square.par');
-                md=extrude(md,10,3);
+                md=extrude(md,8,4);
                 md=setelementstype(md,'macayeal','all');
                 if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end
-                if md.numberofgrids==3880
-                        load Velocities; md.vx=1.2*vx; md.vy=1.2*vy;
+                if md.numberofgrids==832
+                        load Velocities; md.vx=0.8*vx; md.vy=0.8*vy; md.vz=0.8*vz; md.temperature=temperature-1; md.pressure=pressure;
                 end
 
@@ -56 +56 @@
                 if strcmpi(solution,'diagnostic'),
                         fields={'vy','vz'};
-                elseif strcmpi(solution,'thermal_steady'),
+                elseif strcmpi(solution,'thermalsteady'),
                         fields={'temperature','melting'};
-                elseif strcmpi(solution,'thermal_transient'),
+                elseif strcmpi(solution,'thermaltransient'),
                         fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'};
                 elseif strcmpi(solution,'prognostic'),