Index: /issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.m =================================================================== --- /issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.m (revision 26351) +++ /issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.m (revision 26352) @@ -40,5 +40,5 @@ pos=find(md.mesh.vertexonboundary & ~vertexonicefront); if isempty(pos), - disp('SetMarineIceSheetBC warning: ice front all around the glacier, no dirichlet applied') + disp('Warning: SetMarineIceSheetBC.m: ice front all around the glacier, no dirichlet applied') end md.stressbalance.spcvx=NaN*ones(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.py =================================================================== --- /issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.py (revision 26351) +++ /issm/trunk-jpl/src/m/boundaryconditions/SetMarineIceSheetBC.py (revision 26352) @@ -5,20 +5,20 @@ def SetMarineIceSheetBC(md, icefrontfile=''): - """ - SETICEMARINESHEETBC - Create the boundary conditions for stressbalance and thermal models for a Marine Ice Sheet with Ice Front + """SETICEMARINESHEETBC - Create the boundary conditions for stressbalance + and thermal models for a Marine Ice Sheet with Ice Front - Neumann BC are used on the ice front (an ARGUS contour around the ice front - can be given in input, or it will be deduced as onfloatingice & onboundary) - Dirichlet BC are used elsewhere for stressbalance + Neumann BC are used on the ice front (an ARGUS contour around the ice front + can be given in input, or it will be deduced as onfloatingice & onboundary) + Dirichlet BC are used elsewhere for stressbalance - Usage: - md = SetMarineIceSheetBC(md, icefrontfile) - md = SetMarineIceSheetBC(md) + Usage: + md = SetMarineIceSheetBC(md, icefrontfile) + md = SetMarineIceSheetBC(md) - Example: - md = SetMarineIceSheetBC(md, 'Front.exp') - md = SetMarineIceSheetBC(md) + Example: + md = SetMarineIceSheetBC(md, 'Front.exp') + md = SetMarineIceSheetBC(md) - See also: SETICESHELFBC, SETMARINEICESHEETBC + See also: SETICESHELFBC, SETMARINEICESHEETBC """ #node on Dirichlet (boundary and ~icefront) @@ -39,5 +39,5 @@ pos = np.nonzero(np.logical_and(md.mesh.vertexonboundary, np.logical_not(vertexonicefront)))[0] if not np.size(pos): - print("SetMarineIceSheetBC warning: ice front all around the glacier, no dirichlet found. Dirichlet must be added manually.") + print("Warning: SetMarineIceSheetBC.py: ice front all around the glacier, no dirichlet found. Dirichlet must be added manually.") md.stressbalance.spcvx = float('nan') * np.ones(md.mesh.numberofvertices) Index: /issm/trunk-jpl/src/m/classes/offlinesolidearthsolution.m =================================================================== --- /issm/trunk-jpl/src/m/classes/offlinesolidearthsolution.m (revision 26351) +++ /issm/trunk-jpl/src/m/classes/offlinesolidearthsolution.m (revision 26352) @@ -22,5 +22,5 @@ if ~ismember('SealevelchangeAnalysis',analyses) | (strcmp(solution,'TransientSolution') & md.solidearth.settings.isgrd==1), - error('offlinesolidearthsolution checkconsistency error message: trying to run GRD patterns while supplying an offline solution for those patterns!'); + error('offlinesolidearthsolution.m::checkconsistency: trying to run GRD patterns while supplying an offline solution for those patterns!'); end self.checkconsistency@solidearthsolution(md,solution,analyses); Index: /issm/trunk-jpl/src/m/classes/offlinesolidearthsolution.py =================================================================== --- /issm/trunk-jpl/src/m/classes/offlinesolidearthsolution.py (revision 26351) +++ /issm/trunk-jpl/src/m/classes/offlinesolidearthsolution.py (revision 26352) @@ -57,5 +57,5 @@ # Transform our time series into time series rates if len(np.shape(self.displacementeast)) == 1: - print('External solidearthsolution warning: only one time step provided, assuming the values are rates per year') + print('Warning: offlinesolidearthsolution.py::marshall: only one time step provided, assuming the values are rates per year') displacementeast_rate = np.append(np.array(self.displacementeast).reshape(-1, 1), 0) displacementnorth_rate = np.append(np.array(self.displacementnorth).reshape(-1, 1), 0) 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 26351) +++ /issm/trunk-jpl/src/m/classes/qmu/dakota_method/dmeth_params_write.m (revision 26352) @@ -598,6 +598,4 @@ else warning('param_write:param_unrecog','Parameter ''%s'' is of unrecognized type ''%s''.',pname,class(params.(pname))); - return end - end% }}} Index: /issm/trunk-jpl/src/m/classes/qmu/dakota_method/dmeth_params_write.py =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu/dakota_method/dmeth_params_write.py (revision 26351) +++ /issm/trunk-jpl/src/m/classes/qmu/dakota_method/dmeth_params_write.py (revision 26352) @@ -7,7 +7,7 @@ def dmeth_params_write(dm, fid, sbeg='\t '): - ''' write the parameters from a dakota_method object. + """write the parameters from a dakota_method object. [] = dmeth_params_write(dm, fid, sbeg) - ''' + """ if not isinstance(dm, dakota_method): @@ -509,10 +509,10 @@ # check for errors if not isfield(params, pname): - warning('param_write:param_not_found', 'Parameter ' + str(pname) + ' not found in ' + params + '.') + print('Warning: dmeth_params_write.py::param_write: Parameter {} not found in {}.'.format(pname, params)) return elif type(vars(params)[pname]) == bool and not vars(params)[pname]: return elif isempty(vars(params)[pname]): - print('Warning: param_write:param_empty: Parameter {} requires input of type {}.'.format(pname, type(vars(params)[pname]))) + print('Warning: dmeth_params_write.py::param_write: Parameter {} requires input of type {}.'.format(pname, type(vars(params)[pname]))) return @@ -535,4 +535,4 @@ else: - print('Warning: param_write:param_unrecog: Parameter {} is of unrecognized type {}.'.format(pname, type(vars(params)[pname]))) - return + print('Warning: dmeth_params_write.py::param_write: Parameter {} is of unrecognized type {}.'.format(pname, type(vars(params)[pname]))) + return Index: /issm/trunk-jpl/src/m/classes/sealevelmodel.m =================================================================== --- /issm/trunk-jpl/src/m/classes/sealevelmodel.m (revision 26351) +++ /issm/trunk-jpl/src/m/classes/sealevelmodel.m (revision 26352) @@ -50,10 +50,10 @@ for i=1:length(slm.icecaps), if slm.icecaps{i}.transient.iscoupler==0, - warning(sprintf('sealevelmodel checkconsistency error: icecap model %s should have the transient coupler option turned on!',slm.icecaps{i}.miscellaneous.name)); + warning(sprintf('sealevelmodel.m::checkconsistency: icecap model %s should have the transient coupler option turned on!',slm.icecaps{i}.miscellaneous.name)); end end if slm.earth.transient.iscoupler==0, - warning('sealevelmodel checkconsistency error: earth model should have the transient coupler option turned on!'); + warning('sealevelmodel.m::checkconsistency: earth model should have the transient coupler option turned on!'); end @@ -61,5 +61,5 @@ for i=1:length(slm.icecaps), if slm.icecaps{i}.mesh.numberofvertices ~= length(slm.earth.solidearth.transitions{i}), - error(['sealevelmodel checkconsistency issue with size of transition vector for ice cap: ' num2str(i) ' name: ' slm.icecaps{i}.miscellaneous.name]); + error(['sealevelmodel.m::checkconsistency: issue with size of transition vector for ice cap: ' num2str(i) ' name: ' slm.icecaps{i}.miscellaneous.name]); end end @@ -68,5 +68,5 @@ for i=1:length(slm.icecaps), if slm.icecaps{i}.solidearth.settings.runfrequency~=slm.earth.solidearth.settings.runfrequency, - error(sprintf('sealevelmodel checkconsistency error: icecap model %s should have the same run frequency as earth!',slm.icecaps{i}.miscellaneous.name)); + error(sprintf('sealevelmodel.m::checkconsistency: icecap model %s should have the same run frequency as earth!',slm.icecaps{i}.miscellaneous.name)); end end @@ -76,5 +76,5 @@ md= slm.icecaps{i}; if ~isempty(find(md.dsl.steric_rate - slm.earth.dsl.steric_rate(slm.earth.dsl.transitions{i}))), - error(sprintf('steric rate on ice cap %s is not the same as for the earth\n',md.miscellaneous.name)); + error(sprintf('sealevelmodel.m::checkconsistency: steric rate on ice cap %s is not the same as for the earth\n',md.miscellaneous.name)); end end @@ -84,5 +84,5 @@ md= slm.icecaps{i}; if md.solidearthsettings.isgrd~=slm.earth.solidearthsettings.isgrd - error(sprintf('isgrd on ice cap %s is not the same as for the earth\n',md.miscellaneous.name)); + error(sprintf('sealevelmodel.m::checkconsistency: isgrd on ice cap %s is not the same as for the earth\n',md.miscellaneous.name)); end end @@ -92,5 +92,5 @@ md= slm.icecaps{i}; if ~isempty(md.solidearth.external), - error('cannot run external forcings on an ice sheet when running a coupling earth/ice sheet model'); + error('sealevelmodel.m::checkconsistency: cannot run external forcings on an ice sheet when running a coupling earth/ice sheet model'); end @@ -100,5 +100,5 @@ md= slm.icecaps{i}; if md.solidearth.settings.grdmodel~=0 - error(sprintf('sealevelmodel checkconsistency error message: ice sheets do not run GRD module, specify solidearth.settings.grdmodel=0 on ice cap %i',i)); + error(sprintf('sealevelmodel.m::checkconsistency: ice sheets do not run GRD module, specify solidearth.settings.grdmodel=0 on ice cap %i',i)); end end Index: /issm/trunk-jpl/src/m/classes/sealevelmodel.py =================================================================== --- /issm/trunk-jpl/src/m/classes/sealevelmodel.py (revision 26351) +++ /issm/trunk-jpl/src/m/classes/sealevelmodel.py (revision 26352) @@ -1,4 +1,3 @@ from copy import deepcopy -import warnings import numpy as np @@ -91,18 +90,18 @@ for i in range(len(slm.icecaps)): if not slm.icecaps[i].transient.iscoupler: - warnings.warn('sealevelmodel checkconsistency error: icecap model {} should have the transient coupler option turned on!'.format(slm.icecaps[i].miscellaneous.name)) + print('Warning: sealevelmodel.py::checkconsistency: icecap model {} should have the transient coupler option turned on!'.format(slm.icecaps[i].miscellaneous.name)) if not slm.earth.transient.iscoupler: - warnings.warn('sealevelmodel checkconsistency error: earth model should have the transient coupler option turned on!') + print('Warning: sealevelmodel.py::checkconsistency: earth model should have the transient coupler option turned on!') # Check that the transition vectors have the right size for i in range(len(slm.icecaps)): if slm.icecaps[i].mesh.numberofvertices != len(slm.earth.slr.transitions[i]): - raise Exception('sealevelmodel checkconsistency issue with size of transition vector for ice cap: {} name: {}'.format(i, slm.icecaps[i].miscellaneous.name)) + raise Exception('sealevelmodel.py::checkconsistency: issue with size of transition vector for ice cap: {} name: {}'.format(i, slm.icecaps[i].miscellaneous.name)) # Check that run frequency is the same everywhere for i in range(len(slm.icecaps)): if slm.icecaps[i].slr.geodetic_run_frequency != slm.earth.geodetic_run_frequency: - raise Exception('sealevelmodel checkconsistency error: icecap model {} should have the same run frequency as earth!'.format(slm.icecaps[i].miscellaneous.name)) + raise Exception('sealevelmodel.py::checkconsistency: icecap model {} should have the same run frequency as earth!'.format(slm.icecaps[i].miscellaneous.name)) # Make sure steric_rate is the same everywhere @@ -110,5 +109,5 @@ md = slm.icecaps[i] if np.nonzero(md.slr.steric_rate - slm.earth.slr.steric_rate[slm.earth.slr.transitions[i]]) != []: - raise Exception('steric rate on ice cap {} is not the same as for the earth'.format(md.miscellaneous.name)) + raise Exception('sealevelmodel.py::checkconsistency: steric rate on ice cap {} is not the same as for the earth'.format(md.miscellaneous.name)) # Make sure grd is the same everywhere @@ -116,15 +115,15 @@ md = slm.icecaps[i] if md.solidearthsettings.isgrd != slm.earth.solidearthsettings.isgrd: - raise RuntimeError('isgrd on ice cap {} is not the same as for the earth\n'.format(md.miscellaneous.name)) + raise RuntimeError('sealevelmodel.py::checkconsistency: isgrd on ice cap {} is not the same as for the earth\n'.format(md.miscellaneous.name)) # Make sure that there is no solid earth external forcing on the basins for i in range(len(slm.icecaps)): md = slm.icecaps[i] if md.solidearth.external: - raise RuntimeError('cannot run external forcings on an ice sheet when running a coupling earth/ice sheet model') + raise RuntimeError('sealevelmodel.py::checkconsistency: cannot run external forcings on an ice sheet when running a coupling earth/ice sheet model') # Make sure that we have the right grd model for computing our sealevel patterns for i in range(len(slm.icecaps)): md = slm.icecaps[i] if md.solidearth.settings.grdmodel != 0: - raise RuntimeError('sealevelmodel checkconsistency error message: ice sheets do not run GRD module, specify solidearth.settings.grdmodel=0 on ice cap {}'.format(i)) + raise RuntimeError('sealevelmodel.py::checkconsistency: ice sheets do not run GRD module, specify solidearth.settings.grdmodel=0 on ice cap {}'.format(i)) #}}} Index: /issm/trunk-jpl/src/m/classes/slr.py =================================================================== --- /issm/trunk-jpl/src/m/classes/slr.py (revision 26351) +++ /issm/trunk-jpl/src/m/classes/slr.py (revision 26352) @@ -11,10 +11,9 @@ class slr(object): - ''' - SLR class definition - - Usage: - slr = slr() - ''' + """SLR class definition + + Usage: + slr = slr() + """ def __init__(self): # {{{ self.deltathickness = np.nan @@ -154,5 +153,5 @@ els = np.where(maskpos > 0) if len(els[0]) > 0: - warnings.warn('slr checkconsistency fail: there are elements with ice loads where some vertices are not on the ice!') + print('Warning: slr.py::checkconsistency: there are elements with ice loads where some vertices are not on the ice!') # Check that if geodetic is requested, we are a mesh3dsurface model (planet), or if we are not, a coupler to a planet model is provided Index: /issm/trunk-jpl/src/m/classes/solidearthsolution.py =================================================================== --- /issm/trunk-jpl/src/m/classes/solidearthsolution.py (revision 26351) +++ /issm/trunk-jpl/src/m/classes/solidearthsolution.py (revision 26352) @@ -54,5 +54,5 @@ # Transform our time series into time series rates if len(np.shape(self.displacementeast)) == 1: - print('External solidearthsolution warning: only one time step provided, assuming the values are rates per year') + print('solidearthsolution.py::marshall: Warning: only one time step provided, assuming the values are rates per year') displacementeast_rate = np.append(np.array(self.displacementeast).reshape(-1, 1), 0) displacementnorth_rate = np.append(np.array(self.displacementnorth).reshape(-1, 1), 0) Index: /issm/trunk-jpl/src/m/dev/devpath.py =================================================================== --- /issm/trunk-jpl/src/m/dev/devpath.py (revision 26351) +++ /issm/trunk-jpl/src/m/dev/devpath.py (revision 26352) @@ -2,5 +2,4 @@ import os import sys -import warnings #Recover ISSM_DIR and USERNAME @@ -36,5 +35,5 @@ sys.path.append(jpl_path) else: - warnings.warn('cluster settings should be in, {}/usr/{}'.format(JPL_SVN, USERNAME)) + print('Warning: devpath.py: cluster settings should be in {}'.format(jpl_path)) from runme import runme #first because plotmodel may fail Index: /issm/trunk-jpl/src/m/materials/nye.m =================================================================== --- /issm/trunk-jpl/src/m/materials/nye.m (revision 26351) +++ /issm/trunk-jpl/src/m/materials/nye.m (revision 26352) @@ -13,11 +13,11 @@ if (ice_type==1) if (any(temperature>200&temperature<220)) - warning('CO2 ICE - POSSIBLE MELTING. Some temperature values are between 200K and 220K.\nLook at indexes: %s', mat2str(find(temperature>200 & temperature<220))'); + warning('nye.m: CO2 ICE - POSSIBLE MELTING. Some temperature values are between 200K and 220K.\nLook at indexes: %s', mat2str(find(temperature>200 & temperature<220))'); end if (any(temperature>=220)) - warning('CO2 ICE - GUARANTEED MELTING. Some temperature values are beyond 220K.\nLook at indexes: %s', mat2str(find(temperature>=220))'); + warning('nye.m: CO2 ICE - GUARANTEED MELTING. Some temperature values are beyond 220K.\nLook at indexes: %s', mat2str(find(temperature>=220))'); end elseif ((ice_type==2)&&(any(temperature>273.15))) - warning('H2O ICE - GUARANTEED MELTING. Some temperature values are beyond 273.15K.\nLook at indexes: %s', mat2str(find(temperature>273.15))'); + warning('nye.m: H2O ICE - GUARANTEED MELTING. Some temperature values are beyond 273.15K.\nLook at indexes: %s', mat2str(find(temperature>273.15))'); end Index: /issm/trunk-jpl/src/m/materials/nye.py =================================================================== --- /issm/trunk-jpl/src/m/materials/nye.py (revision 26351) +++ /issm/trunk-jpl/src/m/materials/nye.py (revision 26352) @@ -1,15 +1,13 @@ import numpy as np -from warnings import warn def nye(temperature, ice_type): + """NYE - figure out the rigidity of ice (either CO2 or H2O) for a given + temperature rigidity (in s^(1/n)Pa) is the flow law parameter in the flow + law sigma=B*e(1/n) (Nye, p2000). Temperature is in Kelvin degrees. + + Usage: + rigidity=nye(temperature,ice_type) % ice_type = 1: CO2 ice // ice_type = 2: H2O ice """ - NYE - figure out the rigidity of ice (either CO2 or H2O) for a given temperature - rigidity (in s^(1/n)Pa) is the flow law parameter in the flow law sigma=B*e(1/n) (Nye, p2000). - temperature is in Kelvin degrees - - Usage: - rigidity=nye(temperature,ice_type) % ice_type = 1: CO2 ice // ice_type = 2: H2O ice - """ # Declaring temperature and rigidity arrays @@ -26,10 +24,10 @@ for i in range(len(T)): if (200 < T[i] < 220): - warn('CO2 ICE - POSSIBLE MELTING. Some temperature values are between 200K and 220K.') + print('Warning: nye.py: CO2 ICE - POSSIBLE MELTING. Some temperature values are between 200K and 220K.') break if ((T >= 220).any()): - warn('CO2 ICE - GUARANTEED MELTING. Some temperature values are beyond 220K.') + print('Warning: nye.py: CO2 ICE - GUARANTEED MELTING. Some temperature values are beyond 220K.') elif (ice_type == 2) and ((T > 273.15).any()): - warn('H2O ICE - GUARANTEED MELTING. Some temperature values are beyond 273.15K.') + print('Warning: nye.py: H2O ICE - GUARANTEED MELTING. Some temperature values are beyond 273.15K.') Rg = 8.3144598 # J mol^-1 K^-1 Index: /issm/trunk-jpl/src/m/mech/steadystateiceshelftemp.py =================================================================== --- /issm/trunk-jpl/src/m/mech/steadystateiceshelftemp.py (revision 26351) +++ /issm/trunk-jpl/src/m/mech/steadystateiceshelftemp.py (revision 26352) @@ -49,5 +49,5 @@ temperature[pos] = -((Tb[pos] - Ts[pos]) * ki / wi[pos] + Hi[pos] * Tb[pos] - (Hi[pos] * Ts[pos] + (Tb[pos] - Ts[pos]) * ki / wi[pos]) * np.exp(Hi[pos] * wi[pos] / ki)) / (Hi[pos] * (np.exp(Hi[pos] * wi[pos] / ki) - 1)) except FloatingPointError: - print('steadystateiceshelf warning: overflow encountered in multipy / divide / exp, trying another formulation.') + print('Warning: steadystateiceshelf.py: overflow encountered in multipy/divide/exp, trying another formulation.') temperature[pos] = -(((Tb[pos] - Ts[pos]) * ki / wi[pos] + Hi[pos] * Tb[pos]) / np.exp(Hi[pos] * wi[pos] / ki) - Hi[pos] * Ts[pos] + (Tb[pos] - Ts[pos]) * ki / wi[pos]) / (Hi[pos] * (1 - np.exp(-Hi[pos] * wi[pos] / ki))) Index: /issm/trunk-jpl/src/m/parameterization/setflowequation.m =================================================================== --- /issm/trunk-jpl/src/m/parameterization/setflowequation.m (revision 26351) +++ /issm/trunk-jpl/src/m/parameterization/setflowequation.m (revision 26352) @@ -60,5 +60,5 @@ %check that each element has only one flag if any(SIAflag+SSAflag+HOflag+L1L2flag+MLHOflag+FSflag>1), - disp('setflowequation warning message: some elements have several types, higher order type is used for them') + disp('setflowequation.m: Warning: some elements have several types, higher order type is used for them') SIAflag(find(SIAflag & SSAflag))=0; SIAflag(find(SIAflag & HOflag))=0; Index: /issm/trunk-jpl/src/m/parameterization/setflowequation.py =================================================================== --- /issm/trunk-jpl/src/m/parameterization/setflowequation.py (revision 26351) +++ /issm/trunk-jpl/src/m/parameterization/setflowequation.py (revision 26352) @@ -6,22 +6,23 @@ def setflowequation(md, *args): - """ - SETFLOWEQUATION - associate a solution type to each element - - This routine works like plotmodel: it works with an even number of inputs - 'SIA', 'SSA', 'HO', 'L1L2', 'MLHO', 'FS' and 'fill' are the possible options - that must be followed by the corresponding exp file or flags list - It can either be a domain file (argus type, .exp extension), or an array of element flags. - If user wants every element outside the domain to be - setflowequationd, add '~' to the name of the domain file (ex: '~HO.exp') - an empty string '' will be considered as an empty domain - a string 'all' will be considered as the entire domain - You can specify the type of coupling, 'penalties' or 'tiling', to use with the input 'coupling' - - Usage: - md = setflowequation(md, varargin) - - Example: - md = setflowequation(md, 'HO', 'HO.exp', fill', 'SIA', 'coupling', 'tiling') + """SETFLOWEQUATION - associate a solution type to each element + + This routine works like plotmodel: it works with an even number of inputs + 'SIA', 'SSA', 'HO', 'L1L2', 'MLHO', 'FS' and 'fill' are the possible + options that must be followed by the corresponding exp file or flags list. + It can either be a domain file (argus type, .exp extension), or an array of + element flags. + If user wants every element outside the domain to be setflowequationd, add + '~' to the name of the domain file (ex: '~HO.exp') an empty string '' will + be considered as an empty domain a string 'all' will be considered as the + entire domain. + You can specify the type of coupling, 'penalties' or 'tiling', to use with + the input 'coupling'. + + Usage: + md = setflowequation(md, varargin) + + Example: + md = setflowequation(md, 'HO', 'HO.exp', fill', 'SIA', 'coupling', 'tiling') """ @@ -61,5 +62,5 @@ #check that each element has only one flag if any(SIAflag + SSAflag + L1L2flag + MLHOflag + HOflag + FSflag > 1): - print("setflowequation warning message: some elements have several types, higher order type is used for them") + print('Warning: setflowequation.py: some elements have several types, higher order type is used for them') SIAflag[np.where(np.logical_and(SIAflag, SSAflag))] = False SIAflag[np.where(np.logical_and(SIAflag, HOflag))] = False Index: /issm/trunk-jpl/src/m/plot/processdata.m =================================================================== --- /issm/trunk-jpl/src/m/plot/processdata.m (revision 26351) +++ /issm/trunk-jpl/src/m/plot/processdata.m (revision 26352) @@ -164,5 +164,5 @@ data(pos,:)=maskvalue; else - disp('plotmodel warning: mask length not supported yet (supported length are numberofvertices and numberofelements'); + disp('Warning: processdata.m: mask length not supported yet (supported length are numberofvertices and numberofelements'); end end @@ -194,5 +194,5 @@ data(md.mesh.elements(pos,:),:)=maskvalue; else - disp('plotmodel warning: mask length not supported yet (supported length are numberofvertices and numberofelements'); + disp('Warning: processdata.m: mask length not supported yet (supported length are numberofvertices and numberofelements'); end end @@ -236,5 +236,5 @@ data(md.mesh.elements(pos,:),:)=NaN; else - disp('plotmodel warning: mask length not supported yet (supported length are numberofvertices and numberofelements'); + disp('Warning: processdata.m: mask length not supported yet (supported length are numberofvertices and numberofelements'); end end Index: /issm/trunk-jpl/src/m/plot/processdata.py =================================================================== --- /issm/trunk-jpl/src/m/plot/processdata.py (revision 26351) +++ /issm/trunk-jpl/src/m/plot/processdata.py (revision 26352) @@ -89,5 +89,5 @@ options.addfielddefault('cmap_set_bad', 'w') else: - print('plotmodel warning: mask length not supported yet (supported length are md.mesh.numberofvertices and md.mesh.numberofelements') + print('Warning: processdata.py: mask length not supported yet (supported length are md.mesh.numberofvertices and md.mesh.numberofelements') # }}} @@ -110,5 +110,5 @@ options.addfielddefault('cmap_set_bad', 'w') else: - print('plotmodel warning: mask length not supported yet (supported length are md.mesh.numberofvertices and md.mesh.numberofelements') + print('Warning: processdata.py: mask length not supported yet (supported length are md.mesh.numberofvertices and md.mesh.numberofelements') # }}} # }}}