Index: /issm/trunk-jpl/src/m/array/array_numel.m =================================================================== --- /issm/trunk-jpl/src/m/array/array_numel.m (revision 13645) +++ /issm/trunk-jpl/src/m/array/array_numel.m (revision 13646) @@ -17,5 +17,5 @@ inum=numel(varargin{iarg}); end - + if ~isequal(inum,1) if isequal(anum,1) Index: /issm/trunk-jpl/src/m/array/array_size.m =================================================================== --- /issm/trunk-jpl/src/m/array/array_size.m (revision 13645) +++ /issm/trunk-jpl/src/m/array/array_size.m (revision 13646) @@ -17,5 +17,5 @@ isize=size(varargin{iarg}); end - + if ~isequal(isize,[1 1]) if isequal(asize,[1 1]) Index: /issm/trunk-jpl/src/m/array/str2int.m =================================================================== --- /issm/trunk-jpl/src/m/array/str2int.m (revision 13645) +++ /issm/trunk-jpl/src/m/array/str2int.m (revision 13646) @@ -44,3 +44,2 @@ end - Index: /issm/trunk-jpl/src/m/array/struc_desc.m =================================================================== --- /issm/trunk-jpl/src/m/array/struc_desc.m (revision 13645) +++ /issm/trunk-jpl/src/m/array/struc_desc.m (revision 13646) @@ -22,5 +22,5 @@ desc=cellstr(varargin{iarg}); end - + for i=1:length(desc) sarrayoi=struc_desci(sarray,desc{i}); Index: /issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.m =================================================================== --- /issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.m (revision 13645) +++ /issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.m (revision 13646) @@ -74,5 +74,4 @@ md.diagnostic.icefront=pressureload; - %Create zeros basalforcings and surfaceforcings if (isnan(md.surfaceforcings.precipitation) & (md.surfaceforcings.ispdd==1)), Index: /issm/trunk-jpl/src/m/classes/autodiff.m =================================================================== --- /issm/trunk-jpl/src/m/classes/autodiff.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/autodiff.m (revision 13646) @@ -41,5 +41,4 @@ end - end % }}} function disp(obj) % {{{ @@ -54,5 +53,5 @@ WriteData(fid,'object',obj,'fieldname','isautodiff','format','Boolean'); WriteData(fid,'object',obj,'fieldname','driver','format','String'); - + %early return if ~obj.isautodiff, @@ -104,5 +103,5 @@ if strcmpi(obj.driver,'fos_forward'), index=0; - + for i=1:num_independent_objects, indep=obj.independents{i}; @@ -125,5 +124,5 @@ if strcmpi(obj.driver,'fos_reverse'), index=0; - + for i=1:num_dependent_objects, dep=obj.dependents{i}; @@ -146,5 +145,5 @@ if strcmpi(obj.driver,'fov_forward'), indices=0; - + for i=1:num_independent_objects, indep=obj.independents{i}; Index: /issm/trunk-jpl/src/m/classes/dependent.m =================================================================== --- /issm/trunk-jpl/src/m/classes/dependent.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/dependent.m (revision 13646) @@ -16,8 +16,8 @@ methods function obj= dependent(varargin) % {{{ - + %use provided options to change fields options=pairoptions(varargin{:}); - + obj.name=getfieldvalue(options,'name',''); obj.type=getfieldvalue(options,'type',''); @@ -68,5 +68,5 @@ fielddisplay(obj,'name','variable name (must match corresponding Enum)'); fielddisplay(obj,'type','type of variable (''vertex'' or ''scalar'')'); - + if ~isnan(obj.fos_reverse_index), fielddisplay(obj,'fos_reverse_index','index for fos_reverse driver of ADOLC'); Index: /issm/trunk-jpl/src/m/classes/diagnostic.m =================================================================== --- /issm/trunk-jpl/src/m/classes/diagnostic.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/diagnostic.m (revision 13646) @@ -38,10 +38,10 @@ %maximum of non-linear iterations. obj.maxiter=100; - + %Convergence criterion: absolute, relative and residual obj.restol=10^-4; obj.reltol=0.01; obj.abstol=10; - + obj.stokesreconditioning=10^13; obj.shelf_dampening=0; Index: /issm/trunk-jpl/src/m/classes/flaim.m =================================================================== --- /issm/trunk-jpl/src/m/classes/flaim.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/flaim.m (revision 13646) @@ -59,5 +59,5 @@ fielddisplay(obj,'usevalueordering' ,'flag to consider target values for flight path evaluation'); fielddisplay(obj,'split_antimeridian' ,'flag to split polygons on the antimeridian'); - + disp(sprintf('\n Optimization:')); fielddisplay(obj,'path_optimize' ,'optimize? (default false)'); Index: /issm/trunk-jpl/src/m/classes/groundingline.m =================================================================== --- /issm/trunk-jpl/src/m/classes/groundingline.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/groundingline.m (revision 13646) @@ -25,5 +25,4 @@ %basal melting rate correction: obj.melting_rate=0; - end % }}} Index: /issm/trunk-jpl/src/m/classes/independent.m =================================================================== --- /issm/trunk-jpl/src/m/classes/independent.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/independent.m (revision 13646) @@ -14,5 +14,5 @@ methods function obj= independent(varargin) % {{{ - + %use provided options to change fields options=pairoptions(varargin{:}); @@ -49,5 +49,4 @@ end - end % }}} function disp(obj) % {{{ Index: /issm/trunk-jpl/src/m/classes/mesh.m =================================================================== --- /issm/trunk-jpl/src/m/classes/mesh.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/mesh.m (revision 13646) @@ -15,5 +15,5 @@ numberofvertices = 0; numberofedges = 0; - + lat = NaN long = NaN @@ -158,5 +158,5 @@ fielddisplay(obj,'lowerelements','lower element list (NaN for element on the lower layer'); fielddisplay(obj,'vertexonboundary','vertices on the boundary of the domain flag list'); - + fielddisplay(obj,'segments','edges on domain boundary (vertex1 vertex2 element)'); fielddisplay(obj,'segmentmarkers','number associated to each segment'); Index: /issm/trunk-jpl/src/m/classes/model/model.m =================================================================== --- /issm/trunk-jpl/src/m/classes/model/model.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/model/model.m (revision 13646) @@ -930,5 +930,5 @@ if isfield(structmd,'npart'); md.qmu.numberofpartitions=structmd.npart; end if isfield(structmd,'part'); md.qmu.partition=structmd.part; end - + %Field changes if (isfield(structmd,'type') & ischar(structmd.type)), @@ -1037,5 +1037,5 @@ md.mesh.lowerelements(1:md.mesh.numberofelements2d)=NaN; end - + if ~isfield(structmd,'diagnostic_ref'); md.diagnostic.referential=NaN*ones(md.mesh.numberofvertices,6); Index: /issm/trunk-jpl/src/m/classes/modellist.m =================================================================== --- /issm/trunk-jpl/src/m/classes/modellist.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/modellist.m (revision 13646) @@ -271,5 +271,4 @@ end - %now, tar all the files and then erase them. eval(['!find -iname ''' name '-*'' > file_list.txt']); @@ -369,5 +368,4 @@ % LaunchMultipleQueueJobgemini(cluster,name,executionpath) - %first, check we have the binary file and the queueing script if ~exist([ name '.queue'],'file'), Index: /issm/trunk-jpl/src/m/classes/organizer.m =================================================================== --- /issm/trunk-jpl/src/m/classes/organizer.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/organizer.m (revision 13646) @@ -114,5 +114,5 @@ end%}}} function bool=perform(org,string) % {{{ - + bool=false; @@ -155,5 +155,5 @@ name=[org.repository '/' org.prefix org.steps(org.currentstep).string ]; disp(['saving model as: ' name]); - + %check that md is a model if ~isa(md,'model'), warning('third argument is not a model'); end Index: /issm/trunk-jpl/src/m/classes/planetmesh.m =================================================================== --- /issm/trunk-jpl/src/m/classes/planetmesh.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/planetmesh.m (revision 13646) @@ -17,5 +17,5 @@ numberofelements = 0; numberofvertices = 0; - + lat = NaN long = NaN @@ -103,5 +103,5 @@ fielddisplay(obj,'dimension','planetmesh dimension (2d or 3d)'); fielddisplay(obj,'numberoflayers','number of extrusion layers'); - + fielddisplay(obj,'vertexconnectivity','list of vertices connected to vertex_i'); fielddisplay(obj,'elementconnectivity','list of vertices connected to element_i'); Index: /issm/trunk-jpl/src/m/classes/prognostic.m =================================================================== --- /issm/trunk-jpl/src/m/classes/prognostic.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/prognostic.m (revision 13646) @@ -50,5 +50,4 @@ end - end % }}} function disp(obj) % {{{ Index: /issm/trunk-jpl/src/m/classes/qmu.m =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/qmu.m (revision 13646) @@ -33,5 +33,5 @@ end % }}} function obj = setdefaultparameters(obj) % {{{ - + end % }}} function md = checkconsistency(obj,md,solution,analyses) % {{{ Index: /issm/trunk-jpl/src/m/classes/qmu/@dakota_method/dakota_method.m =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/@dakota_method/dakota_method.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/qmu/@dakota_method/dakota_method.m (revision 13646) @@ -49,5 +49,5 @@ params =struct(); end - + methods function [dm]=dakota_method(method) @@ -828,5 +828,5 @@ end - + % if more than one argument, issue warning @@ -852,5 +852,5 @@ disp(sprintf(' responses: %s' ,string_cell(dm(i).responses))); disp(sprintf(' ghspec: %s\n' ,string_cell(dm(i).ghspec))); - + % display the parameters within the object @@ -860,5 +860,5 @@ maxlen=max(maxlen,length(fnames{j})); end - + for j=1:numel(fnames) disp(sprintf([' params.%-' num2str(maxlen+1) 's: %s'],... @@ -870,3 +870,2 @@ end end - Index: /issm/trunk-jpl/src/m/classes/qmu/@dakota_method/dmeth_params_write.m =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/@dakota_method/dmeth_params_write.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/qmu/@dakota_method/dmeth_params_write.m (revision 13646) @@ -46,5 +46,5 @@ error('Unrecognized ''%s'' method: ''%s''.',dm.type,dm.method); end - + case {'npsol'} param_write(fid,sbeg,'max_iterations',' = ','\n',dm.params); @@ -64,5 +64,5 @@ error('Unrecognized ''%s'' method: ''%s''.',dm.type,dm.method); end - + case {'conmin'} param_write(fid,sbeg,'max_iterations',' = ','\n',dm.params); @@ -80,5 +80,5 @@ error('Unrecognized ''%s'' method: ''%s''.',dm.type,dm.method); end - + case {'optpp'} param_write(fid,sbeg,'max_iterations',' = ','\n',dm.params); @@ -120,5 +120,5 @@ error('Unrecognized ''%s'' method: ''%s''.',dm.type,dm.method); end - + case {'apps'} param_write(fid,sbeg,'max_function_evaluations',' = ','\n',dm.params); @@ -140,5 +140,5 @@ error('Unrecognized ''%s'' method: ''%s''.',dm.type,dm.method); end - + case {'coliny'} param_write(fid,sbeg,'max_iterations',' = ','\n',dm.params); @@ -212,5 +212,5 @@ error('Unrecognized ''%s'' method: ''%s''.',dm.type,dm.method); end - + case {'ncsu'} param_write(fid,sbeg,'max_iterations',' = ','\n',dm.params); @@ -226,5 +226,5 @@ error('Unrecognized ''%s'' method: ''%s''.',dm.type,dm.method); end - + case {'jega'} param_write(fid,sbeg,'max_iterations',' = ','\n',dm.params); @@ -282,5 +282,5 @@ error('Unrecognized ''%s'' method: ''%s''.',dm.type,dm.method); end - + case {'lsq'} switch dm.method @@ -344,5 +344,5 @@ error('Unrecognized ''%s'' method: ''%s''.',dm.type,dm.method); end - + case {'nond'} switch dm.method @@ -426,5 +426,5 @@ error('Unrecognized ''%s'' method: ''%s''.',dm.type,dm.method); end - + case {'dace'} switch dm.method @@ -484,5 +484,5 @@ error('Unrecognized ''%s'' method: ''%s''.',dm.type,dm.method); end - + case {'param'} param_write(fid,sbeg,'output',' ','\n',dm.params); @@ -512,5 +512,5 @@ case {'multidim_parameter_study'} param_write(fid,sbeg,'partitions',' = ','\n',dm.params); - + otherwise error('Unrecognized ''%s'' method: ''%s''.',dm.type,dm.method); Index: /issm/trunk-jpl/src/m/classes/qmu/continuous_design.m =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/continuous_design.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/qmu/continuous_design.m (revision 13646) @@ -39,5 +39,5 @@ scale = 1.; end - + methods function [cdv]=continuous_design(varargin) @@ -65,5 +65,5 @@ cdv(asizec{:})=continuous_design; clear asizec - + if ischar(varargin{1}) varargin{1}=cellstr(varargin{1}); @@ -212,5 +212,5 @@ end end - + methods (Static) function []=dakota_write(fidi,dvar) Index: /issm/trunk-jpl/src/m/classes/qmu/continuous_state.m =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/continuous_state.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/qmu/continuous_state.m (revision 13646) @@ -35,5 +35,5 @@ upper = Inf; end - + methods function [csv]=continuous_state(varargin) @@ -61,5 +61,5 @@ csv(asizec{:})=continuous_state; clear asizec - + if ischar(varargin{1}) varargin{1}=cellstr(varargin{1}); @@ -177,5 +177,5 @@ end end - + methods (Static) function []=dakota_write(fidi,dvar) Index: /issm/trunk-jpl/src/m/classes/qmu/least_squares_term.m =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/least_squares_term.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/qmu/least_squares_term.m (revision 13646) @@ -35,5 +35,5 @@ weight = 1.; end - + methods function [lst]=least_squares_term(varargin) @@ -54,5 +54,5 @@ lst(asizec{:})=least_squares_term; clear asizec - + if ischar(varargin{1}) varargin{1}=cellstr(varargin{1}); @@ -169,5 +169,5 @@ end end - + methods (Static) function [rdesc]=dakota_write(fidi,dresp,rdesc) Index: /issm/trunk-jpl/src/m/classes/qmu/linear_equality_constraint.m =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/linear_equality_constraint.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/qmu/linear_equality_constraint.m (revision 13646) @@ -35,5 +35,5 @@ scale = 1.; end - + methods function [lec]=linear_equality_constraint(varargin) @@ -69,5 +69,5 @@ lec(asizec{:})=linear_equality_constraint; clear asizec - + for i=1:numel(lec) if (size(varargin{1},1) > 1) @@ -167,5 +167,5 @@ end end - + methods (Static) function []=dakota_write(fidi,dvar) Index: /issm/trunk-jpl/src/m/classes/qmu/linear_inequality_constraint.m =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/linear_inequality_constraint.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/qmu/linear_inequality_constraint.m (revision 13646) @@ -37,5 +37,5 @@ scale = 1.; end - + methods function [lic]=linear_inequality_constraint(varargin) @@ -77,5 +77,5 @@ lic(asizec{:})=linear_inequality_constraint; clear asizec - + for i=1:numel(lic) if (size(varargin{1},1) > 1) @@ -189,5 +189,5 @@ end end - + methods (Static) function []=dakota_write(fidi,dvar) @@ -203,3 +203,2 @@ end end - Index: /issm/trunk-jpl/src/m/classes/qmu/nonlinear_equality_constraint.m =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/nonlinear_equality_constraint.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/qmu/nonlinear_equality_constraint.m (revision 13646) @@ -35,5 +35,5 @@ scale = 1.; end - + methods function [nec]=nonlinear_equality_constraint(varargin) @@ -61,5 +61,5 @@ nec(asizec{:})=nonlinear_equality_constraint; clear asizec - + if ischar(varargin{1}) varargin{1}=cellstr(varargin{1}); @@ -171,5 +171,5 @@ end end - + methods (Static) function [rdesc]=dakota_write(fidi,dresp,rdesc) Index: /issm/trunk-jpl/src/m/classes/qmu/nonlinear_inequality_constraint.m =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/nonlinear_inequality_constraint.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/qmu/nonlinear_inequality_constraint.m (revision 13646) @@ -37,5 +37,5 @@ scale = 1.; end - + methods function [nic]=nonlinear_inequality_constraint(varargin) @@ -69,5 +69,5 @@ nic(asizec{:})=nonlinear_inequality_constraint; clear asizec - + if ischar(varargin{1}) varargin{1}=cellstr(varargin{1}); @@ -189,5 +189,5 @@ end end - + methods (Static) function [rdesc]=dakota_write(fidi,dresp,rdesc) Index: /issm/trunk-jpl/src/m/classes/qmu/normal_uncertain.m =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/normal_uncertain.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/qmu/normal_uncertain.m (revision 13646) @@ -37,5 +37,5 @@ upper = Inf; end - + methods function [nuv]=normal_uncertain(varargin) @@ -69,5 +69,5 @@ nuv(asizec{:})=normal_uncertain; clear asizec - + if ischar(varargin{1}) varargin{1}=cellstr(varargin{1}); @@ -193,5 +193,5 @@ end end - + methods (Static) function []=dakota_write(fidi,dvar) Index: /issm/trunk-jpl/src/m/classes/qmu/objective_function.m =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/objective_function.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/qmu/objective_function.m (revision 13646) @@ -35,5 +35,5 @@ weight = 1.; end - + methods function [of]=objective_function(varargin) @@ -54,5 +54,5 @@ of(asizec{:})=objective_function; clear asizec - + if ischar(varargin{1}) varargin{1}=cellstr(varargin{1}); @@ -169,5 +169,5 @@ end end - + methods (Static) function [rdesc]=dakota_write(fidi,dresp,rdesc) Index: /issm/trunk-jpl/src/m/classes/qmu/response_function.m =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/response_function.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/qmu/response_function.m (revision 13646) @@ -37,5 +37,5 @@ grell =[]; end - + methods function [rf]=response_function(varargin) @@ -56,5 +56,5 @@ rf(asizec{:})=response_function; clear asizec - + if ischar(varargin{1}) varargin{1}=cellstr(varargin{1}); @@ -166,5 +166,5 @@ end end - + methods (Static) function [rdesc]=dakota_write(fidi,dresp,rdesc) @@ -178,5 +178,5 @@ [rdesc]=rlist_write(fidi,'response_functions','response_function',rf,rdesc); end - + function []=dakota_rlev_write(fidi,dresp,params) Index: /issm/trunk-jpl/src/m/classes/qmu/uniform_uncertain.m =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/uniform_uncertain.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/qmu/uniform_uncertain.m (revision 13646) @@ -32,5 +32,5 @@ upper = Inf; end - + methods function [uuv]=uniform_uncertain(varargin) @@ -64,5 +64,5 @@ uuv(asizec{:})=uniform_uncertain; clear asizec - + if ischar(varargin{1}) varargin{1}=cellstr(varargin{1}); @@ -152,5 +152,5 @@ end end - + methods (Static) function []=dakota_write(fidi,dvar) Index: /issm/trunk-jpl/src/m/classes/surfaceforcings.m =================================================================== --- /issm/trunk-jpl/src/m/classes/surfaceforcings.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/surfaceforcings.m (revision 13646) @@ -37,5 +37,5 @@ end % }}} function obj = setdefaultparameters(obj) % {{{ - + %pdd method not used in default mode obj.ispdd=0; Index: /issm/trunk-jpl/src/m/classes/verbose.m =================================================================== --- /issm/trunk-jpl/src/m/classes/verbose.m (revision 13645) +++ /issm/trunk-jpl/src/m/classes/verbose.m (revision 13646) @@ -109,5 +109,5 @@ end % }}} function disp(verbose) % {{{ - + %BEGINDISP disp(sprintf('class ''%s'' = ',class(verbose))); Index: /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m =================================================================== --- /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m (revision 13645) +++ /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m (revision 13646) @@ -46,6 +46,4 @@ % Usage: % [analyses, numanalyses]=AnalysisConfiguration(solutiontype); - - switch solutiontype, Index: /issm/trunk-jpl/src/m/contrib/bamg/YamsCall.m =================================================================== --- /issm/trunk-jpl/src/m/contrib/bamg/YamsCall.m (revision 13645) +++ /issm/trunk-jpl/src/m/contrib/bamg/YamsCall.m (revision 13646) @@ -53,8 +53,8 @@ fprintf(fid,'%i %i %i %i\n',[md.mesh.elements zeros(md.mesh.numberofelements,1)]'); numberofelements1=md.mesh.numberofelements; - + %Deal with rifts if ~isnan(md.rifts.riftstruct), - + %we have the list of triangles that make up the rift. keep those triangles around during refinement. triangles=[]; Index: /issm/trunk-jpl/src/m/contrib/bamg/yams.m =================================================================== --- /issm/trunk-jpl/src/m/contrib/bamg/yams.m (revision 13645) +++ /issm/trunk-jpl/src/m/contrib/bamg/yams.m (revision 13646) @@ -102,5 +102,5 @@ end - + disp(['Final mesh, number of elements: ' num2str(md.mesh.numberofelements)]); Index: /issm/trunk-jpl/src/m/contrib/uci/expremovestraightsegments.m =================================================================== --- /issm/trunk-jpl/src/m/contrib/uci/expremovestraightsegments.m (revision 13645) +++ /issm/trunk-jpl/src/m/contrib/uci/expremovestraightsegments.m (revision 13646) @@ -11,8 +11,8 @@ for i=1:length(a), contour=a(i); - + s=sqrt(contour.x.^2+contour.y.^2); d=diff(s); - + pos=find(abs(d)>cutoff); pos=[0;pos;length(contour.x)]; Index: /issm/trunk-jpl/src/m/exp/expcontract.m =================================================================== --- /issm/trunk-jpl/src/m/exp/expcontract.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/expcontract.m (revision 13646) @@ -6,5 +6,4 @@ % % See also EXPMASTER, EXPDOC - contour=expread(oldfile); Index: /issm/trunk-jpl/src/m/exp/expcreatecontour.m =================================================================== --- /issm/trunk-jpl/src/m/exp/expcreatecontour.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/expcreatecontour.m (revision 13646) @@ -34,3 +34,2 @@ %write contour using expwrite expwrite(a,filename); - Index: /issm/trunk-jpl/src/m/exp/expexcludeoutliers.m =================================================================== --- /issm/trunk-jpl/src/m/exp/expexcludeoutliers.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/expexcludeoutliers.m (revision 13646) @@ -7,5 +7,4 @@ % % See also EXPMASTER, EXPDOC - contour=expread(contourname); Index: /issm/trunk-jpl/src/m/exp/expflip.m =================================================================== --- /issm/trunk-jpl/src/m/exp/expflip.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/expflip.m (revision 13646) @@ -5,8 +5,4 @@ % % - - - - a=expread(domainname,1); Index: /issm/trunk-jpl/src/m/exp/expll2xy.m =================================================================== --- /issm/trunk-jpl/src/m/exp/expll2xy.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/expll2xy.m (revision 13646) @@ -5,5 +5,4 @@ % - sgn = Sign of latitude +1 : north latitude (default is mer=45 lat=70) % -1 : south latitude (default is mer=0 lat=71) - %Get central_meridian and standard_parallel depending on hemisphere Index: /issm/trunk-jpl/src/m/exp/expswapxy.m =================================================================== --- /issm/trunk-jpl/src/m/exp/expswapxy.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/expswapxy.m (revision 13646) @@ -6,5 +6,4 @@ % % See also EXPMASTER, EXPDOC - contours=expread(filename,1); Index: /issm/trunk-jpl/src/m/exp/exptool.m =================================================================== --- /issm/trunk-jpl/src/m/exp/exptool.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/exptool.m (revision 13646) @@ -308,5 +308,4 @@ backup{counter,4}=closed; - case 12 Index: /issm/trunk-jpl/src/m/exp/expwrite.m =================================================================== --- /issm/trunk-jpl/src/m/exp/expwrite.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/expwrite.m (revision 13646) @@ -20,5 +20,5 @@ error('contours x and y coordinates must be of identical size'); end - + if isfield(a,'name'), if ~isempty(a(n).name), @@ -30,5 +30,5 @@ fprintf(fid,'%s\n','## Name:'); end - + fprintf(fid,'%s\n','## Icon:0'); fprintf(fid,'%s\n','# Points Count Value'); Index: /issm/trunk-jpl/src/m/exp/expxy2ll.m =================================================================== --- /issm/trunk-jpl/src/m/exp/expxy2ll.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/expxy2ll.m (revision 13646) @@ -5,5 +5,4 @@ % - sgn = Sign of latitude +1 : north latitude (default is mer=45 lat=70) % -1 : south latitude (default is mer=0 lat=71) - %Get central_meridian and standard_parallel depending on hemisphere Index: /issm/trunk-jpl/src/m/exp/manipulation/addcontour.m =================================================================== --- /issm/trunk-jpl/src/m/exp/manipulation/addcontour.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/manipulation/addcontour.m (revision 13646) @@ -7,5 +7,5 @@ % Usage: % [A,numprofiles,numpoints,closed]=addcontour(A,numprofiles,numpoints,closed,prevplot,root,options) - + title('click to add a point to the new profile, RETURN to exit','FontSize',14) hold on @@ -18,5 +18,5 @@ [xi,yi] = ginput(1); - + if ~isempty(xi) x(end+1,1)=xi; Index: /issm/trunk-jpl/src/m/exp/manipulation/addendprofile.m =================================================================== --- /issm/trunk-jpl/src/m/exp/manipulation/addendprofile.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/manipulation/addendprofile.m (revision 13646) @@ -7,5 +7,5 @@ % Usage: % [A,numprofiles,numpoints,closed]=addendprofile(A,numprofiles,numpoints,closed,prevplot,root,options) - + %some checks if numprofiles==0 Index: /issm/trunk-jpl/src/m/exp/manipulation/addinsideprofile.m =================================================================== --- /issm/trunk-jpl/src/m/exp/manipulation/addinsideprofile.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/manipulation/addinsideprofile.m (revision 13646) @@ -7,5 +7,5 @@ % Usage: % [A,numprofiles,numpoints,closed]=addinsideprofile(A,numprofiles,numpoints,closed,prevplot,root,options) - + %some checks if numprofiles==0 Index: /issm/trunk-jpl/src/m/exp/manipulation/addprofile.m =================================================================== --- /issm/trunk-jpl/src/m/exp/manipulation/addprofile.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/manipulation/addprofile.m (revision 13646) @@ -7,5 +7,5 @@ % Usage: % [A,numprofiles,numpoints,closed]=addprofile(A,numprofiles,numpoints,closed,prevplot,root,options) - + title('click to add a point to the new profile, RETURN to exit','FontSize',14) hold on @@ -18,5 +18,5 @@ [xi,yi] = ginput(1); - + if ~isempty(xi) x(end+1,1)=xi; Index: /issm/trunk-jpl/src/m/exp/manipulation/closeprofile.m =================================================================== --- /issm/trunk-jpl/src/m/exp/manipulation/closeprofile.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/manipulation/closeprofile.m (revision 13646) @@ -13,5 +13,5 @@ return end - + title('click on the profiles to be closed, RETURN to exit','FontSize',14) hold on @@ -33,5 +33,5 @@ [xi,yi] = ginput(1); - + if ~isempty(xi) Index: /issm/trunk-jpl/src/m/exp/manipulation/cutarea.m =================================================================== --- /issm/trunk-jpl/src/m/exp/manipulation/cutarea.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/manipulation/cutarea.m (revision 13646) @@ -10,5 +10,5 @@ % Usage: % [A,numprofiles,numpoints,closed]=cutarea(A,numprofiles,numpoints,closed,prevplot,root,options) - + hold on loop=1; Index: /issm/trunk-jpl/src/m/exp/manipulation/cutprofile.m =================================================================== --- /issm/trunk-jpl/src/m/exp/manipulation/cutprofile.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/manipulation/cutprofile.m (revision 13646) @@ -7,5 +7,5 @@ % Usage: % [A,numprofiles,numpoints,closed]=cutprofile(A,numprofiles,numpoints,closed,prevplot,root,options) - + %some checks if numprofiles==0 Index: /issm/trunk-jpl/src/m/exp/manipulation/modifyposition.m =================================================================== --- /issm/trunk-jpl/src/m/exp/manipulation/modifyposition.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/manipulation/modifyposition.m (revision 13646) @@ -7,5 +7,5 @@ % Usage: % [A,numprofiles,numpoints,closed]=modifyposition(A,numprofiles,numpoints,closed,prevplot,root,options) - + %some checks if numprofiles==0 Index: /issm/trunk-jpl/src/m/exp/manipulation/orientprofile.m =================================================================== --- /issm/trunk-jpl/src/m/exp/manipulation/orientprofile.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/manipulation/orientprofile.m (revision 13646) @@ -21,7 +21,7 @@ return end - + [xi,yi] = ginput(1); - + if ~isempty(xi) Index: /issm/trunk-jpl/src/m/exp/manipulation/removepoints.m =================================================================== --- /issm/trunk-jpl/src/m/exp/manipulation/removepoints.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/manipulation/removepoints.m (revision 13646) @@ -7,5 +7,5 @@ % Usage: % [A,numprofiles,numpoints,closed]=removepoints(A,numprofiles,numpoints,closed,prevplot,root,options) - + %some checks if numprofiles==0 Index: /issm/trunk-jpl/src/m/exp/manipulation/removeprofile.m =================================================================== --- /issm/trunk-jpl/src/m/exp/manipulation/removeprofile.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/manipulation/removeprofile.m (revision 13646) @@ -21,7 +21,7 @@ return end - + [xi,yi] = ginput(1); - + if ~isempty(xi) Index: /issm/trunk-jpl/src/m/exp/manipulation/removeseveralpoints.m =================================================================== --- /issm/trunk-jpl/src/m/exp/manipulation/removeseveralpoints.m (revision 13645) +++ /issm/trunk-jpl/src/m/exp/manipulation/removeseveralpoints.m (revision 13646) @@ -7,5 +7,5 @@ % Usage: % [A,numprofiles,numpoints,closed]=removeseveralpoints(A,numprofiles,numpoints,closed,prevplot,root,options) - + %some checks if numprofiles==0 Index: /issm/trunk-jpl/src/m/geometry/SegIntersect.m =================================================================== --- /issm/trunk-jpl/src/m/geometry/SegIntersect.m (revision 13645) +++ /issm/trunk-jpl/src/m/geometry/SegIntersect.m (revision 13646) @@ -49,5 +49,5 @@ O1C=O2O1'*O1C; O1D=O2O1'*O1D; - + %test if one point is included in the other segment (->bval=1) if (O1C-O1A)*(O1D-O1A)<0 Index: /issm/trunk-jpl/src/m/interp/SectionValues.m =================================================================== --- /issm/trunk-jpl/src/m/interp/SectionValues.m (revision 13645) +++ /issm/trunk-jpl/src/m/interp/SectionValues.m (revision 13646) @@ -22,5 +22,4 @@ y=infile.y; end - %get the specified resolution Index: /issm/trunk-jpl/src/m/inversions/parametercontrolB.m =================================================================== --- /issm/trunk-jpl/src/m/inversions/parametercontrolB.m (revision 13645) +++ /issm/trunk-jpl/src/m/inversions/parametercontrolB.m (revision 13646) @@ -38,5 +38,4 @@ md.inversion.nsteps=nsteps; end - %cm_min Index: /issm/trunk-jpl/src/m/kml/edgeadjacency.m =================================================================== --- /issm/trunk-jpl/src/m/kml/edgeadjacency.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/edgeadjacency.m (revision 13646) @@ -31,5 +31,5 @@ inode1=elem(i,j); inode2=elem(i,mod(j,size(elem,2))+1); - + % loop over the elements containing the first node of the edge to see % if they contain the second node of the edge Index: /issm/trunk-jpl/src/m/kml/exp2kml.m =================================================================== --- /issm/trunk-jpl/src/m/kml/exp2kml.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/exp2kml.m (revision 13646) @@ -6,8 +6,6 @@ % - %First, read exp file domain=expread(input); - %then transform: Index: /issm/trunk-jpl/src/m/kml/kml2exp.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml2exp.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml2exp.m (revision 13646) @@ -6,10 +6,7 @@ % - - - %First, read polygon kml file. structure=kml_shapefile(input); - + %create exp file: domain=struct(); Index: /issm/trunk-jpl/src/m/kml/kml_colorstyle.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_colorstyle.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_colorstyle.m (revision 13646) @@ -18,5 +18,5 @@ colormode ='normal'; end - + methods function [kml]=kml_colorstyle(varargin) @@ -160,5 +160,5 @@ end - + % string write the object @@ -196,7 +196,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/kml/kml_container.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_container.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_container.m (revision 13646) @@ -21,5 +21,5 @@ properties end - + methods function [kml]=kml_container(varargin) @@ -150,5 +150,5 @@ end - + % string write the object @@ -180,5 +180,5 @@ end - + % delete the object @@ -193,7 +193,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/kml/kml_document.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_document.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_document.m (revision 13646) @@ -23,5 +23,5 @@ feature ={}; end - + methods function [kml]=kml_document(varargin) @@ -162,5 +162,5 @@ end - + % string write the object @@ -202,5 +202,5 @@ end - + % delete the object @@ -230,7 +230,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/kml/kml_feature.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_feature.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_feature.m (revision 13646) @@ -28,5 +28,5 @@ style ={}; end - + methods function [kml]=kml_feature(varargin) @@ -204,5 +204,5 @@ end - + % string write the object @@ -262,5 +262,5 @@ end - + % delete the object @@ -289,7 +289,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/kml/kml_file_swrite.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_file_swrite.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_file_swrite.m (revision 13646) @@ -130,3 +130,2 @@ end - Index: /issm/trunk-jpl/src/m/kml/kml_file_write.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_file_write.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_file_write.m (revision 13646) @@ -124,3 +124,2 @@ end - Index: /issm/trunk-jpl/src/m/kml/kml_folder.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_folder.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_folder.m (revision 13646) @@ -23,5 +23,5 @@ feature ={}; end - + methods function [kml]=kml_folder(varargin) @@ -162,5 +162,5 @@ end - + % string write the object @@ -202,5 +202,5 @@ end - + % delete the object @@ -230,7 +230,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/kml/kml_geometry.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_geometry.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_geometry.m (revision 13646) @@ -14,5 +14,5 @@ properties end - + methods function [kml]=kml_geometry(varargin) @@ -143,5 +143,5 @@ end - + % string write the object @@ -173,7 +173,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/kml/kml_linearring.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_linearring.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_linearring.m (revision 13646) @@ -22,5 +22,5 @@ coords =zeros(0,3); end - + methods function [kml]=kml_linearring(varargin) @@ -165,5 +165,5 @@ end - + % string write the object @@ -203,7 +203,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/kml/kml_linestring.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_linestring.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_linestring.m (revision 13646) @@ -22,5 +22,5 @@ coords =zeros(0,3); end - + methods function [kml]=kml_linestring(varargin) @@ -165,5 +165,5 @@ end - + % string write the object @@ -203,7 +203,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/kml/kml_linestyle.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_linestyle.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_linestyle.m (revision 13646) @@ -18,5 +18,5 @@ width =1; end - + methods function [kml]=kml_linestyle(varargin) @@ -143,5 +143,5 @@ end - + % string write the object @@ -170,7 +170,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/kml/kml_mesh_elem.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_mesh_elem.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_mesh_elem.m (revision 13646) @@ -100,5 +100,5 @@ cmap=colormap; close(hfig) - + if exist('edata','var') if ~exist('cmin','var') @@ -175,3 +175,2 @@ end - Index: /issm/trunk-jpl/src/m/kml/kml_mesh_write.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_mesh_write.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_mesh_write.m (revision 13646) @@ -193,5 +193,5 @@ cmap=colormap; close(hfig) - + disp(['Writing ' num2str(size(cmap,1)) ' Matlab colors as KML style templates.']); for i=1:size(cmap,1) @@ -259,3 +259,2 @@ end - Index: /issm/trunk-jpl/src/m/kml/kml_multigeometry.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_multigeometry.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_multigeometry.m (revision 13646) @@ -16,5 +16,5 @@ geometry ={}; end - + methods function [kml]=kml_multigeometry(varargin) @@ -156,5 +156,5 @@ end - + % string write the object @@ -197,5 +197,5 @@ end - + % delete the object @@ -225,7 +225,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/kml/kml_object.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_object.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_object.m (revision 13646) @@ -15,5 +15,5 @@ id =''; end - + methods function [kml]=kml_object(varargin) @@ -144,5 +144,5 @@ end - + % string write the object @@ -174,7 +174,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/kml/kml_part_edges.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_part_edges.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_part_edges.m (revision 13646) @@ -101,5 +101,5 @@ cmap=colormap; close(hfig) - + if exist('edata','var') if ~exist('cmin','var') @@ -139,5 +139,5 @@ for k=1:md.qmu.numberofpartitions % disp(['partition k=' int2str(k)]) - + % for each partition, find all the included elements and determine the % perimeter (including those shared by another partition) @@ -154,5 +154,5 @@ [edgeper,elemper,iloop]=edgeperimeter(elemp,nodeconp,edgeadjp); iloop(end+1)=size(edgeper,1)+1; - + % determine the data to be used for the colors (if any) @@ -170,5 +170,5 @@ end end - + % set up the placemark with multigeometry @@ -211,5 +211,5 @@ lat=[]; long=[]; - + % loop over the element edges on the loop of the partition @@ -241,5 +241,5 @@ slast=0; j=j+1; - + % element not entirely within partition, so figure out boundary else @@ -327,5 +327,5 @@ end nlast=0; - + % write out midpoint of first side kline.coords(end+1,:)=[(md.mesh.long(elemp(ielem,slast))... @@ -481,3 +481,2 @@ end - Index: /issm/trunk-jpl/src/m/kml/kml_part_elems.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_part_elems.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_part_elems.m (revision 13646) @@ -101,5 +101,5 @@ cmap=colormap; close(hfig) - + if exist('edata','var') if ~exist('cmin','var') @@ -215,3 +215,2 @@ end - Index: /issm/trunk-jpl/src/m/kml/kml_part_flagedges.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_part_flagedges.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_part_flagedges.m (revision 13646) @@ -108,3 +108,2 @@ end - Index: /issm/trunk-jpl/src/m/kml/kml_partitions.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_partitions.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_partitions.m (revision 13646) @@ -102,5 +102,5 @@ cmap=colormap; close(hfig) - + if exist('edata','var') if ~exist('cmin','var') @@ -140,5 +140,5 @@ for k=1:md.qmu.numberofpartitions % disp(['partition k=' int2str(k)]) - + % for each partition, find all the included elements and determine the % perimeter (including those shared by another partition) @@ -171,5 +171,5 @@ end end - + % set up the placemark with multigeometry @@ -197,5 +197,5 @@ kmgeom=kml_multigeometry(); kmgeom.geometry ={repmat(kml_polygon(),1,length(iloop)-1)}; - + % loop over each loop of the perimeter for the given partition @@ -213,5 +213,5 @@ lat=[]; long=[]; - + % loop over the element edges on the loop of the partition @@ -243,5 +243,5 @@ slast=0; j=j+1; - + % element not entirely within partition, so figure out boundary else @@ -329,5 +329,5 @@ end nlast=0; - + % write out midpoint of first side kring.coords(end+1,:)=[(md.mesh.long(elemp(ielem,slast))... @@ -484,3 +484,2 @@ end - Index: /issm/trunk-jpl/src/m/kml/kml_placemark.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_placemark.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_placemark.m (revision 13646) @@ -23,5 +23,5 @@ geometry =kml_geometry.empty(); end - + methods function [kml]=kml_placemark(varargin) @@ -163,5 +163,5 @@ end - + % string write the object @@ -204,5 +204,5 @@ end - + % delete the object @@ -233,7 +233,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/kml/kml_polygon.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_polygon.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_polygon.m (revision 13646) @@ -24,5 +24,5 @@ inner =kml_linearring.empty(); end - + methods function [kml]=kml_polygon(varargin) @@ -183,5 +183,5 @@ end - + % string write the object @@ -234,5 +234,5 @@ end - + % delete the object @@ -266,7 +266,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/kml/kml_polystyle.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_polystyle.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_polystyle.m (revision 13646) @@ -20,5 +20,5 @@ outline =true; end - + methods function [kml]=kml_polystyle(varargin) @@ -148,5 +148,5 @@ end - + % string write the object @@ -176,7 +176,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/kml/kml_style.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_style.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_style.m (revision 13646) @@ -30,5 +30,5 @@ list =[]; end - + methods function [kml]=kml_style(varargin) @@ -206,5 +206,5 @@ end - + % string write the object @@ -268,5 +268,5 @@ end - + % delete the object @@ -322,7 +322,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/kml/kml_styleselector.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_styleselector.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_styleselector.m (revision 13646) @@ -14,5 +14,5 @@ properties end - + methods function [kml]=kml_styleselector(varargin) @@ -143,5 +143,5 @@ end - + % string write the object @@ -173,7 +173,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/kml/kml_substyle.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_substyle.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_substyle.m (revision 13646) @@ -14,5 +14,5 @@ properties end - + methods function [kml]=kml_substyle(varargin) @@ -143,5 +143,5 @@ end - + % string write the object @@ -173,7 +173,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/kml/kml_unsh_edges.m =================================================================== --- /issm/trunk-jpl/src/m/kml/kml_unsh_edges.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/kml_unsh_edges.m (revision 13646) @@ -114,3 +114,2 @@ end - Index: /issm/trunk-jpl/src/m/kml/string_buf.m =================================================================== --- /issm/trunk-jpl/src/m/kml/string_buf.m (revision 13645) +++ /issm/trunk-jpl/src/m/kml/string_buf.m (revision 13646) @@ -173,5 +173,5 @@ end - + % reset the object @@ -183,7 +183,6 @@ end - + end - + end - Index: /issm/trunk-jpl/src/m/mech/basalstress.m =================================================================== --- /issm/trunk-jpl/src/m/mech/basalstress.m (revision 13645) +++ /issm/trunk-jpl/src/m/mech/basalstress.m (revision 13646) @@ -6,5 +6,4 @@ % % See also: plot_basaldrag - %compute exponents Index: /issm/trunk-jpl/src/m/mesh/FixMesh.m =================================================================== --- /issm/trunk-jpl/src/m/mesh/FixMesh.m (revision 13645) +++ /issm/trunk-jpl/src/m/mesh/FixMesh.m (revision 13646) @@ -32,5 +32,5 @@ %now, the index: pos=find(index2>orphan); index2(pos)=index2(pos)-1; - + %look again for orphans on new mesh flags=zeros(length(x2),1);flags(index2)=1; Index: /issm/trunk-jpl/src/m/mesh/NodeInElement.m =================================================================== --- /issm/trunk-jpl/src/m/mesh/NodeInElement.m (revision 13645) +++ /issm/trunk-jpl/src/m/mesh/NodeInElement.m (revision 13646) @@ -25,5 +25,5 @@ x0=newx(i); y0=newy(i); - + %first area coordinate area_1=(y3y2.*(x0-x3)-x3x2.*(y0-y3))./delta; @@ -32,5 +32,5 @@ %third area coordinate area_3=1-area_1-area_2; - + %get elements for which all area coordinates are positive (meaning (x0,y0) belongs to these elements pos=find((area_1>=0-epsilon) & (area_2>=0-epsilon) & (area_3>=0-epsilon)); Index: /issm/trunk-jpl/src/m/mesh/bamg.m =================================================================== --- /issm/trunk-jpl/src/m/mesh/bamg.m (revision 13645) +++ /issm/trunk-jpl/src/m/mesh/bamg.m (revision 13646) @@ -236,5 +236,5 @@ requiredvertices=double(getfieldvalue(options,'RequiredVertices')); %for some reason, it is of class "single" if(size(requiredvertices,2)==2), requiredvertices=[requiredvertices 4.*ones(size(requiredvertices,1),1)]; end - + %only keep those inside flags=ContourToNodes(requiredvertices(:,1),requiredvertices(:,2),domain(1),0); Index: /issm/trunk-jpl/src/m/mesh/planet/mesh_refine_tri4.m =================================================================== --- /issm/trunk-jpl/src/m/mesh/planet/mesh_refine_tri4.m (revision 13645) +++ /issm/trunk-jpl/src/m/mesh/planet/mesh_refine_tri4.m (revision 13646) @@ -29,5 +29,4 @@ % - % ---this method is not implemented, but the idea here remains... % This can be done until some minimal distance (D) of the mean @@ -36,5 +35,4 @@ % Alternatively, it could be done until some minimum mean % area of faces is achieved. As is, it just refines once. - % $Revision: 1.1 $ $Date: 2004/11/12 01:32:35 $ @@ -80,25 +78,25 @@ for f = 1:Nface, - + % Get the triangle vertex indices NA = FV.faces(f,1); NB = FV.faces(f,2); NC = FV.faces(f,3); - + % Get the triangle vertex coordinates A = FV.vertices(NA,:); B = FV.vertices(NB,:); C = FV.vertices(NC,:); - + % Now find the midpoints between vertices a = (A + B) ./ 2; b = (B + C) ./ 2; c = (C + A) ./ 2; - + % Find the length of each median %A2blen = sqrt ( sum( (A - b).^2, 2 ) ); %B2clen = sqrt ( sum( (B - c).^2, 2 ) ); %C2alen = sqrt ( sum( (C - a).^2, 2 ) ); - + % Store the midpoint vertices, while % checking if midpoint vertex already exists @@ -106,5 +104,5 @@ [FV, Nb] = mesh_find_vertex(FV,b); [FV, Nc] = mesh_find_vertex(FV,c); - + % Create new faces with orig vertices plus midpoints F2(f*4-3,:) = [ NA, Na, Nc ]; @@ -112,5 +110,5 @@ F2(f*4-1,:) = [ Nc, Nb, NC ]; F2(f*4-0,:) = [ Na, Nb, Nc ]; - + end @@ -121,5 +119,4 @@ return - %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Index: /issm/trunk-jpl/src/m/mesh/planet/planetmixedmesh.m =================================================================== --- /issm/trunk-jpl/src/m/mesh/planet/planetmixedmesh.m (revision 13645) +++ /issm/trunk-jpl/src/m/mesh/planet/planetmixedmesh.m (revision 13646) @@ -33,10 +33,10 @@ for j=1:nthetha-1, count=(i-1)*(nthetha-1)+j; - + A=(i-1)*nthetha+j; B=(i-1)*nthetha+j+1; C=(i)*nthetha+j+1; D=(i)*nthetha+j; - + quads(count,:)=[A B C D]; end @@ -64,5 +64,4 @@ quads=[trias;quads]; - % now add south pole: phii=180*conv; @@ -85,5 +84,4 @@ quads=[quads;trias]; - md.mesh.elements=quads; md.mesh.x=x; Index: /issm/trunk-jpl/src/m/mesh/planet/sphere_project.m =================================================================== --- /issm/trunk-jpl/src/m/mesh/planet/sphere_project.m (revision 13645) +++ /issm/trunk-jpl/src/m/mesh/planet/sphere_project.m (revision 13646) @@ -50,5 +50,4 @@ % use of arctan functions, which have branches. - % Convert Cartesian X,Y,Z to spherical (radians) theta = atan2( (Y-yo), (X-xo) ); Index: /issm/trunk-jpl/src/m/mesh/planet/sphere_tri.m =================================================================== --- /issm/trunk-jpl/src/m/mesh/planet/sphere_tri.m (revision 13645) +++ /issm/trunk-jpl/src/m/mesh/planet/sphere_tri.m (revision 13646) @@ -43,6 +43,4 @@ % See also: mesh_refine, sphere_project % - - % $Revision: 1.2 $ $Date: 2005/07/20 23:07:03 $ @@ -80,5 +78,4 @@ end - % ----------------- % define the starting shapes @@ -88,13 +85,13 @@ switch shape, case 'tetra', - + % Vertices of a tetrahedron sqrt_3 = 0.5773502692; - + tetra.v = [ sqrt_3, sqrt_3, sqrt_3 ; % +X, +Y, +Z - PPP -sqrt_3, -sqrt_3, sqrt_3 ; % -X, -Y, +Z - MMP -sqrt_3, sqrt_3, -sqrt_3 ; % -X, +Y, -Z - MPM sqrt_3, -sqrt_3, -sqrt_3 ]; % +X, -Y, -Z - PMM - + % Structure describing a tetrahedron tetra.f = [ 1, 2, 3; @@ -102,10 +99,10 @@ 3, 2, 4; 4, 1, 3 ]; - + FV.vertices = tetra.v; FV.faces = tetra.f; - + case 'oct', - + % Six equidistant points lying on the unit sphere oct.v = [ 1, 0, 0 ; % X @@ -115,5 +112,5 @@ 0, 0, 1 ; % Z 0, 0, -1 ]; % -Z - + % Join vertices to create a unit octahedron oct.f = [ 1 5 3 ; % X Z Y - First the top half @@ -125,14 +122,14 @@ 2 4 6 ; % -X Z -Z 4 1 6 ]; % -Y Z -Z - + FV.vertices = oct.v; FV.faces = oct.f; - + case 'ico', - + % Twelve vertices of icosahedron on unit sphere tau = 0.8506508084; % t=(1+sqrt(5))/2, tau=t/sqrt(1+t^2) one = 0.5257311121; % one=1/sqrt(1+t^2) , unit sphere - + ico.v( 1,:) = [ tau, one, 0 ]; % ZA ico.v( 2,:) = [ -tau, one, 0 ]; % ZB @@ -147,5 +144,5 @@ ico.v(11,:) = [ 0 , -tau, -one ]; % XC ico.v(12,:) = [ 0 , tau, -one ]; % XD - + % Structure for unit icosahedron ico.f = [ 5, 8, 9 ; @@ -169,25 +166,24 @@ 8, 10, 3 ; 7, 3, 11 ]; - + FV.vertices = ico.v; FV.faces = ico.f; end - % ----------------- % refine the starting shapes with subdivisions if maxlevel, - + % Subdivide each starting triangle (maxlevel) times for level = 1:maxlevel, - + % Subdivide each triangle and normalize the new points thus % generated to lie on the surface of a sphere radius r. FV = mesh_refine_tri4(FV); FV.vertices = sphere_project(FV.vertices,r); - + % An alternative might be to define a min distance % between vertices and recurse or use fminsearch - + end end Index: /issm/trunk-jpl/src/m/mesh/rifts/meshaddrifts.m =================================================================== --- /issm/trunk-jpl/src/m/mesh/rifts/meshaddrifts.m (revision 13645) +++ /issm/trunk-jpl/src/m/mesh/rifts/meshaddrifts.m (revision 13646) @@ -12,5 +12,4 @@ % be preserved. There can be as many pairs of closed contour and rift contour as wished. - %read rift: domains=expread(riftname,1); @@ -20,18 +19,18 @@ %now loop over rifts: for rift_i=1:length(rifts), - + %refine rift to desired resolution: contour=contours(rift_i); rift=rifts(rift_i); - + delete('Meshaddrifts.Rift.exp'); expwrite(rift,'Meshaddrifts.Rift.Coarse.exp'); expcoarsen('Meshaddrifts.Rift.exp','Meshaddrifts.Rift.Coarse.exp',rift.density); delete('Meshaddrifts.Rift.Coarse.exp'); - + %extract model: expwrite(contour,'Meshaddrifts.Contour.exp'); md2=modelextract(md,'Meshaddrifts.Contour.exp'); - + %create domain of md2 model: md2.mesh.segments=contourenvelope(md2,'Meshaddrifts.Contour.exp'); @@ -41,5 +40,5 @@ domain_index(end+1)=md2.mesh.segments(pos,2); end - + domain.x=md2.mesh.x(domain_index); domain.y=md2.mesh.y(domain_index); @@ -47,12 +46,12 @@ domain.density=1; expwrite(domain,'Meshaddrifts.Domain.exp'); - + %unloop domain index: used for later. domain_index=domain_index(1:end-1); - + %remesh md2 using new domain outline, and rift profile: md2=meshnodensity(md2,'Meshaddrifts.Domain.exp','Meshaddrifts.Rift.exp'); md2=meshprocessrifts(md2); - + %plug md2 mesh into md mesh: [md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.z,md.mesh.numberofelements,md.mesh.numberofvertices,elconv,nodeconv,elconv2,nodeconv2]=meshplug(md.mesh.elements,md.mesh.x,md.mesh.y,md.mesh.z,... @@ -61,9 +60,9 @@ %update md2 rifts using elconv and nodeconv, and plug them into md: md2.rifts=updateriftindexing(md2.rifts,elconv2,nodeconv2); - + for i=1:md.rifts.numrifts, md.rifts.riftstruct(i)=updateriftindexing(md.rifts.riftstruct(i),elconv,nodeconv); end - + if md.rifts.numrifts==0, md.rifts.riftstruct=md2.rifts; @@ -73,5 +72,5 @@ md.rifts.numrifts=md.rifts.numrifts+1; end - + md.mesh.segments(:,1:2)=nodeconv(md.mesh.segments(:,1:2)); md.mesh.segments(:,3)=elconv(md.mesh.segments(:,3)); Index: /issm/trunk-jpl/src/m/mesh/rifts/meshplug.m =================================================================== --- /issm/trunk-jpl/src/m/mesh/rifts/meshplug.m (revision 13645) +++ /issm/trunk-jpl/src/m/mesh/rifts/meshplug.m (revision 13646) @@ -2,5 +2,4 @@ %MESHPLUG - embed mesh into another one % See also meshaddrifts - %initialize elconv,nodeconv conversion tables from md mesh to new md mesh @@ -48,8 +47,6 @@ end - %plug elements elements=[elements;elements2]; - %now, increase number of nodes @@ -87,3 +84,2 @@ nodeconv(temp_nodeconv)=temp_nodeconvnum; nodeconv(extractednodes_minusborder)=NaN; - Index: /issm/trunk-jpl/src/m/mesh/rifts/meshprocessoutsiderifts.m =================================================================== --- /issm/trunk-jpl/src/m/mesh/rifts/meshprocessoutsiderifts.m (revision 13645) +++ /issm/trunk-jpl/src/m/mesh/rifts/meshprocessoutsiderifts.m (revision 13646) @@ -6,9 +6,7 @@ % - - %go through rifts, and figure out which ones touch the domain outline for i=1:md.rifts.numrifts, - + %first, flag nodes that belong to the domain outline flags=ContourToMesh(md.mesh.elements,md.mesh.x,md.mesh.y,domainoutline,'node',0); @@ -20,5 +18,5 @@ %we have found outsidetips, tips that touch the domain outline. go through them for j=1:length(outsidetips), - + tip=outsidetips(j); %find tip in the segments, take first segment (there should be 2) that holds tip, @@ -52,5 +50,5 @@ B=md.mesh.elements(nextelement,find(~ismember(md.mesh.elements(nextelement,:),[A B]))); end - + %take the list of elements on one side of the rift that connect to the tip, %and duplicate the tip on them, so as to open the rift to the outside. @@ -59,5 +57,5 @@ md.mesh.y=[md.mesh.y;md.mesh.y(tip)]; md.mesh.numberofvertices=num; - + %replace tip in elements newelements=md.mesh.elements(elements,:); @@ -80,5 +78,4 @@ end end - %Fill in rest of fields: Index: /issm/trunk-jpl/src/m/mesh/rifts/rifttipsonmesh.m =================================================================== --- /issm/trunk-jpl/src/m/mesh/rifts/rifttipsonmesh.m (revision 13645) +++ /issm/trunk-jpl/src/m/mesh/rifts/rifttipsonmesh.m (revision 13646) @@ -13,5 +13,5 @@ x_tip=rift.x(1); y_tip=rift.y(1); - + index=find_point(md.mesh.x,md.mesh.y,x_tip,y_tip); tips(end+1)=index; @@ -19,8 +19,7 @@ x_tip=rift.x(end); y_tip=rift.y(end); - + index=find_point(md.mesh.x,md.mesh.y,x_tip,y_tip); tips(end+1)=index; end - Index: /issm/trunk-jpl/src/m/miscellaneous/isnans.m =================================================================== --- /issm/trunk-jpl/src/m/miscellaneous/isnans.m (revision 13645) +++ /issm/trunk-jpl/src/m/miscellaneous/isnans.m (revision 13646) @@ -5,5 +5,4 @@ % % See also : ISNAN - if isstruct(array), Index: /issm/trunk-jpl/src/m/miscellaneous/parallelrange.m =================================================================== --- /issm/trunk-jpl/src/m/miscellaneous/parallelrange.m (revision 13645) +++ /issm/trunk-jpl/src/m/miscellaneous/parallelrange.m (revision 13646) @@ -12,5 +12,4 @@ end - %There may be some rows left. Distribute evenly. row_rest=globalsize - numprocs*floor(globalsize/numprocs); Index: /issm/trunk-jpl/src/m/os/ismpi.m =================================================================== --- /issm/trunk-jpl/src/m/os/ismpi.m (revision 13645) +++ /issm/trunk-jpl/src/m/os/ismpi.m (revision 13646) @@ -4,5 +4,4 @@ % Usage: % flag=ismpi(); - configfile=[issmdir() '/bin/config.h']; %should find it in the install target Index: /issm/trunk-jpl/src/m/os/ismumps.m =================================================================== --- /issm/trunk-jpl/src/m/os/ismumps.m (revision 13645) +++ /issm/trunk-jpl/src/m/os/ismumps.m (revision 13646) @@ -4,5 +4,4 @@ % Usage: % flag=ismumps(); - configfile=[issmdir() '/bin/config.h']; %should find it in the install target Index: /issm/trunk-jpl/src/m/os/ispetsc.m =================================================================== --- /issm/trunk-jpl/src/m/os/ispetsc.m (revision 13645) +++ /issm/trunk-jpl/src/m/os/ispetsc.m (revision 13646) @@ -4,5 +4,4 @@ % Usage: % flag=ispetsc(); - configfile=[issmdir() '/bin/config.h']; %should find it in the install target Index: /issm/trunk-jpl/src/m/os/issmbbftpin.m =================================================================== --- /issm/trunk-jpl/src/m/os/issmbbftpin.m (revision 13645) +++ /issm/trunk-jpl/src/m/os/issmbbftpin.m (revision 13646) @@ -35,5 +35,5 @@ end command=[command ''' pfe1.nas.nasa.gov']; - + eval(command); @@ -45,4 +45,3 @@ end - end Index: /issm/trunk-jpl/src/m/os/issmbbftpout.m =================================================================== --- /issm/trunk-jpl/src/m/os/issmbbftpout.m (revision 13645) +++ /issm/trunk-jpl/src/m/os/issmbbftpout.m (revision 13646) @@ -19,5 +19,5 @@ end else - + %build a string of the type: bbftp -s -u elarour -e 'setnbstream 8; cd /nobackupp10/elarour/Testing/Interactive3/; put Antarctica.tar.gz' pfe1.nas.nasa.gov command=['!bbftp -s -V -u ' login ' -e ''setnbstream 8; cd ' path '; '] @@ -26,5 +26,5 @@ end command=[command ''' pfe1.nas.nasa.gov']; - + eval(command); end Index: /issm/trunk-jpl/src/m/os/issmscpin.m =================================================================== --- /issm/trunk-jpl/src/m/os/issmscpin.m (revision 13645) +++ /issm/trunk-jpl/src/m/os/issmscpin.m (revision 13646) @@ -31,5 +31,5 @@ if ispc(), %use the putty project pscp.exe: it should be in the path. - + %get ISSM_DIR variable [status,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]'); @@ -62,5 +62,4 @@ end - if port, eval(['!scp -P ' num2str(port) ' ' login '@localhost:' path '/' string ' ./']); @@ -68,5 +67,5 @@ eval(['!scp ' login '@' host ':' path '/' string ' ./']); end - + %check scp worked for i=1:numel(packages), Index: /issm/trunk-jpl/src/m/os/issmscpout.m =================================================================== --- /issm/trunk-jpl/src/m/os/issmscpout.m (revision 13645) +++ /issm/trunk-jpl/src/m/os/issmscpout.m (revision 13646) @@ -22,5 +22,5 @@ if ispc(), %use the putty project pscp.exe: it should be in the path. - + %get ISSM_DIR variable [status,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]'); @@ -48,5 +48,5 @@ end string=[string ' ']; - + if port, eval(['!scp -P ' num2str(port) ' ' string ' ' login '@localhost:' path]); Index: /issm/trunk-jpl/src/m/os/issmssh.m =================================================================== --- /issm/trunk-jpl/src/m/os/issmssh.m (revision 13645) +++ /issm/trunk-jpl/src/m/os/issmssh.m (revision 13646) @@ -14,5 +14,5 @@ if ispc(), %use the putty project plink.exe: it should be in the path. - + %get ISSM_DIR variable [status,ISSM_DIR]=system('echo [%ISSM_DIR_WIN%]'); Index: /issm/trunk-jpl/src/m/os/issmstssh.m =================================================================== --- /issm/trunk-jpl/src/m/os/issmstssh.m (revision 13645) +++ /issm/trunk-jpl/src/m/os/issmstssh.m (revision 13646) @@ -5,5 +5,4 @@ % issmstssh(host,command) - %just use starcluster command to pipe an ssh command through system([starcluster() ' sshmaster ' host ' --user ' login ' ''' command '''']); Index: /issm/trunk-jpl/src/m/parameterization/contourenvelope.m =================================================================== --- /issm/trunk-jpl/src/m/parameterization/contourenvelope.m (revision 13645) +++ /issm/trunk-jpl/src/m/parameterization/contourenvelope.m (revision 13646) @@ -72,5 +72,5 @@ nodein=zeros(mesh.numberofvertices,1); elemin=zeros(mesh.numberofelements,1); - + pos=find(flags); elemin(pos)=1; Index: /issm/trunk-jpl/src/m/parameterization/parameterize.m =================================================================== --- /issm/trunk-jpl/src/m/parameterization/parameterize.m (revision 13645) +++ /issm/trunk-jpl/src/m/parameterization/parameterize.m (revision 13646) @@ -56,3 +56,2 @@ end md.miscellaneous.notes=['Model created by using parameter file: ' parametername ' on: ' datestr(now)]; - Index: /issm/trunk-jpl/src/m/partition/AreaAverageOntoPartition.m =================================================================== --- /issm/trunk-jpl/src/m/partition/AreaAverageOntoPartition.m (revision 13645) +++ /issm/trunk-jpl/src/m/partition/AreaAverageOntoPartition.m (revision 13646) @@ -15,5 +15,5 @@ %save 3D model md3d=md; - + md.mesh.elements=md.mesh.elements2d; md.mesh.x=md.mesh.x2d; Index: /issm/trunk-jpl/src/m/partition/partitioner.m =================================================================== --- /issm/trunk-jpl/src/m/partition/partitioner.m (revision 13645) +++ /issm/trunk-jpl/src/m/partition/partitioner.m (revision 13646) @@ -50,5 +50,4 @@ end - if strcmpi(package,'chaco'), @@ -57,5 +56,5 @@ method(1)=3; % global method (3=inertial (geometric)) method(3)=0; % vertex weights (0=off, 1=on) - + %specify bisection method(6)=getfieldvalue(options,'section');% ndims (1=bisection, 2=quadrisection, 3=octasection) @@ -68,5 +67,5 @@ weights=[]; end - + % partition into nparts part=Chaco(md.qmu.adjacency,weights,[],md.mesh.x, md.mesh.y ,md.mesh.z,method,npart,[])'+1; %index partitions from 1 up. like metis. @@ -79,7 +78,6 @@ end maptab=Scotch(md.qmu.adjacency,[],weights,[],'cmplt',[npart]); - + part=maptab(:,2);%index partitions from 1 up. like metis. - elseif strcmpi(package,'linear'), Index: /issm/trunk-jpl/src/m/plot/applyoptions.m =================================================================== --- /issm/trunk-jpl/src/m/plot/applyoptions.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/applyoptions.m (revision 13646) @@ -6,5 +6,4 @@ % % See also: PLOTMODEL, PARSE_OPTIONS - %some defaults @@ -226,7 +225,6 @@ else %do nothing - -end - + +end %area @@ -320,8 +318,7 @@ end - %position of figure if exist(options,'figposition'), - + figposition=getfieldvalue(options,'figposition'); if ischar(figposition), Index: /issm/trunk-jpl/src/m/plot/arrow.m =================================================================== --- /issm/trunk-jpl/src/m/plot/arrow.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/arrow.m (revision 13646) @@ -8,5 +8,4 @@ % 'ratio': default .5 (ratio headarrow/length) % 'widthratio': default is 1/10 of length - %recover options Index: /issm/trunk-jpl/src/m/plot/checkplotoptions.m =================================================================== --- /issm/trunk-jpl/src/m/plot/checkplotoptions.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/checkplotoptions.m (revision 13646) @@ -53,5 +53,5 @@ end end - + %text if exist(options,'text'), Index: /issm/trunk-jpl/src/m/plot/latlonoverlay.m =================================================================== --- /issm/trunk-jpl/src/m/plot/latlonoverlay.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/latlonoverlay.m (revision 13646) @@ -117,5 +117,4 @@ end - pos=find(x<=xlimits(2) & x>=xlimits(1) & y<=ylimits(2) & y>=ylimits(1)); if length(pos)<=1, continue; end Index: /issm/trunk-jpl/src/m/plot/plot_manager.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plot_manager.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/plot_manager.m (revision 13646) @@ -33,13 +33,13 @@ plot_highlightelements(md,options,subplotwidth,i); return; - + case 'qmumean', plot_qmumean(md,options,nlines,ncols,i); return; - + case 'qmustddev', plot_qmustddev(md,options,nlines,ncols,i); return; - + case 'qmuhistnorm', plot_qmuhistnorm(md,options,nlines,ncols,i); @@ -118,5 +118,5 @@ plot_segments(md,options,subplotwidth,i,data) return - + case 'quiver' data=[md.initialization.vx md.initialization.vy]; %Go ahead and try plot_unit @@ -199,5 +199,5 @@ error('cannot kmlgroundoverlay on multi-plots'); end - + %call routine to build kml file and image that goes with it. kmlgroundoverlay(md,options); Index: /issm/trunk-jpl/src/m/plot/plot_overlay.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plot_overlay.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/plot_overlay.m (revision 13646) @@ -25,5 +25,4 @@ error('buildoverlay error message: overlay not supported for quiver plots'); end - %radar power Index: /issm/trunk-jpl/src/m/plot/plot_qmu_mass_flux_segments.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plot_qmu_mass_flux_segments.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/plot_qmu_mass_flux_segments.m (revision 13646) @@ -27,5 +27,5 @@ %plot normals - + for j=1:length(segments), xstart=mean([segments(j,1) segments(j,3)]); Index: /issm/trunk-jpl/src/m/plot/plot_qmuhistnorm.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plot_qmuhistnorm.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/plot_qmuhistnorm.m (revision 13646) @@ -4,5 +4,4 @@ subplot(nlines,ncols,index); hold on - %recover histnorm data Index: /issm/trunk-jpl/src/m/plot/plot_qmustddev.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plot_qmustddev.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/plot_qmustddev.m (revision 13646) @@ -47,5 +47,4 @@ end - %now, project onto vertices responses_on_node=responses(md.qmu.partition+1); Index: /issm/trunk-jpl/src/m/plot/plot_riftnumbering.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plot_riftnumbering.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/plot_riftnumbering.m (revision 13646) @@ -88,5 +88,4 @@ end - %apply options options=addfielddefault(options,'title','Rift/Fault location'); Index: /issm/trunk-jpl/src/m/plot/plot_riftrelvel.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plot_riftrelvel.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/plot_riftrelvel.m (revision 13646) @@ -63,5 +63,5 @@ end for i=1:size(md.rifts.riftstruct,1), - + %get nodes on rift penaltypairs=md.rifts.riftstruct(i).penaltypairs; Index: /issm/trunk-jpl/src/m/plot/plot_rifts.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plot_rifts.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/plot_rifts.m (revision 13646) @@ -16,5 +16,5 @@ offset=getfieldvalue(options,'offset',500); if isstruct(md.rifts.riftstruct), - + for i=1:size(md.rifts.riftstruct,1), penaltypairs=md.rifts.riftstruct(i).penaltypairs; Index: /issm/trunk-jpl/src/m/plot/plot_riftvel.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plot_riftvel.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/plot_riftvel.m (revision 13646) @@ -89,5 +89,4 @@ end - %legend if isp1 & isp2 Index: /issm/trunk-jpl/src/m/plot/plot_sarpwr.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plot_sarpwr.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/plot_sarpwr.m (revision 13646) @@ -17,5 +17,5 @@ md.mesh.z=md.mesh.z*unit; end - + imagesc(md.radaroverlay.x,md.radaroverlay.y,double(md.radaroverlay.pwr)),set(gca,'YDir','normal');colormap(gray); Index: /issm/trunk-jpl/src/m/plot/plot_section.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plot_section.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/plot_section.m (revision 13646) @@ -115,5 +115,4 @@ hold on - %3D else Index: /issm/trunk-jpl/src/m/plot/plot_segments.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plot_segments.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/plot_segments.m (revision 13646) @@ -42,5 +42,4 @@ h3=plot(xstart,ystart,'r*'); - else error('plot_segments: 3d plot of segments not supported yet!'); Index: /issm/trunk-jpl/src/m/plot/plot_thermaltransient_results.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plot_thermaltransient_results.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/plot_thermaltransient_results.m (revision 13646) @@ -22,3 +22,2 @@ eval(string); clear string; - Index: /issm/trunk-jpl/src/m/plot/plotmodel.m =================================================================== --- /issm/trunk-jpl/src/m/plot/plotmodel.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/plotmodel.m (revision 13646) @@ -32,5 +32,5 @@ %go through subplots if numberofplots, - + %Create figure if strcmpi(getfieldvalue(options.list{1},'visible','on'),'off'), Index: /issm/trunk-jpl/src/m/plot/processdata.m =================================================================== --- /issm/trunk-jpl/src/m/plot/processdata.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/processdata.m (revision 13646) @@ -74,5 +74,5 @@ error('plotmodel error message: data not supported yet'); end - + %quiver? if datasize(2)>1, Index: /issm/trunk-jpl/src/m/plot/processmesh.m =================================================================== --- /issm/trunk-jpl/src/m/plot/processmesh.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/processmesh.m (revision 13646) @@ -36,5 +36,4 @@ z=md.mesh.z; end - if isprop(md.mesh,'elements2d'), elements2d=md.mesh.elements2d; end Index: /issm/trunk-jpl/src/m/plot/quiver_colorbar.m =================================================================== --- /issm/trunk-jpl/src/m/plot/quiver_colorbar.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/quiver_colorbar.m (revision 13646) @@ -31,5 +31,5 @@ fontsize=getfieldvalue(options,'fontsize',14); set(hcb,'FontSize',fontsize); - + if exist(options,'colorbartitle'), backup=gca; Index: /issm/trunk-jpl/src/m/plot/radarpower.m =================================================================== --- /issm/trunk-jpl/src/m/plot/radarpower.m (revision 13645) +++ /issm/trunk-jpl/src/m/plot/radarpower.m (revision 13646) @@ -90,5 +90,4 @@ system('rm -rf ./temp.tif'); - elseif strcmpi(md.mesh.hemisphere,'s'), if highres, Index: /issm/trunk-jpl/src/m/print/printmodel.m =================================================================== --- /issm/trunk-jpl/src/m/print/printmodel.m (revision 13645) +++ /issm/trunk-jpl/src/m/print/printmodel.m (revision 13646) @@ -23,5 +23,4 @@ % printmodel('image','tiff') % printmodel('image','eps','margin','on','frame','on','hardcopy','on') - %get options: @@ -54,5 +53,4 @@ %InvertHardcopy off imposes MATLAB to use the same colors set(fig, 'InvertHardcopy', getfieldvalue(options,'hardcopy')); - %we could have several formats, as a cell array of strings. Index: /issm/trunk-jpl/src/m/qmu/MassFluxProcessProfile.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/MassFluxProcessProfile.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/MassFluxProcessProfile.m (revision 13646) @@ -7,5 +7,4 @@ % See also: PROCESS_QMU_RESPONSE_DATA, PREQMU - %first read the profile points. profile=expread([directory '/' profilename]); Index: /issm/trunk-jpl/src/m/qmu/dakota_cdfs.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/dakota_cdfs.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/dakota_cdfs.m (revision 13646) @@ -136,7 +136,7 @@ end end - + varargout{1}=dresp; - + elseif exist('samp','var') && ~isempty(samp) cdf=zeros(length(resp)+length(prob)+length(rel)+length(grel),... @@ -147,7 +147,7 @@ resp,prob,rel,grel); end - + varargout{1}=cdf; - + elseif exist('mean','var' ) && ~isempty(mean ) && ... exist('stddev','var') && ~isempty(stddev) @@ -159,5 +159,5 @@ resp,prob,rel,grel); end - + varargout{1}=cdf; else @@ -178,5 +178,5 @@ mu =mean(samp); sigma=std(samp); - + cdf=zeros(length(resp)+length(prob)+length(rel)+length(grel),4); cdf(:,:)=NaN; Index: /issm/trunk-jpl/src/m/qmu/dakota_in_data.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/dakota_in_data.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/dakota_in_data.m (revision 13646) @@ -88,5 +88,4 @@ % dmeth=dmeth_params_merge(dmeth,dparams) - %% variables @@ -99,5 +98,5 @@ end - + %% responses Index: /issm/trunk-jpl/src/m/qmu/dakota_in_params.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/dakota_in_params.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/dakota_in_params.m (revision 13646) @@ -209,3 +209,2 @@ end - Index: /issm/trunk-jpl/src/m/qmu/dakota_in_parse.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/dakota_in_parse.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/dakota_in_parse.m (revision 13646) @@ -42,5 +42,5 @@ % function [method,dvar,dresp]=dakota_in_parse(filei) - + if ~nargin help dakota_in_parse @@ -631,5 +631,5 @@ itoken=itoken+1; - + % read next line if necessary @@ -644,5 +644,5 @@ itoken=1; end - + end @@ -668,5 +668,5 @@ itoken=1; end - + % check for equal sign and skip Index: /issm/trunk-jpl/src/m/qmu/dakota_moments.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/dakota_moments.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/dakota_moments.m (revision 13646) @@ -89,7 +89,7 @@ moments_calc(dresp(i).sample,alpha); end - + varargout{1}=dresp; - + elseif exist('samp','var') && ~isempty(samp) mean =zeros(1,size(samp,2)); @@ -106,5 +106,5 @@ moments_calc(samp(:,i),alpha); end - + varargout{1}=mean; varargout{2}=stddev; Index: /issm/trunk-jpl/src/m/qmu/dakota_out_parse.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/dakota_out_parse.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/dakota_out_parse.m (revision 13646) @@ -170,5 +170,5 @@ end display(sprintf('Number of columns (Dakota V+R)=%d.',ntokens-1)); - + % process rows of matrix @@ -301,5 +301,5 @@ end [ntokens,tokens]=fltokens(fline); - + % add new response function and moments @@ -336,5 +336,5 @@ end [ntokens,tokens]=fltokens(fline); - + % find response function associated with confidence intervals @@ -464,9 +464,9 @@ cmat.row =cell(1,1); cmat.matrix=zeros(1,ntokens); - + for i=1:ntokens cmat.column(1,i)=cellstr(tokens{1}{i}); end - + % process rows of matrix, reading until blank line @@ -583,5 +583,5 @@ display(sprintf(' %s',dresp(idresp).descriptor)); end - + % skip column headings of cdf Index: /issm/trunk-jpl/src/m/qmu/examples/direct.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/examples/direct.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/examples/direct.m (revision 13646) @@ -4,6 +4,4 @@ md.qmu.params.evaluation_concurrency=1; - - %or for matlab direct driver md.qmu.params.direct=true; Index: /issm/trunk-jpl/src/m/qmu/examples/lrel_mmf.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/examples/lrel_mmf.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/examples/lrel_mmf.m (revision 13646) @@ -93,3 +93,2 @@ %part_hist(md.qmu.partition,md.vertex_weight) %plotmodel(md,'data',log10(md.results.dakota.dresp_out(9).impfac(md.qmu.partition+1))) - Index: /issm/trunk-jpl/src/m/qmu/expandvariables.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/expandvariables.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/expandvariables.m (revision 13646) @@ -4,5 +4,5 @@ for i=1:length(fnames) - + % for linear constraints, just copy Index: /issm/trunk-jpl/src/m/qmu/importancefactors.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/importancefactors.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/importancefactors.m (revision 13646) @@ -8,5 +8,4 @@ % Example: factors=importancefactors(md,'drag','max_vel'); % - variablenamelength=length(variablename); Index: /issm/trunk-jpl/src/m/qmu/lclist_write.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/lclist_write.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/lclist_write.m (revision 13646) @@ -60,3 +60,2 @@ end - Index: /issm/trunk-jpl/src/m/qmu/plot/plot_boxplot.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/plot/plot_boxplot.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/plot/plot_boxplot.m (revision 13646) @@ -62,5 +62,5 @@ dresp=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -68,5 +68,5 @@ iarg=iarg+1; end - + descr=cell (1,length(dresp)); lsamp=zeros(1,length(dresp)); @@ -84,5 +84,5 @@ sampr=varargin{iarg}; iarg=iarg+1; - + if iarg <= nargin && iscell(varargin{iarg}) descr=varargin{iarg}; @@ -119,5 +119,5 @@ iarg=iarg+2; end - + %% draw the plot Index: /issm/trunk-jpl/src/m/qmu/plot/plot_cdf.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/plot/plot_cdf.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/plot/plot_cdf.m (revision 13646) @@ -77,5 +77,5 @@ dresp=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -188,5 +188,5 @@ set(hl1(i),'Color',cmap(imap,:)) end - + xlim('auto') [xlims]=xlim; @@ -278,5 +278,5 @@ end end - + if strcmpi(pdfplt,'line') xplot=xpdf; Index: /issm/trunk-jpl/src/m/qmu/plot/plot_hist_norm.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/plot/plot_hist_norm.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/plot/plot_hist_norm.m (revision 13646) @@ -89,5 +89,5 @@ dresp1=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -95,5 +95,5 @@ iarg=iarg+1; end - + descr=cell (1,length(dresp1)); lsamp=zeros(1,length(dresp1)); @@ -111,5 +111,5 @@ sampr=varargin{iarg}; iarg=iarg+1; - + lsamp(1:size(sampr,2))=size(sampr,1); @@ -142,5 +142,5 @@ iarg=iarg+1; end - + mu =zeros(1,length(dresp2)); sigma=zeros(1,length(dresp2)); @@ -298,5 +298,5 @@ end end - + xlim('auto') [xlims]=xlim; Index: /issm/trunk-jpl/src/m/qmu/plot/plot_hist_norm_ci.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/plot/plot_hist_norm_ci.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/plot/plot_hist_norm_ci.m (revision 13646) @@ -78,5 +78,5 @@ dresp=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -84,5 +84,5 @@ iarg=iarg+1; end - + descr=cell (1,length(dresp)); lsamp=zeros(1,length(dresp)); @@ -92,5 +92,5 @@ sampr=zeros(max(lsamp),length(dresp)); sampr(:,:)=NaN; - + mu =zeros(1,length(dresp)); sigma =zeros(1,length(dresp)); @@ -109,5 +109,5 @@ sampr=varargin{iarg}; iarg=iarg+1; - + lsamp(1:size(sampr,2))=size(sampr,1); @@ -121,5 +121,5 @@ descr=cell(1,size(sampr,2)); end - + mu =zeros(1,size(sampr,2)); sigma =zeros(1,size(sampr,2)); @@ -325,5 +325,5 @@ end end - + xlim('auto') [xlims]=xlim; Index: /issm/trunk-jpl/src/m/qmu/plot/plot_if_bars.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/plot/plot_if_bars.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/plot/plot_if_bars.m (revision 13646) @@ -66,5 +66,5 @@ dresp=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -72,5 +72,5 @@ iarg=iarg+1; end - + descr=cell (1,length(dresp)); lifr =zeros(1,length(dresp)); @@ -125,5 +125,5 @@ end clear ifmean - + dvar=dvar(index); ifr =ifr (:,index); @@ -136,9 +136,9 @@ dvar(nif+1,1)=cellstr(sprintf('others < %f',ifmin)); ifr (:,nif+1)=0.; - + nif2=0; dvar2=cell (size(dvar)); ifr2 =zeros(size(ifr )); - + % sum filtered rows and copy unfiltered rows @@ -152,10 +152,10 @@ end end - + % copy sums dvar2(nif2+1) =dvar(nif+1); ifr2 (:,nif2+1)=ifr (:,nif+1); - + % copy back and truncate filtered rows Index: /issm/trunk-jpl/src/m/qmu/plot/plot_if_spec.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/plot/plot_if_spec.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/plot/plot_if_spec.m (revision 13646) @@ -72,5 +72,5 @@ dresp=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -78,5 +78,5 @@ iarg=iarg+1; end - + descr=cell (1,length(dresp)); lifr =zeros(1,length(dresp)); @@ -137,5 +137,5 @@ end clear ifmean - + dvar=dvar(index); ifr =ifr (:,index); @@ -148,9 +148,9 @@ dvar(nif+1,1)=cellstr(sprintf('others < %f',ifmin)); ifr (:,nif+1)=0.; - + nif2=0; dvar2=cell (size(dvar)); ifr2 =zeros(size(ifr )); - + % sum filtered rows and copy unfiltered rows @@ -164,10 +164,10 @@ end end - + % copy sums dvar2(nif2+1) =dvar(nif+1); ifr2 (:,nif2+1)=ifr (:,nif+1); - + % copy back and truncate filtered rows Index: /issm/trunk-jpl/src/m/qmu/plot/plot_normdist_bars.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/plot/plot_normdist_bars.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/plot/plot_normdist_bars.m (revision 13646) @@ -73,5 +73,5 @@ dresp=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -82,5 +82,5 @@ sampr=varargin{iarg}; iarg=iarg+1; - + if iarg <= nargin && iscell(varargin{iarg}) descr=varargin{iarg}; @@ -92,5 +92,5 @@ descr=cell(1:size(sampr,2)); end - + dresp=struct([]); for i=1:size(sampr,2) Index: /issm/trunk-jpl/src/m/qmu/plot/plot_normplot.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/plot/plot_normplot.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/plot/plot_normplot.m (revision 13646) @@ -62,5 +62,5 @@ dresp=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -68,5 +68,5 @@ iarg=iarg+1; end - + descr=cell (1,length(dresp)); lsamp=zeros(1,length(dresp)); @@ -84,5 +84,5 @@ sampr=varargin{iarg}; iarg=iarg+1; - + if iarg <= nargin && iscell(varargin{iarg}) descr=varargin{iarg}; @@ -119,5 +119,5 @@ iarg=iarg+2; end - + %% draw the plot Index: /issm/trunk-jpl/src/m/qmu/plot/plot_prob_bars.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/plot/plot_prob_bars.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/plot/plot_prob_bars.m (revision 13646) @@ -57,5 +57,4 @@ %% assemble the data into a matrix and calculate the increments - %% process input data and assemble into matrices and increments @@ -66,5 +65,5 @@ dresp=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -72,5 +71,5 @@ iarg=iarg+1; end - + descr=cell (1,length(dresp)); lcdfr=zeros(1,length(dresp)); Index: /issm/trunk-jpl/src/m/qmu/plot/plot_rlev_bars.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/plot/plot_rlev_bars.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/plot/plot_rlev_bars.m (revision 13646) @@ -62,5 +62,5 @@ dresp=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -68,5 +68,5 @@ iarg=iarg+1; end - + descr=cell (1,length(dresp)); lcdfr=zeros(1,length(dresp)); Index: /issm/trunk-jpl/src/m/qmu/plot/plot_rlev_bars_ci.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/plot/plot_rlev_bars_ci.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/plot/plot_rlev_bars_ci.m (revision 13646) @@ -74,5 +74,5 @@ dresp=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -83,5 +83,5 @@ sampr=varargin{iarg}; iarg=iarg+1; - + if iarg <= nargin && iscell(varargin{iarg}) descr=varargin{iarg}; @@ -93,5 +93,5 @@ descr=cell(1:size(sampr,2)); end - + dresp=struct([]); for i=1:size(sampr,2) @@ -136,5 +136,5 @@ display('Using calculated normal fits from sample data.') end - + if ~isfield(dresp(i),'cdf') || isempty(dresp(i).cdf) % use minus/plus integer standard deviations Index: /issm/trunk-jpl/src/m/qmu/plot/plot_rvsv_line.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/plot/plot_rvsv_line.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/plot/plot_rvsv_line.m (revision 13646) @@ -74,5 +74,5 @@ dvar=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -80,5 +80,5 @@ iarg=iarg+1; end - + descv=cell (1,length(dvar)); lsamp=zeros(1,length(dvar)); @@ -96,5 +96,5 @@ sampv=varargin{iarg}; iarg=iarg+1; - + if iarg <= nargin && iscell(varargin{iarg}) descv=varargin{iarg}; @@ -119,5 +119,5 @@ dresp=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -125,5 +125,5 @@ iarg=iarg+1; end - + descr=cell (1,length(dresp)); lsamp=zeros(1,length(dresp)); @@ -141,5 +141,5 @@ sampr=varargin{iarg}; iarg=iarg+1; - + if iarg <= nargin && iscell(varargin{iarg}) descr=varargin{iarg}; @@ -177,5 +177,5 @@ iarg=iarg+2; end - + if ~exist('nplotr','var') && ~exist('nplotc','var') nplotr=1; @@ -225,5 +225,5 @@ 'IconDisplayStyle','off'); % Exclude line from legend end - + % add the annotation Index: /issm/trunk-jpl/src/m/qmu/plot/plot_rvsv_scat3.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/plot/plot_rvsv_scat3.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/plot/plot_rvsv_scat3.m (revision 13646) @@ -79,5 +79,5 @@ dvar=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -85,5 +85,5 @@ iarg=iarg+1; end - + descv=cell (1,length(dvar)); lsamp=zeros(1,length(dvar)); @@ -101,5 +101,5 @@ sampv=varargin{iarg}; iarg=iarg+1; - + if iarg <= nargin && iscell(varargin{iarg}) descv=varargin{iarg}; @@ -128,5 +128,5 @@ dresp=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -134,5 +134,5 @@ iarg=iarg+1; end - + descr=cell (1,length(dresp)); lsamp=zeros(1,length(dresp)); @@ -150,5 +150,5 @@ sampr=varargin{iarg}; iarg=iarg+1; - + if iarg <= nargin && iscell(varargin{iarg}) descr=varargin{iarg}; @@ -187,5 +187,5 @@ iarg=iarg+2; end - + if ~exist('nplotr','var') && ~exist('nplotc','var') nplotr=ceil(sqrt(size(sampr,2))); @@ -208,5 +208,5 @@ for iresp=1:size(sampr,2) - + % initialize the subplot Index: /issm/trunk-jpl/src/m/qmu/plot/plot_rvsv_surf.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/plot/plot_rvsv_surf.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/plot/plot_rvsv_surf.m (revision 13646) @@ -76,5 +76,5 @@ dvar=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -82,5 +82,5 @@ iarg=iarg+1; end - + descv=cell (1,length(dvar)); lsamp=zeros(1,length(dvar)); @@ -98,5 +98,5 @@ sampv=varargin{iarg}; iarg=iarg+1; - + if iarg <= nargin && iscell(varargin{iarg}) descv=varargin{iarg}; @@ -125,5 +125,5 @@ dresp=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -131,5 +131,5 @@ iarg=iarg+1; end - + descr=cell (1,length(dresp)); lsamp=zeros(1,length(dresp)); @@ -147,5 +147,5 @@ sampr=varargin{iarg}; iarg=iarg+1; - + if iarg <= nargin && iscell(varargin{iarg}) descr=varargin{iarg}; @@ -184,5 +184,5 @@ iarg=iarg+2; end - + if ~exist('nplotr','var') && ~exist('nplotc','var') nplotr=ceil(sqrt(size(sampr,2))); @@ -208,5 +208,5 @@ z(ixi(i),iyi(i))=sampr(i,iresp); end - + % initialize the subplot Index: /issm/trunk-jpl/src/m/qmu/plot/plot_sampdist_bars.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/plot/plot_sampdist_bars.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/plot/plot_sampdist_bars.m (revision 13646) @@ -72,5 +72,5 @@ dresp=varargin{iarg}; iarg=iarg+1; - + % if iarg <= nargin && (iscell(varargin{iarg}) || ischar(varargin{iarg})) if iarg <= nargin && iscell(varargin{iarg}) @@ -81,5 +81,5 @@ sampr=varargin{iarg}; iarg=iarg+1; - + if iarg <= nargin && iscell(varargin{iarg}) descr=varargin{iarg}; @@ -91,5 +91,5 @@ descr=cell(1:size(sampr,2)); end - + dresp=struct([]); for i=1:size(sampr,2) Index: /issm/trunk-jpl/src/m/qmu/process_qmu_options.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/process_qmu_options.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/process_qmu_options.m (revision 13646) @@ -99,3 +99,2 @@ outoptions.iparams=iparams; outoptions.runmpi=runmpi; - Index: /issm/trunk-jpl/src/m/qmu/process_qmu_response_data.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/process_qmu_response_data.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/process_qmu_response_data.m (revision 13646) @@ -5,5 +5,4 @@ % % See also PREQMU, PRESOLVE - %preliminary data @@ -22,5 +21,4 @@ end - %deal with mass flux profiles if process_mass_flux_profiles, @@ -30,5 +28,5 @@ error('process_qmu_response_data error message: could not find a mass_flux exp profile!'); end - + if ~iscell(md.qmu.mass_flux_profiles), error('process_qmu_response_data error message: qmu_mass_flux_profiles field should be a cell array of domain outline names'); Index: /issm/trunk-jpl/src/m/qmu/qmu_correlation.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/qmu_correlation.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/qmu_correlation.m (revision 13646) @@ -12,5 +12,5 @@ error('qmu_correlation error message: could not find dresp_dat field in dakota results. you need to run montecarlo before computing correlations'); end - + data=md.qmu.results.dresp_dat; Index: /issm/trunk-jpl/src/m/qmu/qmuisdistributed.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/qmuisdistributed.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/qmuisdistributed.m (revision 13646) @@ -1,5 +1,4 @@ function found=qmuisdistribted(string) %QMUISDISTRIBTED - figure out if a string is a decriptor with a numerical postfix. Like thickness1, or drag10 - %just take last string element, and see if it is numeric. Index: /issm/trunk-jpl/src/m/qmu/qmumarshall.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/qmumarshall.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/qmumarshall.m (revision 13646) @@ -47,5 +47,5 @@ end end - + if qmu_segments, WriteData(fid,md.qmu.mass_flux_num_profiles,'Integer','qmu_mass_flux_num_profiles'); @@ -57,5 +57,4 @@ WriteData(fid,md.qmu.mass_flux_num_profiles,'Integer','qmu_mass_flux_num_profiles'); end - %write part and npart to disk Index: /issm/trunk-jpl/src/m/qmu/qmuresponse.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/qmuresponse.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/qmuresponse.m (revision 13646) @@ -114,3 +114,2 @@ error(['qmuresponse error message: unknown descriptor ' descriptor]); end - Index: /issm/trunk-jpl/src/m/qmu/qmuroot.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/qmuroot.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/qmuroot.m (revision 13646) @@ -11,3 +11,2 @@ end end - Index: /issm/trunk-jpl/src/m/qmu/rlist_write.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/rlist_write.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/rlist_write.m (revision 13646) @@ -68,3 +68,2 @@ end - Index: /issm/trunk-jpl/src/m/qmu/sensitivities.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/sensitivities.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/sensitivities.m (revision 13646) @@ -8,5 +8,4 @@ % Example: sens=sensitivities(md,'DragCoefficient','MaxVel'); % - variablenamelength=length(variablename); Index: /issm/trunk-jpl/src/m/qmu/setupdesign/IsScaled.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/setupdesign/IsScaled.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/setupdesign/IsScaled.m (revision 13646) @@ -12,5 +12,5 @@ case {'RiftsFriction'}, - + status=2; %special treatment Index: /issm/trunk-jpl/src/m/qmu/setupdesign/QmuSetupVariables.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/setupdesign/QmuSetupVariables.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/setupdesign/QmuSetupVariables.m (revision 13646) @@ -6,5 +6,4 @@ %decide whether this is a distributed variable, which will drive whether we expand it into npart values, %or if we just carry it forward as is. - %ok, key off according to type of descriptor: Index: /issm/trunk-jpl/src/m/qmu/vector_write.m =================================================================== --- /issm/trunk-jpl/src/m/qmu/vector_write.m (revision 13645) +++ /issm/trunk-jpl/src/m/qmu/vector_write.m (revision 13646) @@ -31,5 +31,5 @@ nitem=nitem+1; lsvec=lsvec+1+length(sitem); - + if (nitem <= nmax) && (lsvec <= cmax) svec=[svec ' ' sitem]; Index: /issm/trunk-jpl/src/m/regional/basinzoom.m =================================================================== --- /issm/trunk-jpl/src/m/regional/basinzoom.m (revision 13645) +++ /issm/trunk-jpl/src/m/regional/basinzoom.m (revision 13646) @@ -39,5 +39,5 @@ %Ok, find basin we are talking about: load([jplsvn() '/projects/ModelData/Names/Names.mat']); - + %Go through names: found=0; Index: /issm/trunk-jpl/src/m/regional/regionaltransient2d.m =================================================================== --- /issm/trunk-jpl/src/m/regional/regionaltransient2d.m (revision 13645) +++ /issm/trunk-jpl/src/m/regional/regionaltransient2d.m (revision 13646) @@ -156,3 +156,2 @@ md2.results=[]; end - Index: /issm/trunk-jpl/src/m/regional/showbasins.m =================================================================== --- /issm/trunk-jpl/src/m/regional/showbasins.m (revision 13645) +++ /issm/trunk-jpl/src/m/regional/showbasins.m (revision 13646) @@ -21,5 +21,4 @@ options=pairoptions(varargin{:}); end - %recover some options, and set defaults Index: /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.m =================================================================== --- /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.m (revision 13645) +++ /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.m (revision 13646) @@ -50,5 +50,4 @@ end - %post processes qmu results if necessary else Index: /issm/trunk-jpl/src/m/solve/parseresultsfromdisk.m =================================================================== --- /issm/trunk-jpl/src/m/solve/parseresultsfromdisk.m (revision 13645) +++ /issm/trunk-jpl/src/m/solve/parseresultsfromdisk.m (revision 13646) @@ -19,5 +19,4 @@ % Usage: % results=parseresultsfromdiskioserial(filename) - %Open file @@ -54,5 +53,4 @@ % Usage: % results=parseresultsfromdiskiosplit(filename) - %Open file @@ -177,5 +175,4 @@ % field=ReadDataDimensions(fid) - %read field [length,count]=fread(fid,1,'int'); Index: /issm/trunk-jpl/src/m/solve/solve.m =================================================================== --- /issm/trunk-jpl/src/m/solve/solve.m (revision 13645) +++ /issm/trunk-jpl/src/m/solve/solve.m (revision 13646) @@ -74,10 +74,8 @@ end - %Write all input files marshall(md); % bin file PetscFile(md.solver,[md.miscellaneous.name '.petsc']); % petsc file BuildQueueScript(cluster,md.private.runtimename,md.miscellaneous.name,md.private.solution,md.settings.io_gather,md.debug.valgrind,md.debug.gprof); % queue file - %Stop here if batch mode Index: /issm/trunk-jpl/src/m/solvers/asmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/asmoptions.m (revision 13645) +++ /issm/trunk-jpl/src/m/solvers/asmoptions.m (revision 13646) @@ -4,5 +4,5 @@ % Usage: % options=asmoptions; - + %retrieve options provided in varargin options=pairoptions(varargin{:}); Index: /issm/trunk-jpl/src/m/solvers/iluasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/iluasmoptions.m (revision 13645) +++ /issm/trunk-jpl/src/m/solvers/iluasmoptions.m (revision 13646) @@ -4,5 +4,5 @@ % Usage: % options=iluasmoptions; - + %retrieve options provided in varargin options=pairoptions(varargin{:}); Index: /issm/trunk-jpl/src/m/solvers/jacobiasmoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/jacobiasmoptions.m (revision 13645) +++ /issm/trunk-jpl/src/m/solvers/jacobiasmoptions.m (revision 13646) @@ -4,5 +4,5 @@ % Usage: % options=jacobiasmoptions; - + %retrieve options provided in varargin options=pairoptions(varargin{:}); Index: /issm/trunk-jpl/src/m/solvers/jacobicgoptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/jacobicgoptions.m (revision 13645) +++ /issm/trunk-jpl/src/m/solvers/jacobicgoptions.m (revision 13646) @@ -4,5 +4,5 @@ % Usage: % options=jacobiasmoptions; - + %retrieve options provided in varargin options=pairoptions(varargin{:}); Index: /issm/trunk-jpl/src/m/solvers/matlaboptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/matlaboptions.m (revision 13645) +++ /issm/trunk-jpl/src/m/solvers/matlaboptions.m (revision 13646) @@ -4,5 +4,5 @@ % Usage: % options=matlaboptions; - + %retrieve options provided in varargin options=pairoptions(varargin{:}); Index: /issm/trunk-jpl/src/m/solvers/soroptions.m =================================================================== --- /issm/trunk-jpl/src/m/solvers/soroptions.m (revision 13645) +++ /issm/trunk-jpl/src/m/solvers/soroptions.m (revision 13646) @@ -4,5 +4,5 @@ % Usage: % options=soroptions; - + %retrieve options provided in varargin options=pairoptions(varargin{:}); Index: /issm/trunk-jpl/src/m/string/issmprintf.m =================================================================== --- /issm/trunk-jpl/src/m/string/issmprintf.m (revision 13645) +++ /issm/trunk-jpl/src/m/string/issmprintf.m (revision 13646) @@ -8,5 +8,5 @@ % Example: % issmprintf(1,'%s\n','string to display'); - + if flag, disp(sprintf(format,varargin{:})); Index: /issm/trunk-jpl/src/m/string/strsplit.m =================================================================== --- /issm/trunk-jpl/src/m/string/strsplit.m (revision 13645) +++ /issm/trunk-jpl/src/m/string/strsplit.m (revision 13646) @@ -16,6 +16,4 @@ % mailto: gie.spaepen@ua.ac.be - - %Check input arguments @@ -87,5 +85,4 @@ splittedstring = tempsplit; end - - + end Index: /issm/trunk-jpl/src/m/string/strsplit_strict.m =================================================================== --- /issm/trunk-jpl/src/m/string/strsplit_strict.m (revision 13645) +++ /issm/trunk-jpl/src/m/string/strsplit_strict.m (revision 13646) @@ -4,5 +4,4 @@ % Usage: % output = strsplit_strict(inpstr,delimiter) - %Check input arguments