Index: /issm/trunk-jpl/src/m/utils/DataProcessing/pkriging.m =================================================================== --- /issm/trunk-jpl/src/m/utils/DataProcessing/pkriging.m (revision 12661) +++ /issm/trunk-jpl/src/m/utils/DataProcessing/pkriging.m (revision 12662) @@ -8,5 +8,5 @@ cluster=getfieldvalue(options,'cluster',generic('np',10)); options=removefield(options,'cluster',0); -name = 'krig'; +name = ['krig' num2str(feature('GetPid'))]; % ========================================= MARSHALL.m ================================================= @@ -38,10 +38,18 @@ LaunchQueueJob(cluster,name,name,{[name '.bin'] [name '.queue']}); toc +choice=input('Is the job successfully completed? (y/n)','s'); Download(cluster,name,{[name '.outbin']}); +structure=parseresultsfromdisk([name '.outbin'],0); +delete([name '.outlog']); +delete([name '.errlog']); +delete([name '.outbin']); +delete([name '.bin']); +if ~ispc, + delete([name '.tar.gz']); +end %Process results -structure=parseresultsfromdisk([name '.outbin'],0); B=structure.AutodiffForward; -B=reshape(B,size(x_interp,1),size(x_interp,2))'; +B=reshape(B,size(x_interp,2),size(x_interp,1))'; E=structure.AutodiffIsautodiff; -E=reshape(E,size(x_interp,1),size(x_interp,2))'; +E=reshape(E,size(x_interp,2),size(x_interp,1))'; Index: /issm/trunk-jpl/src/m/utils/consistency/checkfield.m =================================================================== --- /issm/trunk-jpl/src/m/utils/consistency/checkfield.m (revision 12661) +++ /issm/trunk-jpl/src/m/utils/consistency/checkfield.m (revision 12662) @@ -1,3 +1,3 @@ -function checkfield(md,fieldname,varargin) +function md = checkfield(md,fieldname,varargin) %CHECKFIELD - check field consistency % @@ -19,10 +19,10 @@ % % Usage: -% checkfield(md,fieldname,options); +% md = checkfield(md,fieldname,options); % % Example: -% checkfield(md,'mesh.elementonbed','size',[md.mesh.numberofelements 1],'values',[0 1]); -% checkfield(md,'diagnostic.icefront','size',[NaN 4],'NaN',1); -% checkfield(md,'diagnostic.icefront(:,end)','values',[0 1 2]); +% md = checkfield(md,'mesh.elementonbed','size',[md.mesh.numberofelements 1],'values',[0 1]); +% md = checkfield(md,'diagnostic.icefront','size',[NaN 4],'NaN',1); +% md = checkfield(md,'diagnostic.icefront(:,end)','values',[0 1 2]); %get options @@ -35,5 +35,5 @@ if exist(options,'empty') if isempty(field), - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' is empty'])); end @@ -45,15 +45,15 @@ if isnan(fieldsize(1)), if (size(field,2)~=fieldsize(2)), - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' should have ' num2str(fieldsize(2)) ' columns'])); end elseif isnan(fieldsize(2)), if (size(field,1)~=fieldsize(1)), - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' should have ' num2str(fieldsize(1)) ' lines'])); end else if ((size(field)~=fieldsize(1)) | (size(field,2)~=fieldsize(2))) - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' size should be ' num2str(fieldsize(1)) ' x ' num2str(fieldsize(2))])); end @@ -66,11 +66,11 @@ if ~ismember(numel(field),fieldnumel), if length(fieldnumel)==1 - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' size should be ' sprintf('%g ',fieldnumel) ])); elseif length(fieldnumel)==2 - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' size should be ' num2str(fieldnumel(1)) ' or ' num2str(fieldnumel(2)) ])); else - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' size should be ' sprintf('%g, ',fieldnumel(1:end-1)) ' or ' num2str(fieldnumel(end)) ])); end @@ -82,5 +82,5 @@ field2=reshape(field,prod(size(field)),1); if any(isnan(field2)), - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['NaN values found in field ''' fieldname ''''])); end @@ -90,5 +90,5 @@ if getfieldvalue(options,'cell',0); if ~iscell(field), - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' should be a cell'])); end @@ -102,16 +102,16 @@ if any(~ismember(field,fieldvalues)), if length(fieldvalues)==1 - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' value should be ' fieldvalues{1} ])); elseif length(fieldvalues)==2 - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' values should be ' fieldvalues{1} ' or ' fieldvalues{2} ])); else - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' should have values in ' sprintf('''%s'', ',fieldvalues{1:end-1}) 'or ''' fieldvalues{end} ''''])); end end else - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' should be one of the following strings: ' sprintf('''%s'', ',fieldvalues{1:end-1}) 'or ''' fieldvalues{end} ''''])); end @@ -120,9 +120,9 @@ if isnumeric(field), if any(~ismember(field2,fieldvalues)), - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' should have values in [' num2str(fieldvalues) ']'])); end else - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' should be a number in [' num2str(fieldvalues) ']'])); end @@ -135,5 +135,5 @@ field2=reshape(field,prod(size(field)),1); if any(field2upperbound), - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' should have values below ' num2str(upperbound)])); end @@ -161,5 +161,5 @@ field2=reshape(field,prod(size(field)),1); if any(field2>=upperbound), - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' should have values below ' num2str(upperbound(1))])); end @@ -169,5 +169,5 @@ if getfieldvalue(options,'file',0), if ~exist(field,'file') - checkmessage(['file profided in ''' fieldname ''': ''' field ''' does not exist']); + md = checkmessage(md,['file profided in ''' fieldname ''': ''' field ''' does not exist']); end end @@ -177,18 +177,18 @@ if size(field,1)==md.mesh.numberofvertices, if ~size(field,2)==1, - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' should have only one column as there are md.mesh.numberofvertices lines'])); end elseif size(field,1)==md.mesh.numberofvertices+1 if any(field(end,:)~=sort(field(end,:))), - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' columns should be chronological'])); end if any(field(end,1:end-1)==field(end,2:end)), - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' columns must not contain duplicate timesteps'])); end else - checkmessage(getfieldvalue(options,'message',... + md = checkmessage(md,getfieldvalue(options,'message',... ['field ''' fieldname ''' should have md.mesh.numberofvertices or md.mesh.numberofvertices+1 lines'])); end Index: sm/trunk-jpl/src/m/utils/consistency/checkmessage.m =================================================================== --- /issm/trunk-jpl/src/m/utils/consistency/checkmessage.m (revision 12661) +++ (revision ) @@ -1,10 +1,0 @@ -function checkmessage(string) -%CHECKMESSAGE - checkmessage -% -% Used to check model consistency -% -% Usage: -% checkmessage(string); - -disp(['model not consistent: ' string]); -modelconsistency(false); Index: sm/trunk-jpl/src/m/utils/consistency/modelconsistency.m =================================================================== --- /issm/trunk-jpl/src/m/utils/consistency/modelconsistency.m (revision 12661) +++ (revision ) @@ -1,23 +1,0 @@ -function flag=modelconsistency(flag_in) -%MODELCONSISTENCY - return flag for model consistency -% -% Used to check model consistency -% -% Usage: -% flag=modelconsistency(flag_in) - -persistent consistency; - -if nargin==1 & nargout==0, - %OK model is inconsistent, set flag as false - consistency=flag_in; -elseif nargin==0 & nargout==1, - if isempty(consistency), - %modelinconsistent has never been called, model is consistent - consistency=true; - end -else - message('Bad usage'); -end - -flag=consistency;