Index: /issm/trunk-jpl/src/m/classes/pairoptions.m =================================================================== --- /issm/trunk-jpl/src/m/classes/pairoptions.m (revision 26306) +++ /issm/trunk-jpl/src/m/classes/pairoptions.m (revision 26307) @@ -182,5 +182,5 @@ end % }}} function value = getfieldvalue(self,field,varargin), % {{{ - %GETOPTION - get the value of an option + %GETFIELDVALUE - get the value of an option % % Usage: @@ -220,5 +220,5 @@ end % }}} function values = getfieldvalues(self,field,varargin), % {{{ - %GETOPTION - get the value of an option (if the option is repeated, return multiple values) + %GETFIELDVALUES - get the value of an option (if the option is repeated, return multiple values) % % Usage: @@ -229,6 +229,6 @@ % % Examples: - % values=getfieldvalue(options,'caxis'); - % values=getfieldvalue(options,'caxis',{[0 2],[3 4]}); + % values=getfieldvalues(options,'caxis'); + % values=getfieldvalues(options,'caxis',{[0 2],[3 4]}); %some argument checking: @@ -248,5 +248,5 @@ for i=1:length(pos), values{i}=self.list{pos(i),2}; - self.list{pos(i),3}=true; % option used + self.list{pos(i),3}=true; % option used end return; @@ -267,5 +267,5 @@ % % if warn==1 display an info message to warn user that - % some of his options have been removed. + % some of their options have been removed. %check is field exist Index: /issm/trunk-jpl/src/m/classes/pairoptions.py =================================================================== --- /issm/trunk-jpl/src/m/classes/pairoptions.py (revision 26306) +++ /issm/trunk-jpl/src/m/classes/pairoptions.py (revision 26307) @@ -14,10 +14,10 @@ self.list = OrderedDict() - #get calling function name + #get calling function name import inspect if len(inspect.stack()) > 1: self.functionname = inspect.stack()[1][3] - #initialize list + #initialize list if not len(arg): pass #Do nothing, @@ -57,5 +57,7 @@ def addfield(self, field, value): # {{{ - """ADDFIELD - add a field to an options list""" + """ADDFIELD - add a field to an options list + """ + if isinstance(field, str): if field in self.list: @@ -65,5 +67,7 @@ def addfielddefault(self, field, value): # {{{ - """ADDFIELDDEFAULT - add a field to an options list if it does not already exist""" + """ADDFIELDDEFAULT - add a field to an options list if it does not already exist + """ + if isinstance(field, str): if field not in self.list: @@ -72,5 +76,7 @@ def AssignObjectFields(self, obj2): # {{{ - """ASSIGNOBJECTFIELDS - assign object fields from options""" + """ASSIGNOBJECTFIELDS - assign object fields from options + """ + for item in list(self.list.items()): if item[0] in dir(obj2): @@ -82,11 +88,19 @@ def changefieldvalue(self, field, newvalue): # {{{ - """CHANGEOPTIONVALUE - change the value of an option in an option list""" + """CHANGEOPTIONVALUE - change the value of an option in an option list + """ self.list[field] = newvalue # }}} + def displayunused(self): #{{{ + """DISPLAYUNUSED - display unused options + """ + + disp(['WARNING: pairoptions::displayunused is not yet implemented']) + # }}} def exist(self, field): # {{{ - """EXIST - check if the option exist""" + """EXIST - check if the option exists + """ #some argument checking: @@ -104,6 +118,5 @@ def getfieldvalue(self, field, default=None): # {{{ - """ - GETOPTION - get the value of an option + """GETFIELDVALUE - get the value of an option Usage: @@ -118,5 +131,5 @@ """ - #some argument checking: + #some argument checking: if field is None or field == '': raise ValueError('getfieldvalue error message: bad usage') @@ -124,5 +137,5 @@ raise TypeError("getfieldvalue error message: field '%s' should be a string." % str(field)) - #Recover option + #Recover option if field in self.list: value = self.list[field] @@ -137,6 +150,5 @@ def removefield(self, field, warn): # {{{ - """ - REMOVEFIELD - delete a field in an option list + """REMOVEFIELD - delete a field in an option list Usage: @@ -144,5 +156,5 @@ if warn == 1 display an info message to warn user that - some of his options have been removed. + some of their options have been removed. """ Index: /issm/trunk-jpl/src/m/classes/rotational.m =================================================================== --- /issm/trunk-jpl/src/m/classes/rotational.m (revision 26306) +++ /issm/trunk-jpl/src/m/classes/rotational.m (revision 26307) @@ -20,11 +20,11 @@ end % }}} function self = setdefaultparameters(self) % {{{ - - %moment of inertia: - self.equatorialmoi =8.0077*10^37; % [kg m^2] - self.polarmoi =8.0345*10^37; % [kg m^2] - % mean rotational velocity of earth - self.angularvelocity=7.2921*10^-5; % [s^-1] + %moment of inertia: + self.equatorialmoi =8.0077*10^37; % [kg m^2] + self.polarmoi =8.0345*10^37; % [kg m^2] + + % mean rotational velocity of earth + self.angularvelocity=7.2921*10^-5; % [s^-1] end % }}} function md = checkconsistency(self,md,solution,analyses) % {{{ Index: /issm/trunk-jpl/src/m/classes/sealevelmodel.m =================================================================== --- /issm/trunk-jpl/src/m/classes/sealevelmodel.m (revision 26306) +++ /issm/trunk-jpl/src/m/classes/sealevelmodel.m (revision 26307) @@ -14,5 +14,5 @@ icecaps = {}; % list of land/ice models, name should be change longer term. earth = 0; % model for the whole earth - basins = {}; % list of basins, matching icecaps, where shapefile info is held. + basins = {}; % list of basins, matching icecaps, where shapefile info is held cluster = 0; miscellaneous = 0; @@ -50,10 +50,10 @@ for i=1:length(slm.icecaps), if slm.icecaps{i}.transient.iscoupler==0, - warning(sprintf('sealevelmodel checkconsistenty error: icecap model %s should have the transient coupler option turned on!',slm.icecaps{i}.miscellaneous.name)); + warning(sprintf('sealevelmodel checkconsistency error: 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 checkconsistenty error: earth model should have the transient coupler option turned on!'); + warning('sealevelmodel checkconsistency error: earth model should have the transient coupler option turned on!'); end @@ -61,12 +61,12 @@ for i=1:length(slm.icecaps), if slm.icecaps{i}.mesh.numberofvertices ~= length(slm.earth.solidearth.transitions{i}), - error(['sealevelmodel checkconsistenty issue with size of transition vector for ice cap: ' num2str(i) ' name: ' slm.icecaps{i}.miscellaneous.name]); - end - end - - %check that run_frequency is the same everywhere: + error(['sealevelmodel checkconsistency issue with size of transition vector for ice cap: ' num2str(i) ' name: ' slm.icecaps{i}.miscellaneous.name]); + end + end + + %check that runfrequency is the same everywhere: for i=1:length(slm.icecaps), if slm.icecaps{i}.solidearth.settings.runfrequency~=slm.earth.solidearth.settings.runfrequency, - error(sprintf('sealevelmodel checkconsistenty error: icecap model %s should have the same run frequency as earth!',slm.icecaps{i}.miscellaneous.name)); + error(sprintf('sealevelmodel checkconsistency error: icecap model %s should have the same run frequency as earth!',slm.icecaps{i}.miscellaneous.name)); end end @@ -87,4 +87,5 @@ end end + %make sure that there is no solid earth external forcing on the basins: for i=1:length(slm.icecaps), @@ -102,5 +103,4 @@ end end - end Index: /issm/trunk-jpl/src/m/classes/sealevelmodel.py =================================================================== --- /issm/trunk-jpl/src/m/classes/sealevelmodel.py (revision 26306) +++ /issm/trunk-jpl/src/m/classes/sealevelmodel.py (revision 26307) @@ -134,4 +134,5 @@ md = self.mergedcaps[2 * i] trans = self.mergedcaps[2 * i + 1] + #icecaps = self.icecaps[self.range[2 * i + 2]] for j in range(len(self.icecaps[0].results.TransientSolution)): for k in range(len(champs)): Index: /issm/trunk-jpl/src/m/classes/solidearth.m =================================================================== --- /issm/trunk-jpl/src/m/classes/solidearth.m (revision 26306) +++ /issm/trunk-jpl/src/m/classes/solidearth.m (revision 26307) @@ -3,4 +3,5 @@ % Usage: % solidearth=solidearth(); +% solidearth=solidearth('earth'); classdef solidearth @@ -79,5 +80,5 @@ self.external=[]; - %earth radius + %planet radius self.planetradius= planetradius(planet); Index: /issm/trunk-jpl/src/m/classes/solidearth.py =================================================================== --- /issm/trunk-jpl/src/m/classes/solidearth.py (revision 26306) +++ /issm/trunk-jpl/src/m/classes/solidearth.py (revision 26307) @@ -17,4 +17,8 @@ Usage: solidearth = solidearth() + solidearth = solidearth('earth') + + TODO: + - Update translation from solidearth.m """ @@ -71,5 +75,5 @@ self.external = [] - # Earth radius + # Planet radius self.planetradius = planetradius(planet) #}}} Index: /issm/trunk-jpl/src/m/classes/solidearthsolution.m =================================================================== --- /issm/trunk-jpl/src/m/classes/solidearthsolution.m (revision 26306) +++ /issm/trunk-jpl/src/m/classes/solidearthsolution.m (revision 26307) @@ -66,8 +66,8 @@ geoid_rate(end+1,:)=time(1:end-1); end - WriteData(fid,prefix,'object',self,'fieldname','displacementeast','data',displacementeast_rate,'format','DoubleMat','name', 'md.solidearth.external.displacementeast','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); - WriteData(fid,prefix,'object',self,'fieldname','displacementup','data',displacementup_rate,'format','DoubleMat','name', 'md.solidearth.external.displacementup','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); - WriteData(fid,prefix,'object',self,'fieldname','displacementnorth','data',displacementnorth_rate,'format','DoubleMat','name', 'md.solidearth.external.displacementnorth','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); - WriteData(fid,prefix,'object',self,'fieldname','geoid','data',geoid_rate,'format','DoubleMat','name', 'md.solidearth.external.geoid','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); + WriteData(fid,prefix,'object',self,'fieldname','displacementeast','data',displacementeast_rate,'format','DoubleMat','name', 'md.solidearth.external.displacementeast','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',yts); + WriteData(fid,prefix,'object',self,'fieldname','displacementup','data',displacementup_rate,'format','DoubleMat','name', 'md.solidearth.external.displacementup','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',yts); + WriteData(fid,prefix,'object',self,'fieldname','displacementnorth','data',displacementnorth_rate,'format','DoubleMat','name', 'md.solidearth.external.displacementnorth','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',yts); + WriteData(fid,prefix,'object',self,'fieldname','geoid','data',geoid_rate,'format','DoubleMat','name', 'md.solidearth.external.geoid','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',yts); end % }}} Index: /issm/trunk-jpl/src/m/solve/solve.m =================================================================== --- /issm/trunk-jpl/src/m/solve/solve.m (revision 26306) +++ /issm/trunk-jpl/src/m/solve/solve.m (revision 26307) @@ -8,27 +8,28 @@ % % Solution types available comprise: -% - 'Stressbalance' or 'sb' -% - 'Masstransport' or 'mt' -% - 'Oceantransport' or 'oceant' -% - 'Thermal' or 'th' -% - 'Steadystate' or 'ss' -% - 'Transient' or 'tr' -% - 'Balancethickness' or 'mc' -% - 'Balancevelocity' or 'bv' -% - 'BedSlope' or 'bsl' -% - 'SurfaceSlope' or 'ssl' -% - 'Hydrology' or 'hy' -% - 'DamageEvolution' or 'da' -% - 'Gia' or 'gia' -% - 'Love' or 'lv' -% - 'Esa' or 'esa' -% - 'Sampling' or 'smp' +% - 'Stressbalance' or 'sb' +% - 'Masstransport' or 'mt' +% - 'Oceantransport' or 'oceant' +% - 'Thermal' or 'th' +% - 'Steadystate' or 'ss' +% - 'Transient' or 'tr' +% - 'Balancethickness' or 'mc' +% - 'Balancethickness2' +% - 'BalancethicknessSoft' or 'mcsoft' +% - 'Balancevelocity' or 'bv' +% - 'BedSlope' or 'bsl' +% - 'SurfaceSlope' or 'ssl' +% - 'Hydrology' or 'hy' +% - 'DamageEvolution' or 'da' +% - 'Gia' or 'gia' +% - 'Love' or 'lv' +% - 'Esa' or 'esa' +% - 'Sampling' or 'smp' % % Extra options: -% - loadonly : does not solve. only load results -% - runtimename : true or false (default is true), makes name unique -% - checkconsistency : 'yes' or 'no' (default is 'yes'), ensures checks on -% consistency of model -% - restart : 'directory name (relative to the execution directory) +% - loadonly : do not solve, only load results +% - runtimename : true or false (default is true); makes name unique +% - checkconsistency : 'yes' or 'no' (default is 'yes'); checks consistency of model +% - restart : directory name (relative to the execution directory) % where the restart file is located % @@ -116,5 +117,5 @@ end -%if running QMU analysis, some preprocessing of Dakota files using models fields needs to be carried out. +%if running QMU analysis, some preprocessing of Dakota files using model fields needs to be carried out. if md.qmu.isdakota, md=preqmu(md,options); Index: /issm/trunk-jpl/src/m/solve/solve.py =================================================================== --- /issm/trunk-jpl/src/m/solve/solve.py (revision 26306) +++ /issm/trunk-jpl/src/m/solve/solve.py (revision 26307) @@ -15,30 +15,31 @@ Usage: md = solve(md, solutionstring, varargin) - + where varargin is a list of paired arguments of string OR enums Solution types available comprise: - - 'Stressbalance' or 'sb' - - 'Masstransport' or 'mt' - - 'Oceantransport' or 'oceant' - - 'Thermal' or 'th' - - 'Steadystate' or 'ss' - - 'Transient' or 'tr' - - 'Balancethickness' or 'mc' - - 'Balancevelocity' or 'bv' - - 'BedSlope' or 'bsl' - - 'SurfaceSlope' or 'ssl' - - 'Hydrology' or 'hy' - - 'DamageEvolution' or 'da' - - 'Gia' or 'gia' - - 'Love' or 'lv' - - 'Esa' or 'esa' - - 'Sampling' or 'smp' + - 'Stressbalance' or 'sb' + - 'Masstransport' or 'mt' + - 'Oceantransport' or 'oceant' + - 'Thermal' or 'th' + - 'Steadystate' or 'ss' + - 'Transient' or 'tr' + - 'Balancethickness' or 'mc' + - 'BalancethicknessSoft' or 'mcsoft' + - 'Balancevelocity' or 'bv' + - 'BedSlope' or 'bsl' + - 'SurfaceSlope' or 'ssl' + - 'Hydrology' or 'hy' + - 'DamageEvolution' or 'da' + - 'Gia' or 'gia' + - 'Love' or 'lv' + - 'Esa' or 'esa' + - 'Sampling' or 'smp' Extra options: - - loadonly : does not solve. only load results - - runtimename : true or false (default is true), makes name unique - - checkconsistency : 'yes' or 'no' (default is 'yes'), ensures checks on - consistency of model + - loadonly : do not solve, only load results + - runtimename : true or false (default is true); makes name unique + - checkconsistency : 'yes' or 'no' (default is 'yes'); checks consistency + of model - restart : directory name (relative to the execution directory) where the restart file is located @@ -114,5 +115,5 @@ md.private.runtimename = md.miscellaneous.name - # If running QMU analysis, some preprocessing of Dakota files using models + # If running QMU analysis, some preprocessing of Dakota files using model # fields needs to be carried out if md.qmu.isdakota: