Index: /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/runme.m =================================================================== --- /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/runme.m (revision 519) @@ -42,5 +42,4 @@ md=parameterize(md,'Square.par'); md=setelementstype(md,'macayeal','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end if md.numberofgrids==388 load Velocities; md.vx=0.5*vx; md.vy=0.5*vy; @@ -48,16 +47,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vel'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetIceFrontM2d_7/updatearchive.m (revision 519) @@ -35,5 +35,4 @@ md=parameterize(md,'Square.par'); md=setelementstype(md,'macayeal','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end if md.numberofgrids==388 load Velocities; md.vx=0.5*vx; md.vy=0.5*vy; @@ -41,16 +40,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %field to be saved - if strcmpi(solution,'diagnostic'), - fields={'vel'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/runme.m =================================================================== --- /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/runme.m (revision 519) @@ -45,5 +45,4 @@ md=extrude(md,8,4); md=setelementstype(md,'macayeal','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -51,22 +50,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetIceFrontM3d_8/updatearchive.m (revision 519) @@ -38,5 +38,4 @@ md=extrude(md,8,4); md=setelementstype(md,'macayeal','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -44,22 +43,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/runme.m =================================================================== --- /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/runme.m (revision 519) @@ -45,5 +45,4 @@ md=extrude(md,8,4); md=setelementstype(md,'pattyn','Pattyn.exp','fill','macayeal'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -51,22 +50,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetIceFrontMP3d_9/updatearchive.m (revision 519) @@ -38,5 +38,4 @@ md=extrude(md,8,4); md=setelementstype(md,'pattyn','Pattyn.exp','fill','macayeal'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -44,22 +43,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/runme.m =================================================================== --- /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/runme.m (revision 519) @@ -45,5 +45,4 @@ md=extrude(md,8,4); md=setelementstype(md,'pattyn','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end if md.numberofgrids==832 load Velocities; md.vx=0.8*vx; md.vy=0.8*vy; md.vz=0.8*vy; md.temperature=temperature-1; md.pressure=pressure; @@ -51,22 +50,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetIceFrontP3d_10/updatearchive.m (revision 519) @@ -38,5 +38,4 @@ md=extrude(md,8,4); md=setelementstype(md,'pattyn','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end if md.numberofgrids==832 load Velocities; md.vx=0.8*vx; md.vy=0.8*vy; md.vz=0.8*vy; md.temperature=temperature-1; md.pressure=pressure; @@ -44,22 +43,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/runme.m =================================================================== --- /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/runme.m (revision 519) @@ -43,5 +43,4 @@ md=extrude(md,8,4); md=setelementstype(md,'macayeal','all','stokes','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -49,22 +48,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetIceFrontS3d_11/updatearchive.m (revision 519) @@ -36,5 +36,4 @@ md=extrude(md,8,4); md=setelementstype(md,'macayeal','all','stokes','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -42,22 +41,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/runme.m =================================================================== --- /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/runme.m (revision 519) @@ -42,5 +42,4 @@ md=parameterize(md,'Square.par'); md=setelementstype(md,'hutter','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end if md.numberofgrids==388 load Velocities; md.vx=0.5*vx; md.vy=0.5*vy; @@ -48,16 +47,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vel'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetNoIceFrontH2d_12/updatearchive.m (revision 519) @@ -35,5 +35,4 @@ md=parameterize(md,'Square.par'); md=setelementstype(md,'hutter','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end if md.numberofgrids==388 load Velocities; md.vx=0.5*vx; md.vy=0.5*vy; @@ -41,16 +40,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %field to be saved - if strcmpi(solution,'diagnostic'), - fields={'vel'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - end + %compute fields to be checked +fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/runme.m =================================================================== --- /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/runme.m (revision 519) @@ -45,5 +45,4 @@ md=extrude(md,8,4); md=setelementstype(md,'hutter','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -51,22 +50,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetNoIceFrontH3d_13/updatearchive.m (revision 519) @@ -38,5 +38,4 @@ md=extrude(md,8,4); md=setelementstype(md,'hutter','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -44,22 +43,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/runme.m =================================================================== --- /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/runme.m (revision 519) @@ -42,5 +42,4 @@ md=parameterize(md,'Square.par'); md=setelementstype(md,'hutter','Hutter.exp','fill','MacAyeal'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end if md.numberofgrids==388 load Velocities; md.vx=0.5*vx; md.vy=0.5*vy; @@ -48,16 +47,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vel'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetNoIceFrontHM2d_14/updatearchive.m (revision 519) @@ -35,5 +35,4 @@ md=parameterize(md,'Square.par'); md=setelementstype(md,'hutter','Hutter.exp','fill','MacAyeal'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end if md.numberofgrids==388 load Velocities; md.vx=0.5*vx; md.vy=0.5*vy; @@ -41,16 +40,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %field to be saved - if strcmpi(solution,'diagnostic'), - fields={'vel'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - end + %compute fields to be checked +fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/runme.m =================================================================== --- /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/runme.m (revision 519) @@ -43,5 +43,4 @@ md=extrude(md,8,4); md=setelementstype(md,'hutter','Hutter.exp','fill','macayeal'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -49,22 +48,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetNoIceFrontHM3d_15/updatearchive.m (revision 519) @@ -36,5 +36,4 @@ md=extrude(md,8,4); md=setelementstype(md,'hutter','Hutter.exp','fill','macayeal'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -42,22 +41,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/runme.m =================================================================== --- /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/runme.m (revision 519) @@ -42,5 +42,4 @@ md=parameterize(md,'Square.par'); md=setelementstype(md,'macayeal','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end if md.numberofgrids==388 load Velocities; md.vx=0.5*vx; md.vy=0.5*vy; @@ -48,16 +47,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vel'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetNoIceFrontM2d_16/updatearchive.m (revision 519) @@ -35,5 +35,4 @@ md=parameterize(md,'Square.par'); md=setelementstype(md,'macayeal','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end if md.numberofgrids==388 load Velocities; md.vx=0.5*vx; md.vy=0.5*vy; @@ -41,16 +40,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %field to be saved - if strcmpi(solution,'diagnostic'), - fields={'vel'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - end + %compute fields to be checked +fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/runme.m =================================================================== --- /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/runme.m (revision 519) @@ -45,5 +45,4 @@ md=extrude(md,8,4); md=setelementstype(md,'macayeal','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -51,22 +50,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetNoIceFrontM3d_17/updatearchive.m (revision 519) @@ -38,5 +38,4 @@ md=extrude(md,8,4); md=setelementstype(md,'macayeal','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -44,22 +43,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/runme.m =================================================================== --- /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/runme.m (revision 519) @@ -45,5 +45,4 @@ md=extrude(md,8,4); md=setelementstype(md,'pattyn','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -51,22 +50,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetNoIceFrontP3d_18/updatearchive.m (revision 519) @@ -38,5 +38,4 @@ md=extrude(md,8,4); md=setelementstype(md,'pattyn','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -44,22 +43,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/runme.m =================================================================== --- /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/runme.m (revision 519) @@ -43,5 +43,4 @@ md=extrude(md,8,4); md=setelementstype(md,'pattyn','all','stokes','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -49,22 +48,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceSheetNoIceFrontS3d_19/updatearchive.m (revision 519) @@ -36,5 +36,4 @@ md=extrude(md,8,4); md=setelementstype(md,'pattyn','all','stokes','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -42,22 +41,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/runme.m =================================================================== --- /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/runme.m (revision 519) @@ -42,5 +42,4 @@ md=parameterize(md,'Square.par'); md=setelementstype(md,'macayeal','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end if md.numberofgrids==388 load Velocities; md.vx=0.5*vx; md.vy=0.5*vy; @@ -48,16 +47,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vel'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceShelfIceFrontM2d_1/updatearchive.m (revision 519) @@ -35,5 +35,4 @@ md=parameterize(md,'Square.par'); md=setelementstype(md,'macayeal','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end if md.numberofgrids==388 load Velocities; md.vx=0.5*vx; md.vy=0.5*vy; @@ -41,16 +40,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %field to be saved - if strcmpi(solution,'diagnostic'), - fields={'vel'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - end + %compute fields to be checked +fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/runme.m =================================================================== --- /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/runme.m (revision 519) @@ -45,5 +45,4 @@ md=extrude(md,8,4); md=setelementstype(md,'macayeal','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -51,22 +50,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceShelfIceFrontM3d_2/updatearchive.m (revision 519) @@ -38,5 +38,4 @@ md=extrude(md,8,4); md=setelementstype(md,'macayeal','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -44,22 +43,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/runme.m =================================================================== --- /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/runme.m (revision 519) @@ -45,5 +45,4 @@ md=extrude(md,8,4); md=setelementstype(md,'pattyn','Pattyn.exp','fill','macayeal'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -51,22 +50,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceShelfIceFrontMP3d_3/updatearchive.m (revision 519) @@ -38,5 +38,4 @@ md=extrude(md,8,4); md=setelementstype(md,'pattyn','Pattyn.exp','fill','macayeal'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -44,22 +43,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/runme.m =================================================================== --- /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/runme.m (revision 519) @@ -43,5 +43,4 @@ md=extrude(md,8,4); md=setelementstype(md,'pattyn','Pattyn.exp','fill','macayeal','stokes','Stokes.exp'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -49,22 +48,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceShelfIceFrontMPS3d_4/updatearchive.m (revision 519) @@ -36,5 +36,4 @@ md=extrude(md,8,4); md=setelementstype(md,'pattyn','Pattyn.exp','fill','macayeal','stokes','Stokes.exp'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -42,22 +41,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/runme.m =================================================================== --- /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/runme.m (revision 519) @@ -45,5 +45,4 @@ md=extrude(md,8,4); md=setelementstype(md,'pattyn','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -51,22 +50,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceShelfIceFrontP3d_5/updatearchive.m (revision 519) @@ -38,5 +38,4 @@ md=extrude(md,8,4); md=setelementstype(md,'pattyn','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -44,22 +43,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/runme.m =================================================================== --- /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/runme.m (revision 518) +++ /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/runme.m (revision 519) @@ -43,5 +43,4 @@ md=extrude(md,8,4); md=setelementstype(md,'pattyn','all','stokes','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -49,22 +48,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %load archive Index: /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/IceShelfIceFrontS3d_6/updatearchive.m (revision 519) @@ -36,5 +36,4 @@ md=extrude(md,8,4); md=setelementstype(md,'pattyn','all','stokes','all'); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end 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; @@ -42,22 +41,10 @@ %compute solution - if (strcmpi(package,'cielo_serial') | strcmpi(package,'cielo_parallel')), - md=solve(md,'analysis_type',solution,'package','cielo'); - else - md=solve(md,'analysis_type',solution,'package',package); - end + [analysis_type sub_analysis_type]=testsgetanalysis(solution); + [md packagefinal]=testsgetpackage(md,package); + md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',package); - %compute field to be checked - if strcmpi(solution,'diagnostic'), - fields={'vy','vz'}; - elseif strcmpi(solution,'thermalsteady'), - fields={'temperature','melting'}; - elseif strcmpi(solution,'thermaltransient'), - fields={'thermaltransient_results(end).temperature','thermaltransient_results(end).melting'}; - elseif strcmpi(solution,'prognostic'), - fields={'new_thickness'}; - elseif strcmpi(solution,'transient'), - fields={'transient_results(end).vy','transient_results(end).vz','transient_results(end).temperature','transient_results(end).melting','transient_results(end).thickness'}; - end + %compute fields to be checked + fields=testsgetfields(md.type,solution); %save new archive Index: /issm/trunk/test/Verification/PigControlMethodBM2d_21/runme.m =================================================================== --- /issm/trunk/test/Verification/PigControlMethodBM2d_21/runme.m (revision 518) +++ /issm/trunk/test/Verification/PigControlMethodBM2d_21/runme.m (revision 519) @@ -50,5 +50,4 @@ end md=modelextract(md,md.elementoniceshelf); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end %launch control method @@ -59,5 +58,6 @@ end - %compute field to be checked + %compute fields to be checked +fields=testsgetfields(md.type,solution); fields={'cont_vel','cont_J','cont_parameter'}; Index: /issm/trunk/test/Verification/PigControlMethodBM2d_21/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/PigControlMethodBM2d_21/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/PigControlMethodBM2d_21/updatearchive.m (revision 519) @@ -45,5 +45,4 @@ end md=modelextract(md,md.elementoniceshelf); - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end %launch control method @@ -54,5 +53,6 @@ end - %compute field to be checked + %compute fields to be checked +fields=testsgetfields(md.type,solution); fields={'cont_vel','cont_J','cont_parameter'}; Index: /issm/trunk/test/Verification/PigControlMethodDragM2d_20/runme.m =================================================================== --- /issm/trunk/test/Verification/PigControlMethodDragM2d_20/runme.m (revision 518) +++ /issm/trunk/test/Verification/PigControlMethodDragM2d_20/runme.m (revision 519) @@ -49,5 +49,4 @@ md.fit(:)=2; end - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end %launch control method @@ -58,5 +57,6 @@ end - %compute field to be checked + %compute fields to be checked +fields=testsgetfields(md.type,solution); fields={'cont_vel','cont_J','cont_parameter'}; Index: /issm/trunk/test/Verification/PigControlMethodDragM2d_20/updatearchive.m =================================================================== --- /issm/trunk/test/Verification/PigControlMethodDragM2d_20/updatearchive.m (revision 518) +++ /issm/trunk/test/Verification/PigControlMethodDragM2d_20/updatearchive.m (revision 519) @@ -44,5 +44,4 @@ md.fit(:)=2; end - if strcmpi(package,'cielo_parallel'), md.cluster='wilkes'; end %launch control method @@ -53,5 +52,6 @@ end - %compute field to be checked + %compute fields to be checked +fields=testsgetfields(md.type,solution); fields={'cont_vel','cont_J','cont_parameter'};