Index: sm/trunk/test/Miscellaneous/Bump/updatearchive.m =================================================================== --- /issm/trunk/test/Miscellaneous/Bump/updatearchive.m (revision 2552) +++ (revision ) @@ -1,84 +1,0 @@ -function varargout=updatearchive(varargin) -%updatearchive - test deck for ISSM nightly runs -% -% Usage: -% varargout=updatearchive(varargin); -% -% Examples: -% updatearchive; -% updatearchive({'ice'}); -% updatearchive({'ice','cielo_serial'},{'diagnostic'}); -% md=updatearchive({'cielo_parallel'}); -% -% See also: RUNME - -% This file can be run to update the velocity archives of the test1. -% This test deals with an icesheet with icefront for a 3d model. The geometry -% is square. Just run this file in Matlab, with a properly setup Ice code. - -% The archive files will be saved in this directory but will not commited to ice1. -% Just commit the result if you want to. - -%check arguments -if (nargin>2 | nargout>1) - help updatearchive - error('updatearchive error message: bad usage'); -end - -%packages and analysis_types to be tested -if nargin==2, - solutions=varargin{2}; -else - solutions={'diagnostic','thermalsteady','thermaltransient','prognostic','transient'}; -end -if nargin, - packages=varargin{1}; -else - packages={'macayeal','ice','cielo_serial','cielo_parallel'}; -end - -%go through the solutions requested -testname='IceShelfIceFrontP3d_5'; -for i=1:length(packages), - package=packages{i}; - - for j=1:length(solutions), - solution=solutions{j}; - - %check solution requested - if strcmpi(package,'macayeal'); - disp(sprintf(['\nsolution: ' solution ', with package: ' package ', in test: ' testname ', not supported yet.\n'])); - continue - end - - %initialize model - md=model; - md=mesh(md,'DomainOutline.exp',100000); - md=geography(md,'all',''); - md=parameterize(md,'Square.par'); - md=extrude(md,8,4); - md=setelementstype(md,'pattyn','all'); - 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 - - %compute solution - [analysis_type sub_analysis_type]=testsgetanalysis(solution); - [md packagefinal]=testsgetpackage(md,package); - if ~testschecksolution(md.type,solution), continue; end - md=solve(md,'analysis_type',analysis_type,'sub_analysis_type',sub_analysis_type,'package',packagefinal); - - %compute fields to be checked - fields=testsgetfields(md.type,solution); - - %save new archive - for k=1:length(fields), - field=fields{k}; - eval(['Archive' package solution '_field' num2str(k) '=md.results. ' field ';']); - end - eval(['save Archive' package solution ' Archive' package solution '_field*']); - end -end -if nargout==1, - varargout{1}=md; -end Index: /issm/trunk/test/Miscellaneous/connectivity/runme.m =================================================================== --- /issm/trunk/test/Miscellaneous/connectivity/runme.m (revision 2552) +++ /issm/trunk/test/Miscellaneous/connectivity/runme.m (revision 2553) @@ -49,7 +49,7 @@ if isparallel md.cluster='wilkes'; - md=solve(md,'diagnostic_horiz','cielo'); + md=solve(md,'analysis_type','diagnostic_horiz'); else - md=solve(md,'diagnostic','cielo'); + md=solve(md,'analysis_type','diagnostic'); end t2=clock; Index: /issm/trunk/test/Validation/ControlMethods/runmeB.m =================================================================== --- /issm/trunk/test/Validation/ControlMethods/runmeB.m (revision 2552) +++ /issm/trunk/test/Validation/ControlMethods/runmeB.m (revision 2553) @@ -31,5 +31,5 @@ %diagnostic with this B md.cluster='wilkes'; - md=solve(md,'diagnostic','cielo'); + md=solve(md,'analysis_type','diagnostic'); %save observed velocities and exact B @@ -72,6 +72,6 @@ md.np=8; %md.cluster='wilkes'; - %md=solve(md,'analysis_type','control','package','ice'); - md=solve(md,'analysis_type','control','package','cielo'); + %md=solve(md,'analysis_type','control'); + md=solve(md,'analysis_type','control'); %md=solve(md,'analysis_type','control','package','macayeal'); end Index: /issm/trunk/test/Validation/ControlMethods/runmedrag.m =================================================================== --- /issm/trunk/test/Validation/ControlMethods/runmedrag.m (revision 2552) +++ /issm/trunk/test/Validation/ControlMethods/runmedrag.m (revision 2553) @@ -29,6 +29,6 @@ %diagnostic with this drag - md=solve(md,'diagnostic','cielo'); - %md.cluster='wilkes'; md=solve(md,'diagnostic_horiz','cielo'); + md=solve(md,'analysis_type','diagnostic'); + %md.cluster='wilkes'; md=solve(md,'analysis_type','diagnostic_horiz'); %save observed velocities and exact B @@ -69,6 +69,6 @@ %md.cluster='wilkes'; -%md=solve(md,'analysis_type','control','package','ice'); -md=solve(md,'analysis_type','control','package','cielo'); +%md=solve(md,'analysis_type','control'); +md=solve(md,'analysis_type','control'); %md=solve(md,'analysis_type','control','package','macayeal'); end Index: /issm/trunk/test/Validation/ThermalTests/Melting/runme.m =================================================================== --- /issm/trunk/test/Validation/ThermalTests/Melting/runme.m (revision 2552) +++ /issm/trunk/test/Validation/ThermalTests/Melting/runme.m (revision 2553) @@ -22,6 +22,6 @@ %modeled results -%md=solve(md,'analysis_type','thermal','sub_analysis_type','steady','package','ice'); -md=solve(md,'analysis_type','thermal','sub_analysis_type','steady','package','cielo'); +%md=solve(md,'analysis_type','thermal','sub_analysis_type','steady'); +md=solve(md,'analysis_type','thermal','sub_analysis_type','steady'); %plot results Index: /issm/trunk/test/Validation/ThermalTests/Simpleconduction/runme.m =================================================================== --- /issm/trunk/test/Validation/ThermalTests/Simpleconduction/runme.m (revision 2552) +++ /issm/trunk/test/Validation/ThermalTests/Simpleconduction/runme.m (revision 2553) @@ -22,5 +22,5 @@ %modeled results -md=solve(md,'analysis_type','thermal','sub_analysis_type','steady','package','cielo'); +md=solve(md,'analysis_type','thermal','sub_analysis_type','steady'); %plot results Index: /issm/trunk/test/Validation/ThermalTests/Simplegeothermalflux/runme.m =================================================================== --- /issm/trunk/test/Validation/ThermalTests/Simplegeothermalflux/runme.m (revision 2552) +++ /issm/trunk/test/Validation/ThermalTests/Simplegeothermalflux/runme.m (revision 2553) @@ -22,5 +22,5 @@ %modeled results -md=solve(md,'analysis_type','thermal','sub_analysis_type','steady','package','cielo'); +md=solve(md,'analysis_type','thermal','sub_analysis_type','steady'); %plot results