Index: /issm/trunk-jpl/src/m/classes/autodiff.py =================================================================== --- /issm/trunk-jpl/src/m/classes/autodiff.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/autodiff.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports import numpy from dependent import * @@ -16,5 +15,4 @@ """ - #properties def __init__(self,*args): # {{{ self.isautodiff = False @@ -28,5 +26,4 @@ raise RuntimeError("constructor not supported") # }}} - def __repr__(self): # {{{ s =" automatic differentiation parameters:\n" @@ -39,9 +36,7 @@ return s # }}} - def setdefaultparameters(self): # {{{ return self # }}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -61,5 +56,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','isautodiff','format','Boolean') @@ -194,3 +188,2 @@ return # }}} - Index: /issm/trunk-jpl/src/m/classes/balancethickness.m =================================================================== --- /issm/trunk-jpl/src/m/classes/balancethickness.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/balancethickness.m (revision 14640) @@ -36,6 +36,6 @@ disp(sprintf(' balance thickness solution parameters:')); - fielddisplay(obj,'spcthickness','thickness constraints (NaN means no constraint)'); - fielddisplay(obj,'thickening_rate','ice thickening rate used in the mass conservation (dh/dt)'); + fielddisplay(obj,'spcthickness','thickness constraints (NaN means no constraint) [m]'); + fielddisplay(obj,'thickening_rate','ice thickening rate used in the mass conservation (dh/dt) [m/yr]'); fielddisplay(obj,'stabilization','0: None, 1: SU, 2: MacAyeal''s artificial diffusivity, 3:DG'); Index: /issm/trunk-jpl/src/m/classes/balancethickness.py =================================================================== --- /issm/trunk-jpl/src/m/classes/balancethickness.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/balancethickness.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from fielddisplay import fielddisplay from EnumDefinitions import * @@ -13,7 +12,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.spcthickness = float('NaN') self.thickening_rate = float('NaN') @@ -24,16 +21,14 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=' balance thickness solution parameters:' - string="%s\n%s"%(string,fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint)')) - string="%s\n%s"%(string,fielddisplay(self,'thickening_rate','ice thickening rate used in the mass conservation (dh/dt)')) + string="%s\n%s"%(string,fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint) [m]')) + string="%s\n%s"%(string,fielddisplay(self,'thickening_rate','ice thickening rate used in the mass conservation (dh/dt) [m/yr]')) string="%s\n%s"%(string,fielddisplay(self,'stabilization',"0: None, 1: SU, 2: MacAyeal's artificial diffusivity, 3:DG")) return string #}}} - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ #Type of stabilization used @@ -42,5 +37,4 @@ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ #Early return @@ -54,5 +48,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1) @@ -60,3 +53,2 @@ WriteData(fid,'object',self,'fieldname','stabilization','format','Integer') # }}} - Index: /issm/trunk-jpl/src/m/classes/bamggeom.py =================================================================== --- /issm/trunk-jpl/src/m/classes/bamggeom.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/bamggeom.py (revision 14640) @@ -32,5 +32,4 @@ raise TypeError("bamggeom constructor error message: unknown type of constructor call") # }}} - def __repr__(self): # {{{ s ="class '%s' object '%s' = \n" % (type(self),'self') @@ -45,3 +44,2 @@ return s # }}} - Index: /issm/trunk-jpl/src/m/classes/bamgmesh.py =================================================================== --- /issm/trunk-jpl/src/m/classes/bamgmesh.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/bamgmesh.py (revision 14640) @@ -40,5 +40,4 @@ raise TypeError("bamgmesh constructor error message: unknown type of constructor call") # }}} - def __repr__(self): # {{{ s ="class '%s' object '%s' = \n" % (type(self),'self') @@ -61,3 +60,2 @@ return s # }}} - Index: /issm/trunk-jpl/src/m/classes/basalforcings.m =================================================================== --- /issm/trunk-jpl/src/m/classes/basalforcings.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/basalforcings.m (revision 14640) @@ -38,6 +38,6 @@ disp(sprintf(' basal forcings parameters:')); - fielddisplay(obj,'melting_rate','basal melting rate (positive if melting)'); - fielddisplay(obj,'melting_rate_correction','additional melting applied when the grounding line retreats'); + fielddisplay(obj,'melting_rate','basal melting rate (positive if melting) [m/yr]'); + fielddisplay(obj,'melting_rate_correction','additional melting applied to compensate for dh/dt [m/yr]'); fielddisplay(obj,'geothermalflux','geothermal heat flux [W/m^2]'); Index: /issm/trunk-jpl/src/m/classes/basalforcings.py =================================================================== --- /issm/trunk-jpl/src/m/classes/basalforcings.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/basalforcings.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from fielddisplay import fielddisplay from EnumDefinitions import * @@ -13,7 +12,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.melting_rate = float('NaN') self.melting_rate_correction = float('NaN') @@ -24,18 +21,15 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=" basal forcings parameters:" - string="%s\n%s"%(string,fielddisplay(self,"melting_rate","basal melting rate (positive if melting)")) - string="%s\n%s"%(string,fielddisplay(self,"melting_rate_correction","additional melting applied when the grounding line retreats")) + string="%s\n%s"%(string,fielddisplay(self,"melting_rate","basal melting rate (positive if melting) [m/yr]")) + string="%s\n%s"%(string,fielddisplay(self,"melting_rate_correction","additional melting applied to compensate for dh/dt [m/yr]")) string="%s\n%s"%(string,fielddisplay(self,"geothermalflux","geothermal heat flux [W/m^2]")) return string #}}} - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -52,5 +46,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','melting_rate','format','DoubleMat','mattype',1) @@ -58,3 +51,2 @@ WriteData(fid,'object',self,'fieldname','geothermalflux','format','DoubleMat','mattype',1) # }}} - Index: /issm/trunk-jpl/src/m/classes/constants.m =================================================================== --- /issm/trunk-jpl/src/m/classes/constants.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/constants.m (revision 14640) @@ -41,7 +41,7 @@ disp(sprintf(' constants parameters:')); - fielddisplay(obj,'g','gravitational acceleration'); - fielddisplay(obj,'yts','number of seconds in a year'); - fielddisplay(obj,'referencetemperature','reference temperature used in the enthalpy model'); + fielddisplay(obj,'g','gravitational acceleration [m/s^2]'); + fielddisplay(obj,'yts','number of seconds in a year [s/yr]'); + fielddisplay(obj,'referencetemperature','reference temperature used in the enthalpy model [K]'); end % }}} Index: /issm/trunk-jpl/src/m/classes/constants.py =================================================================== --- /issm/trunk-jpl/src/m/classes/constants.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/constants.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from fielddisplay import fielddisplay from EnumDefinitions import * @@ -13,7 +12,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.g = 0 self.yts = 0 @@ -24,16 +21,14 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=" constants parameters:" - string="%s\n%s"%(string,fielddisplay(self,"g","gravitational acceleration")) - string="%s\n%s"%(string,fielddisplay(self,"yts","number of seconds in a year")) - string="%s\n%s"%(string,fielddisplay(self,"referencetemperature","reference temperature used in the enthalpy model")) + string="%s\n%s"%(string,fielddisplay(self,"g","gravitational acceleration [m/s^2]")) + string="%s\n%s"%(string,fielddisplay(self,"yts","number of seconds in a year [s/yr]")) + string="%s\n%s"%(string,fielddisplay(self,"referencetemperature","reference temperature used in the enthalpy model [K]")) return string #}}} - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ #acceleration due to gravity (m/s^2) @@ -48,5 +43,4 @@ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -57,5 +51,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','g','format','Double') @@ -63,3 +56,2 @@ WriteData(fid,'object',self,'fieldname','referencetemperature','format','Double') # }}} - Index: /issm/trunk-jpl/src/m/classes/debug.py =================================================================== --- /issm/trunk-jpl/src/m/classes/debug.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/debug.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from fielddisplay import fielddisplay from WriteData import * @@ -11,7 +10,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.valgrind = False self.gprof = False @@ -22,6 +19,5 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=" debug parameters:" @@ -31,12 +27,8 @@ return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ return self #}}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','profiling','format','Boolean') # }}} - Index: /issm/trunk-jpl/src/m/classes/dependent.py =================================================================== --- /issm/trunk-jpl/src/m/classes/dependent.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/dependent.py (revision 14640) @@ -47,5 +47,4 @@ self.segments=MeshProfileIntersection(mesh.elements,mesh.x,mesh.y,self.exp) # }}} - def __repr__(self): # {{{ s =" dependent variable:\n" @@ -62,10 +61,8 @@ return s # }}} - def setdefaultparameters(self): # {{{ #do nothing return self # }}} - def checkconsistency(self,md,solution,analyses): # {{{ if strcmpi(self.name,'MassFlux'): @@ -83,5 +80,4 @@ return md # }}} - def typetoscalar(self): # {{{ if strcmpi(self.type,'scalar'): @@ -92,3 +88,2 @@ return scalar # }}} - Index: /issm/trunk-jpl/src/m/classes/diagnostic.m =================================================================== --- /issm/trunk-jpl/src/m/classes/diagnostic.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/diagnostic.m (revision 14640) @@ -122,6 +122,6 @@ disp(sprintf('\n %s','Convergence criteria:')); fielddisplay(obj,'restol','mechanical equilibrium residual convergence criterion'); - fielddisplay(obj,'reltol','velocity relative convergence criterion, NaN -> not applied'); - fielddisplay(obj,'abstol','velocity absolute convergence criterion, NaN -> not applied'); + fielddisplay(obj,'reltol','velocity relative convergence criterion, NaN: not applied'); + fielddisplay(obj,'abstol','velocity absolute convergence criterion, NaN: not applied'); fielddisplay(obj,'isnewton','0: Picard''s fixed point, 1: Newton''s method, 2: hybrid'); fielddisplay(obj,'maxiter','maximum number of nonlinear iterations'); @@ -129,8 +129,8 @@ disp(sprintf('\n %s','boundary conditions:')); - fielddisplay(obj,'spcvx','x-axis velocity constraint (NaN means no constraint)'); - fielddisplay(obj,'spcvy','y-axis velocity constraint (NaN means no constraint)'); - fielddisplay(obj,'spcvz','z-axis velocity constraint (NaN means no constraint)'); - fielddisplay(obj,'icefront','segments on ice front list (last column 0-> Air, 1-> Water, 2->Ice)'); + fielddisplay(obj,'spcvx','x-axis velocity constraint (NaN means no constraint) [m/yr]'); + fielddisplay(obj,'spcvy','y-axis velocity constraint (NaN means no constraint) [m/yr]'); + fielddisplay(obj,'spcvz','z-axis velocity constraint (NaN means no constraint) [m/yr]'); + fielddisplay(obj,'icefront','segments on ice front list (last column 0: Air, 1: Water, 2: Ice)'); disp(sprintf('\n %s','Rift options:')); @@ -146,5 +146,5 @@ fielddisplay(obj,'stokesreconditioning','multiplier for incompressibility equation. Only for Stokes model'); fielddisplay(obj,'referential','local referential'); - fielddisplay(obj,'loadingforce','loading force applied on each point'); + fielddisplay(obj,'loadingforce','loading force applied on each point [N/m^3]'); fielddisplay(obj,'requested_outputs','additional outputs requested'); Index: /issm/trunk-jpl/src/m/classes/diagnostic.py =================================================================== --- /issm/trunk-jpl/src/m/classes/diagnostic.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/diagnostic.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports import numpy import sys @@ -16,7 +15,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.spcvx = float('NaN') self.spcvy = float('NaN') @@ -43,13 +40,11 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=' Diagnostic solution parameters:' string="%s\n%s"%(string,' Convergence criteria:') - string="%s\n%s"%(string,fielddisplay(self,'restol','mechanical equilibrium residual convergence criterion')) - string="%s\n%s"%(string,fielddisplay(self,'reltol','velocity relative convergence criterion, NaN -> not applied')) - string="%s\n%s"%(string,fielddisplay(self,'abstol','velocity absolute convergence criterion, NaN -> not applied')) + string="%s\n%s"%(string,fielddisplay(self,'reltol','velocity relative convergence criterion, NaN: not applied')) + string="%s\n%s"%(string,fielddisplay(self,'abstol','velocity absolute convergence criterion, NaN: not applied')) string="%s\n%s"%(string,fielddisplay(self,'isnewton',"0: Picard's fixed point, 1: Newton's method, 2: hybrid")) string="%s\n%s"%(string,fielddisplay(self,'maxiter','maximum number of nonlinear iterations')) @@ -57,9 +52,8 @@ string="%s\n%s"%(string,'\n boundary conditions:') - - string="%s\n%s"%(string,fielddisplay(self,'spcvx','x-axis velocity constraint (NaN means no constraint)')) - string="%s\n%s"%(string,fielddisplay(self,'spcvy','y-axis velocity constraint (NaN means no constraint)')) - string="%s\n%s"%(string,fielddisplay(self,'spcvz','z-axis velocity constraint (NaN means no constraint)')) - string="%s\n%s"%(string,fielddisplay(self,'icefront','segments on ice front list (last column 0-> Air, 1-> Water, 2->Ice')) + string="%s\n%s"%(string,fielddisplay(self,'spcvx','x-axis velocity constraint (NaN means no constraint) [m/yr]')) + string="%s\n%s"%(string,fielddisplay(self,'spcvy','y-axis velocity constraint (NaN means no constraint) [m/yr]')) + string="%s\n%s"%(string,fielddisplay(self,'spcvz','z-axis velocity constraint (NaN means no constraint) [m/yr]')) + string="%s\n%s"%(string,fielddisplay(self,'icefront','segments on ice front list (last column 0: Air, 1: Water, 2: Ice')) string="%s\n%s"%(string,'\n Rift options:') @@ -75,12 +69,10 @@ string="%s\n%s"%(string,fielddisplay(self,'stokesreconditioning','multiplier for incompressibility equation. Only for Stokes model')) string="%s\n%s"%(string,fielddisplay(self,'referential','local referential')) - string="%s\n%s"%(string,fielddisplay(self,'loadingforce','loading force applied on each point')) + string="%s\n%s"%(string,fielddisplay(self,'loadingforce','loading force applied on each point [N/m^3]')) string="%s\n%s"%(string,fielddisplay(self,'requested_outputs','additional outputs requested')) return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ #maximum of non-linear iterations. self.maxiter=100 @@ -112,5 +104,4 @@ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -169,5 +160,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','spcvx','format','DoubleMat','mattype',1) @@ -199,3 +189,2 @@ WriteData(fid,'data',data,'enum',DiagnosticIcefrontEnum(),'format','DoubleMat','mattype',3) # }}} - Index: /issm/trunk-jpl/src/m/classes/flaim.py =================================================================== --- /issm/trunk-jpl/src/m/classes/flaim.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/flaim.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports import numpy from collections import OrderedDict @@ -15,7 +14,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.targets = '' self.tracks = '' @@ -32,6 +29,5 @@ self.opt_niter = 30000 #}}} - def __repr__(self): - # {{{ Displa + def __repr__(self): # {{{ string=' FLAIM - Flight Line Adaptation using Ice sheet Modeling:' @@ -61,5 +57,4 @@ return string #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -76,3 +71,2 @@ return md # }}} - Index: /issm/trunk-jpl/src/m/classes/flowequation.py =================================================================== --- /issm/trunk-jpl/src/m/classes/flowequation.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/flowequation.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports import numpy import copy @@ -15,7 +14,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.ismacayealpattyn = 0 @@ -33,6 +30,5 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=' flow equation parameters:' @@ -48,10 +44,7 @@ return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -80,5 +73,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','ismacayealpattyn','format','Boolean') @@ -113,3 +105,2 @@ WriteData(fid,'data',data,'enum',FlowequationElementEquationEnum(),'format','DoubleMat','mattype',2) # }}} - Index: /issm/trunk-jpl/src/m/classes/friction.py =================================================================== --- /issm/trunk-jpl/src/m/classes/friction.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/friction.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from fielddisplay import fielddisplay from EnumDefinitions import * @@ -13,7 +12,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.coefficient = float('NaN') self.p = float('NaN') @@ -24,6 +21,5 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string="Sigma= drag^2 * Neff ^r * u ^s, with Neff=rho_ice*g*thickness+rho_water*g*bed, r=q/p and s=1/p" @@ -33,10 +29,7 @@ return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -51,5 +44,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','coefficient','format','DoubleMat','mattype',1) @@ -57,3 +49,2 @@ WriteData(fid,'object',self,'fieldname','q','format','DoubleMat','mattype',2) # }}} - Index: /issm/trunk-jpl/src/m/classes/geometry.m =================================================================== --- /issm/trunk-jpl/src/m/classes/geometry.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/geometry.m (revision 14640) @@ -39,8 +39,8 @@ disp(sprintf(' geometry parameters:')); - fielddisplay(obj,'surface','surface elevation'); - fielddisplay(obj,'thickness','ice thickness'); - fielddisplay(obj,'bed','bed elevation'); - fielddisplay(obj,'bathymetry','bathymetry elevation'); + fielddisplay(obj,'surface','surface elevation [m]'); + fielddisplay(obj,'thickness','ice thickness [m]'); + fielddisplay(obj,'bed','bed elevation [m]'); + fielddisplay(obj,'bathymetry','bathymetry elevation [m]'); fielddisplay(obj,'hydrostatic_ratio','coefficient for ice shelves'' thickness correction: hydrostatic_ratio H_obs+ (1-hydrostatic_ratio) H_hydro'); Index: /issm/trunk-jpl/src/m/classes/geometry.py =================================================================== --- /issm/trunk-jpl/src/m/classes/geometry.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/geometry.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from fielddisplay import fielddisplay from EnumDefinitions import * @@ -13,7 +12,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.surface = float('NaN') self.thickness = float('NaN') @@ -26,22 +23,17 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=" geometry parameters:" - - string="%s\n%s"%(string,fielddisplay(self,'surface','surface elevation')) - string="%s\n%s"%(string,fielddisplay(self,'thickness','ice thickness')) - string="%s\n%s"%(string,fielddisplay(self,'bed','bed elevation')) - string="%s\n%s"%(string,fielddisplay(self,'bathymetry','bathymetry elevation')) + string="%s\n%s"%(string,fielddisplay(self,'surface','surface elevation [m]')) + string="%s\n%s"%(string,fielddisplay(self,'thickness','ice thickness [m]')) + string="%s\n%s"%(string,fielddisplay(self,'bed','bed elevation [m]')) + string="%s\n%s"%(string,fielddisplay(self,'bathymetry','bathymetry elevation [m]')) string="%s\n%s"%(string,fielddisplay(self,'hydrostatic_ratio','coefficient for ice shelves'' thickness correction: hydrostatic_ratio H_obs+ (1-hydrostatic_ratio) H_hydro')) return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -56,5 +48,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'data',self.surface,'format','DoubleMat','mattype',1,'enum',SurfaceEnum()) @@ -64,3 +55,2 @@ WriteData(fid,'object',self,'fieldname','hydrostatic_ratio','format','DoubleMat','mattype',1) # }}} - Index: /issm/trunk-jpl/src/m/classes/groundingline.m =================================================================== --- /issm/trunk-jpl/src/m/classes/groundingline.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/groundingline.m (revision 14640) @@ -1,3 +1,3 @@ -%CONSTANTS class definition +%GROUNDINGLINE class definition % % Usage: @@ -48,8 +48,7 @@ end % }}} function disp(obj) % {{{ - disp(sprintf(' balance thickness solution parameters:')); - + disp(sprintf(' grounding line migration parameters:')); fielddisplay(obj,'migration','type of grounding line migration: ''SoftMigration'',''AgressiveMigration'' or ''None'''); - fielddisplay(obj,'melting_rate','melting rate applied when previously grounded parts start floating'); + fielddisplay(obj,'melting_rate','melting rate applied when previously grounded parts start floating [m/yr]'); end % }}} Index: /issm/trunk-jpl/src/m/classes/groundingline.py =================================================================== --- /issm/trunk-jpl/src/m/classes/groundingline.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/groundingline.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports import numpy from fielddisplay import fielddisplay @@ -10,5 +9,5 @@ class groundingline(object): """ - CONSTANTS class definition + GROUNDINGLINE class definition Usage: @@ -16,7 +15,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.migration='' self.melting_rate=float('NaN') @@ -26,14 +23,12 @@ #}}} - def __repr__(self): - # {{{ Display - string=' grounding line solution parameters:' + def __repr__(self): # {{{ + string=' grounding line migration parameters:' string="%s\n%s"%(string,fielddisplay(self,'migration','type of grounding line migration: ''SoftMigration'',''AgressiveMigration'' or ''None''')) - string="%s\n%s"%(string,fielddisplay(self,'melting_rate','melting rate applied when previously grounded parts start floating')) + string="%s\n%s"%(string,fielddisplay(self,'melting_rate','melting rate applied when previously grounded parts start floating [m/yr]')) return string #}}} - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ #Type of migration @@ -45,5 +40,4 @@ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -62,8 +56,6 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'data',StringToEnum(self.migration)[0],'enum',GroundinglineMigrationEnum(),'format','Integer') WriteData(fid,'object',self,'fieldname','melting_rate','format','Double') # }}} - Index: /issm/trunk-jpl/src/m/classes/hydrologydc.m =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologydc.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/hydrologydc.m (revision 14640) @@ -50,11 +50,11 @@ disp(sprintf(' hydrology Dual Porous Continuum Equivalent parameters:')); - fielddisplay(obj,'spcsediment_head','sediment water head constraints (NaN means no constraint, meters above MSL)'); - fielddisplay(obj,'sediment_compressibility','sediment compressibility (Pa -1)'); - fielddisplay(obj,'sediment_porosity','sediment(dimensionless)'); - fielddisplay(obj,'sediment_thickness','sediment thickness (meters)'); - fielddisplay(obj,'sediment_transmitivity','sediment transmitivity (m2 s-1)'); - fielddisplay(obj,'water_compressibility','water compressibility (Pa -1)'); - fielddisplay(obj,'water_density','water density (kg m 3)'); + fielddisplay(obj,'spcsediment_head','sediment water head constraints (NaN means no constraint) [m above MSL]'); + fielddisplay(obj,'sediment_compressibility','sediment compressibility [Pa^-1]'); + fielddisplay(obj,'sediment_porosity','sediment [dimensionless]'); + fielddisplay(obj,'sediment_thickness','sediment thickness [m]'); + fielddisplay(obj,'sediment_transmitivity','sediment transmitivity [m^2/s]'); + fielddisplay(obj,'water_compressibility','water compressibility [Pa^-1]'); + fielddisplay(obj,'water_density','water density [kg/m^3]'); end % }}} Index: /issm/trunk-jpl/src/m/classes/hydrologyshreve.m =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologyshreve.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/hydrologyshreve.m (revision 14640) @@ -48,5 +48,5 @@ disp(sprintf(' hydrologyshreve solution parameters:')); - fielddisplay(obj,'spcwatercolumn','water thickness constraints (NaN means no constraint)'); + fielddisplay(obj,'spcwatercolumn','water thickness constraints (NaN means no constraint) [m]'); fielddisplay(obj,'n','Manning roughness coefficient'); fielddisplay(obj,'CR','tortuosity parameter'); Index: /issm/trunk-jpl/src/m/classes/hydrologyshreve.py =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologyshreve.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/hydrologyshreve.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from fielddisplay import fielddisplay from EnumDefinitions import * @@ -13,7 +12,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.spcwatercolumn = float('NaN') self.n = 0 @@ -28,9 +25,8 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=' hydrologyshreve solution parameters:' - string="%s\n%s"%(string,fielddisplay(self,'spcwatercolumn','water thickness constraints (NaN means no constraint)')) + string="%s\n%s"%(string,fielddisplay(self,'spcwatercolumn','water thickness constraints (NaN means no constraint) [m]')) string="%s\n%s"%(string,fielddisplay(self,'n','Manning roughness coefficient')) string="%s\n%s"%(string,fielddisplay(self,'CR','tortuosity parameter')) @@ -41,7 +37,5 @@ return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ #Parameters from Johnson's 2002 thesis, section 3.5.4 @@ -57,5 +51,4 @@ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -69,5 +62,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'enum',HydrologyEnum(),'data',HydrologyshreveEnum(),'format','Integer'); @@ -80,3 +72,2 @@ WriteData(fid,'object',self,'fieldname','stabilization','format','Double') # }}} - Index: /issm/trunk-jpl/src/m/classes/independent.py =================================================================== --- /issm/trunk-jpl/src/m/classes/independent.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/independent.py (revision 14640) @@ -30,5 +30,4 @@ self=options.AssignObjectFields(self) # }}} - def __repr__(self): # {{{ s =" independent variable:\n" @@ -43,10 +42,8 @@ return s # }}} - def setdefaultparameters(self): # {{{ #do nothing return self # }}} - def checkconsistency(self,md,i,solution,analyses,driver): # {{{ if not numpy.isnan(self.fos_forward_index): @@ -65,5 +62,4 @@ return md # }}} - def typetoscalar(self): # {{{ if strcmpi(self.type,'scalar'): @@ -74,3 +70,2 @@ return scalar # }}} - Index: /issm/trunk-jpl/src/m/classes/initialization.m =================================================================== --- /issm/trunk-jpl/src/m/classes/initialization.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/initialization.m (revision 14640) @@ -69,15 +69,15 @@ disp(sprintf(' initial field values:')); - fielddisplay(obj,'vx','x component of velocity'); - fielddisplay(obj,'vy','y component of velocity'); - fielddisplay(obj,'vz','z component of velocity'); - fielddisplay(obj,'vel','velocity norm'); - fielddisplay(obj,'pressure','pressure field'); - fielddisplay(obj,'temperature','temperature in Kelvins'); - fielddisplay(obj,'surfacetemp','surface temperature in Kelvins'); - fielddisplay(obj,'basaltemp','basal temperature in Kelvins'); + fielddisplay(obj,'vx','x component of velocity [m/yr]'); + fielddisplay(obj,'vy','y component of velocity [m/yr]'); + fielddisplay(obj,'vz','z component of velocity [m/yr]'); + fielddisplay(obj,'vel','velocity norm [m/yr]'); + fielddisplay(obj,'pressure','pressure field [Pa]'); + fielddisplay(obj,'temperature','temperature [K]'); + fielddisplay(obj,'surfacetemp','surface temperature [K]'); + fielddisplay(obj,'basaltemp','basal temperature [K]'); fielddisplay(obj,'waterfraction','fraction of water in the ice'); - fielddisplay(obj,'sediment_head','sediment water head of subglacial system (meters)'); - fielddisplay(obj,'watercolumn','thickness of subglacial water'); + fielddisplay(obj,'sediment_head','sediment water head of subglacial system [m]'); + fielddisplay(obj,'watercolumn','thickness of subglacial water [m]'); end % }}} Index: /issm/trunk-jpl/src/m/classes/initialization.py =================================================================== --- /issm/trunk-jpl/src/m/classes/initialization.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/initialization.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports import numpy from fielddisplay import fielddisplay @@ -14,7 +13,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.vx = float('NaN') @@ -29,5 +26,4 @@ self.watercolumn = float('NaN') self.sediment_head = float('NaN') - self.water_pressure = float('NaN') #set defaults @@ -35,29 +31,24 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=' initial field values:' - string="%s\n%s"%(string,fielddisplay(self,'vx','x component of velocity')) - string="%s\n%s"%(string,fielddisplay(self,'vy','y component of velocity')) - string="%s\n%s"%(string,fielddisplay(self,'vz','z component of velocity')) - string="%s\n%s"%(string,fielddisplay(self,'vel','velocity norm')) - string="%s\n%s"%(string,fielddisplay(self,'pressure','pressure field')) - string="%s\n%s"%(string,fielddisplay(self,'temperature','temperature in Kelvins')) - string="%s\n%s"%(string,fielddisplay(self,'surfacetemp','surface temperature in Kelvins')) - string="%s\n%s"%(string,fielddisplay(self,'basaltemp','basal temperature in Kelvins')) + string="%s\n%s"%(string,fielddisplay(self,'vx','x component of velocity [m/yr]')) + string="%s\n%s"%(string,fielddisplay(self,'vy','y component of velocity [m/yr]')) + string="%s\n%s"%(string,fielddisplay(self,'vz','z component of velocity [m/yr]')) + string="%s\n%s"%(string,fielddisplay(self,'vel','velocity norm [m/yr]')) + string="%s\n%s"%(string,fielddisplay(self,'pressure','pressure [Pa]')) + string="%s\n%s"%(string,fielddisplay(self,'temperature','temperature [K]')) + string="%s\n%s"%(string,fielddisplay(self,'surfacetemp','surface temperature [K]')) + string="%s\n%s"%(string,fielddisplay(self,'basaltemp','basal temperature [K]')) string="%s\n%s"%(string,fielddisplay(self,'waterfraction','fraction of water in the ice')) - string="%s\n%s"%(string,fielddisplay(self,'watercolumn','thickness of subglacial water')) - string="%s\n%s"%(string,fielddisplay(self,'sediment_head','sediment water head of subglacial system (meters)')) - string="%s\n%s"%(string,fielddisplay(self,'water_pressure','water pressure due to the sediment head (Pa)')) + string="%s\n%s"%(string,fielddisplay(self,'watercolumn','thickness of subglacial water [m]')) + string="%s\n%s"%(string,fielddisplay(self,'sediment_head','sediment water head of subglacial system [m]')) return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ if DiagnosticHorizAnalysisEnum() in analyses: @@ -86,5 +77,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'data',self.vx,'format','DoubleMat','mattype',1,'enum',VxEnum()) @@ -97,3 +87,2 @@ WriteData(fid,'data',self.sediment_head,'format','DoubleMat','mattype',1,'enum',SedimentHeadEnum()) # }}} - Index: /issm/trunk-jpl/src/m/classes/inversion.m =================================================================== --- /issm/trunk-jpl/src/m/classes/inversion.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/inversion.m (revision 14640) @@ -134,6 +134,6 @@ disp(sprintf(' inversion parameters:')); fielddisplay(obj,'iscontrol','is inversion activated?'); - fielddisplay(obj,'incomplete_adjoint','do we assume linear viscosity?'); - fielddisplay(obj,'control_parameters','parameter where inverse control is carried out; ex: {''FrictionCoefficient''}, or {''MaterialsRheologyBbar''}'); + fielddisplay(obj,'incomplete_adjoint','1: linear viscosity, 0: non-linear viscosity'); + fielddisplay(obj,'control_parameters','ex: {''FrictionCoefficient''}, or {''MaterialsRheologyBbar''}'); fielddisplay(obj,'nsteps','number of optimization searches'); fielddisplay(obj,'cost_functions','indicate the type of response for each optimization step'); @@ -146,7 +146,7 @@ fielddisplay(obj,'max_parameters','absolute maximum acceptable value of the inversed parameter on each vertex'); fielddisplay(obj,'gradient_only','stop control method solution at gradient'); - fielddisplay(obj,'vx_obs','observed velocity x component [m/a]'); - fielddisplay(obj,'vy_obs','observed velocity y component [m/a]'); - fielddisplay(obj,'vel_obs','observed velocity magnitude [m/a]'); + fielddisplay(obj,'vx_obs','observed velocity x component [m/yr]'); + fielddisplay(obj,'vy_obs','observed velocity y component [m/yr]'); + fielddisplay(obj,'vel_obs','observed velocity magnitude [m/yr]'); fielddisplay(obj,'thickness_obs','observed thickness [m]'); disp('Available cost functions:'); Index: /issm/trunk-jpl/src/m/classes/inversion.py =================================================================== --- /issm/trunk-jpl/src/m/classes/inversion.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/inversion.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports import numpy import copy @@ -16,7 +15,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.iscontrol = 0 self.tao = 0 @@ -43,10 +40,9 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=' inversion parameters:' string="%s\n%s"%(string,fielddisplay(self,'iscontrol','is inversion activated?')) - string="%s\n%s"%(string,fielddisplay(self,'incomplete_adjoint','do we assume linear viscosity?')) - string="%s\n%s"%(string,fielddisplay(self,'control_parameters','parameter where inverse control is carried out; ex: {''FrictionCoefficient''}, or {''MaterialsRheologyBbar''}')) + string="%s\n%s"%(string,fielddisplay(self,'incomplete_adjoint','1: linear viscosity, 0: non-linear viscosity')) + string="%s\n%s"%(string,fielddisplay(self,'control_parameters','ex: {''FrictionCoefficient''}, or {''MaterialsRheologyBbar''}')) string="%s\n%s"%(string,fielddisplay(self,'nsteps','number of optimization searches')) string="%s\n%s"%(string,fielddisplay(self,'cost_functions','indicate the type of response for each optimization step')) @@ -59,7 +55,7 @@ string="%s\n%s"%(string,fielddisplay(self,'max_parameters','absolute maximum acceptable value of the inversed parameter on each vertex')) string="%s\n%s"%(string,fielddisplay(self,'gradient_only','stop control method solution at gradient')) - string="%s\n%s"%(string,fielddisplay(self,'vx_obs','observed velocity x component [m/a]')) - string="%s\n%s"%(string,fielddisplay(self,'vy_obs','observed velocity y component [m/a]')) - string="%s\n%s"%(string,fielddisplay(self,'vel_obs','observed velocity magnitude [m/a]')) + string="%s\n%s"%(string,fielddisplay(self,'vx_obs','observed velocity x component [m/yr]')) + string="%s\n%s"%(string,fielddisplay(self,'vy_obs','observed velocity y component [m/yr]')) + string="%s\n%s"%(string,fielddisplay(self,'vel_obs','observed velocity magnitude [m/yr]')) string="%s\n%s"%(string,fielddisplay(self,'thickness_obs','observed thickness [m]')) string="%s\n%s"%(string,'Available cost functions:') @@ -75,5 +71,4 @@ return string #}}} - def setdefaultparameters(self): # {{{ @@ -117,5 +112,4 @@ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -149,5 +143,4 @@ return md # }}} - def marshall(self,fid): # {{{ @@ -194,3 +187,2 @@ WriteData(fid,'data',num_cost_functions,'enum',InversionNumCostFunctionsEnum(),'format','Integer') # }}} - Index: /issm/trunk-jpl/src/m/classes/mask.py =================================================================== --- /issm/trunk-jpl/src/m/classes/mask.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/mask.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from fielddisplay import fielddisplay from EnumDefinitions import * @@ -13,7 +12,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.elementonfloatingice = float('NaN') self.elementongroundedice = float('NaN') @@ -27,6 +24,5 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=" masks:" @@ -39,10 +35,7 @@ return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -56,5 +49,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','elementonfloatingice','format','BooleanMat','mattype',2) @@ -65,3 +57,2 @@ WriteData(fid,'object',self,'fieldname','vertexonwater','format','DoubleMat','mattype',1) # }}} - Index: /issm/trunk-jpl/src/m/classes/matdamageice.py =================================================================== --- /issm/trunk-jpl/src/m/classes/matdamageice.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/matdamageice.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from fielddisplay import fielddisplay from EnumDefinitions import * @@ -37,5 +36,25 @@ # }}} + def __repr__(self): # {{{ + s =' Materials:\n' + s+="%s\n" % fielddisplay(self,"rho_ice","ice density [kg/m^3]") + s+="%s\n" % fielddisplay(self,"rho_water","ocean water density [kg/m^3]") + s+="%s\n" % fielddisplay(self,"rho_freshwater","fresh water density [kg/m^3]") + s+="%s\n" % fielddisplay(self,"mu_water","water viscosity [N s/m^2]") + s+="%s\n" % fielddisplay(self,"heatcapacity","heat capacity [J/kg/K]") + s+="%s\n" % fielddisplay(self,"thermalconductivity","ice thermal conductivity [W/m/K]") + s+="%s\n" % fielddisplay(self,"meltingpoint","melting point of ice at 1atm in K") + s+="%s\n" % fielddisplay(self,"latentheat","latent heat of fusion [J/m^3]") + s+="%s\n" % fielddisplay(self,"beta","rate of change of melting point with pressure [K/Pa]") + s+="%s\n" % fielddisplay(self,"mixed_layer_capacity","mixed layer capacity [W/kg/K]") + s+="%s\n" % fielddisplay(self,"thermal_exchange_velocity","thermal exchange velocity [m/s]") + s+="%s\n" % fielddisplay(self,"rheology_B","flow law parameter [Pa/s^(1/n)]") + s+="%s\n" % fielddisplay(self,"rheology_n","Glen's flow law exponent") + s+="%s\n" % fielddisplay(self,"rheology_Z","rheology multiplier") + s+="%s\n" % fielddisplay(self,"rheology_law","law for the temperature dependance of the rheology: 'None', 'Paterson' or 'Arrhenius'") + + return s + # }}} def setdefaultparameters(self): # {{{ @@ -77,5 +96,4 @@ self.rheology_law='Paterson' # }}} - def checkconsistency(self,md,solution,analyses): # {{{ md = checkfield(md,'materials.rho_ice','>',0) @@ -90,27 +108,4 @@ return md # }}} - - def __repr__(self): # {{{ - s =' Materials:\n' - - s+="%s\n" % fielddisplay(self,"rho_ice","ice density [kg/m^3]") - s+="%s\n" % fielddisplay(self,"rho_water","ocean water density [kg/m^3]") - s+="%s\n" % fielddisplay(self,"rho_freshwater","fresh water density [kg/m^3]") - s+="%s\n" % fielddisplay(self,"mu_water","water viscosity [N s/m^2]") - s+="%s\n" % fielddisplay(self,"heatcapacity","heat capacity [J/kg/K]") - s+="%s\n" % fielddisplay(self,"thermalconductivity","ice thermal conductivity [W/m/K]") - s+="%s\n" % fielddisplay(self,"meltingpoint","melting point of ice at 1atm in K") - s+="%s\n" % fielddisplay(self,"latentheat","latent heat of fusion [J/m^3]") - s+="%s\n" % fielddisplay(self,"beta","rate of change of melting point with pressure [K/Pa]") - s+="%s\n" % fielddisplay(self,"mixed_layer_capacity","mixed layer capacity [W/kg/K]") - s+="%s\n" % fielddisplay(self,"thermal_exchange_velocity","thermal exchange velocity [m/s]") - s+="%s\n" % fielddisplay(self,"rheology_B","flow law parameter [Pa/s^(1/n)]") - s+="%s\n" % fielddisplay(self,"rheology_n","Glen's flow law exponent") - s+="%s\n" % fielddisplay(self,"rheology_Z","rheology multiplier") - s+="%s\n" % fielddisplay(self,"rheology_law","law for the temperature dependance of the rheology: 'None', 'Paterson' or 'Arrhenius'") - - return s - # }}} - def marshall(self,fid): # {{{ WriteData(fid,'enum',MaterialsEnum(),'data',MatdamageiceEnum(),'format','Integer') @@ -131,3 +126,2 @@ WriteData(fid,'data',StringToEnum(self.rheology_law)[0],'enum',MaterialsRheologyLawEnum(),'format','Integer') # }}} - Index: /issm/trunk-jpl/src/m/classes/matice.py =================================================================== --- /issm/trunk-jpl/src/m/classes/matice.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/matice.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from fielddisplay import fielddisplay from EnumDefinitions import * @@ -14,7 +13,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.rho_ice = 0. self.rho_water = 0. @@ -34,6 +31,5 @@ self.setdefaultparameters() #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=" Materials:" @@ -55,6 +51,5 @@ return string #}}} - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ #ice density (kg/m^3) self.rho_ice=917. @@ -95,5 +90,4 @@ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ md = checkfield(md,'materials.rho_ice','>',0) @@ -106,5 +100,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'enum',MaterialsEnum(),'data',MaticeEnum(),'format','Integer'); @@ -124,3 +117,2 @@ WriteData(fid,'data',StringToEnum(self.rheology_law)[0],'enum',MaterialsRheologyLawEnum(),'format','Integer') # }}} - Index: /issm/trunk-jpl/src/m/classes/mesh.m =================================================================== --- /issm/trunk-jpl/src/m/classes/mesh.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/mesh.m (revision 14640) @@ -143,6 +143,6 @@ fielddisplay(obj,'numberofvertices2d','number of vertices'); fielddisplay(obj,'elements2d','vertex indices of the mesh elements'); - fielddisplay(obj,'x2d','vertices x coordinate'); - fielddisplay(obj,'y2d','vertices y coordinate'); + fielddisplay(obj,'x2d','vertices x coordinate [m]'); + fielddisplay(obj,'y2d','vertices y coordinate [m]'); disp(sprintf('\n Elements and vertices of the extruded 3d mesh:')); @@ -153,12 +153,12 @@ fielddisplay(obj,'numberofvertices','number of vertices'); fielddisplay(obj,'elements','vertex indices of the mesh elements'); - fielddisplay(obj,'x','vertices x coordinate'); - fielddisplay(obj,'y','vertices y coordinate'); - fielddisplay(obj,'z','vertices z coordinate'); + fielddisplay(obj,'x','vertices x coordinate [m]'); + fielddisplay(obj,'y','vertices y coordinate [m]'); + fielddisplay(obj,'z','vertices z coordinate [m]'); fielddisplay(obj,'edges','edges of the 2d mesh (vertex1 vertex2 element1 element2)'); fielddisplay(obj,'numberofedges','number of edges of the 2d mesh'); disp(sprintf('\n Properties:')); - fielddisplay(obj,'dimension','mesh dimension (2d or 3d)'); + fielddisplay(obj,'dimension','mesh dimension'); fielddisplay(obj,'numberoflayers','number of extrusion layers'); fielddisplay(obj,'vertexonbed','lower vertices flags list'); @@ -183,6 +183,6 @@ disp(sprintf('\n Projection:')); - fielddisplay(obj,'lat','vertices latitude'); - fielddisplay(obj,'long','vertices longitude'); + fielddisplay(obj,'lat','vertices latitude [degrees]'); + fielddisplay(obj,'long','vertices longitude [degrees]'); fielddisplay(obj,'hemisphere','Indicate hemisphere ''n'' or ''s'' '); end % }}} Index: /issm/trunk-jpl/src/m/classes/mesh.py =================================================================== --- /issm/trunk-jpl/src/m/classes/mesh.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/mesh.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports import numpy from fielddisplay import fielddisplay @@ -14,7 +13,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.x = float('NaN'); self.y = float('NaN'); @@ -61,6 +58,5 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=" Mesh:" @@ -72,6 +68,6 @@ string="%s\n%s"%(string,fielddisplay(self,"numberofvertices2d","number of vertices")) string="%s\n%s"%(string,fielddisplay(self,"elements2d","vertex indices of the mesh elements")) - string="%s\n%s"%(string,fielddisplay(self,"x2d","vertices x coordinate")) - string="%s\n%s"%(string,fielddisplay(self,"y2d","vertices y coordinate")) + string="%s\n%s"%(string,fielddisplay(self,"x2d","vertices x coordinate [m]")) + string="%s\n%s"%(string,fielddisplay(self,"y2d","vertices y coordinate [m]")) string="%s\n%s"%(string,"\n\n Elements and vertices of the extruded 3d mesh:") @@ -81,7 +77,7 @@ string="%s\n%s"%(string,fielddisplay(self,"numberofvertices","number of vertices")) string="%s\n%s"%(string,fielddisplay(self,"elements","vertex indices of the mesh elements")) - string="%s\n%s"%(string,fielddisplay(self,"x","vertices x coordinate")) - string="%s\n%s"%(string,fielddisplay(self,"y","vertices y coordinate")) - string="%s\n%s"%(string,fielddisplay(self,"z","vertices z coordinate")) + string="%s\n%s"%(string,fielddisplay(self,"x","vertices x coordinate [m]")) + string="%s\n%s"%(string,fielddisplay(self,"y","vertices y coordinate [m]")) + string="%s\n%s"%(string,fielddisplay(self,"z","vertices z coordinate [m]")) string="%s\n%s"%(string,fielddisplay(self,"edges","edges of the 2d mesh (vertex1 vertex2 element1 element2)")) string="%s\n%s"%(string,fielddisplay(self,"numberofedges","number of edges of the 2d mesh")) @@ -110,12 +106,10 @@ string="%s%s"%(string,"\n\n Projection:") - string="%s\n%s"%(string,fielddisplay(self,"lat","vertices latitude")) - string="%s\n%s"%(string,fielddisplay(self,"long","vertices longitude")) + string="%s\n%s"%(string,fielddisplay(self,"lat","vertices latitude [degrees]")) + string="%s\n%s"%(string,fielddisplay(self,"long","vertices longitude [degrees]")) string="%s\n%s"%(string,fielddisplay(self,"hemisphere","Indicate hemisphere 'n' or 's'")) return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ #the connectivity is the averaged number of nodes linked to a @@ -128,5 +122,4 @@ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -177,5 +170,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','x','format','DoubleMat','mattype',1) @@ -201,3 +193,2 @@ WriteData(fid,'object',self,'fieldname','numberofelements2d','format','Integer') # }}} - Index: /issm/trunk-jpl/src/m/classes/miscellaneous.py =================================================================== --- /issm/trunk-jpl/src/m/classes/miscellaneous.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/miscellaneous.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from collections import OrderedDict from fielddisplay import fielddisplay @@ -14,7 +13,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.notes = '' self.name = '' @@ -25,6 +22,5 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=' miscellaneous parameters:' @@ -34,17 +30,12 @@ return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ md = checkfield(md,'miscellaneous.name','empty',1) return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','name','format','String') # }}} - Index: /issm/trunk-jpl/src/m/classes/organizer.py =================================================================== --- /issm/trunk-jpl/src/m/classes/organizer.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/organizer.py (revision 14640) @@ -63,5 +63,4 @@ self.trunkprefix=trunkprefix #}}} - def __repr__(self): # {{{ s ="" @@ -75,5 +74,4 @@ s+="%s\n" % " step #%2i: '%s'",step['id'],step['string'] #}}} - def load(self,string): # {{{ @@ -93,5 +91,4 @@ return md #}}} - def loadmodel(self,string): # {{{ @@ -118,5 +115,4 @@ raise IOerror("Could not find '%s'" % path) #}}} - def perform(self,string): # {{{ @@ -153,5 +149,4 @@ return bool #}}} - def savemodel(self,md): # {{{ @@ -174,3 +169,2 @@ savevars(name,'md',md) #}}} - Index: /issm/trunk-jpl/src/m/classes/pairoptions.py =================================================================== --- /issm/trunk-jpl/src/m/classes/pairoptions.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/pairoptions.py (revision 14640) @@ -11,5 +11,5 @@ """ - def __init__(self,*arg): + def __init__(self,*arg): # {{{ self.functionname = '' self.list = OrderedDict() @@ -26,5 +26,19 @@ self.buildlist(*arg) # }}} - + def __repr__(self): # {{{ + s=" functionname: '%s'\n" % self.functionname + if self.list: + s+=" list: (%ix%i)\n\n" % (len(self.list),2) + for item in self.list.iteritems(): + if isinstance(item[1],(str,unicode)): + s+=" field: %-10s value: '%s'\n" % (item[0],item[1]) + elif isinstance(item[1],(bool,int,long,float)): + s+=" field: %-10s value: %g\n" % (item[0],item[1]) + else: + s+=" field: %-10s value: %s\n" % (item[0],type(item[1])) + else: + s+=" list: empty\n" + return s + # }}} def buildlist(self,*arg): # {{{ """BUILDLIST - build list of objects from input""" @@ -43,5 +57,4 @@ print "WARNING: option number %d is not a string and will be ignored." % (i+1) # }}} - def addfield(self,field,value): # {{{ """ADDFIELD - add a field to an options list""" @@ -51,5 +64,4 @@ self.list[field] = value # }}} - def addfielddefault(self,field,value): # {{{ """ADDFIELDDEFAULT - add a field to an options list if it does not already exist""" @@ -58,5 +70,4 @@ self.list[field] = value # }}} - def AssignObjectFields(self,obj2): # {{{ """ASSIGNOBJECTFIELDS - assign object fields from options""" @@ -68,5 +79,4 @@ return obj2 # }}} - def changefieldvalue(self,field,newvalue): # {{{ """CHANGEOPTIONVALUE - change the value of an option in an option list""" @@ -74,42 +84,4 @@ self.list[field]=newvalue; # }}} - -# function obj = deleteduplicates(obj,warn) % {{{ -# %DELETEDUPLICATES - delete duplicates in an option list -# -# %track the first occurrence of each option -# [dummy lines]=unique(obj.list(:,1),'first'); -# clear dummy -# -# %warn user if requested -# if warn, -# numoptions=size(obj.list,1); -# for i=1:numoptions, -# if ~ismember(i,lines), -# disp(['WARNING: option ' obj.list{i,1} ' appeared more than once. Only its first occurrence will be kept']) -# end -# end -# end -# -# %remove duplicates from the options list -# obj.list=obj.list(lines,:); -# end % }}} - - def __repr__(self): # {{{ - s=" functionname: '%s'\n" % self.functionname - if self.list: - s+=" list: (%ix%i)\n\n" % (len(self.list),2) - for item in self.list.iteritems(): - if isinstance(item[1],(str,unicode)): - s+=" field: %-10s value: '%s'\n" % (item[0],item[1]) - elif isinstance(item[1],(bool,int,long,float)): - s+=" field: %-10s value: %g\n" % (item[0],item[1]) - else: - s+=" field: %-10s value: %s\n" % (item[0],type(item[1])) - else: - s+=" list: empty\n" - return s - # }}} - def exist(self,field): # {{{ """EXIST - check if the option exist""" @@ -127,19 +99,4 @@ return False # }}} - - #def fieldoccurrences(self,field): #{{{ - # ''' - # FIELDOCCURRENCES - get number of occurrence of a field - # ''' - # - # #check input - # if not isinstance(field,(str,unicode)): - # raise TypeError("fieldoccurrences error message: field should be a string") - - # #get number of occurrence - # # ?? - # #return num - # #% }}} - def getfieldvalue(self,field,default=None): # {{{ """ @@ -174,5 +131,4 @@ return value # }}} - def removefield(self,field,warn): # {{{ """ @@ -196,5 +152,4 @@ print "removefield info: option '%s' has been removed from the list of options." % field # }}} - def marshall(self,fid,firstindex): # {{{ @@ -214,3 +169,2 @@ raise TypeError("Cannot marshall option '%s': format not supported yet." % name) # }}} - Index: /issm/trunk-jpl/src/m/classes/planetmesh.m =================================================================== --- /issm/trunk-jpl/src/m/classes/planetmesh.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/planetmesh.m (revision 14640) @@ -1,3 +1,3 @@ -%MESH class definition +%PLANETMESH class definition % % Usage: @@ -17,7 +17,4 @@ numberofelements = 0; numberofvertices = 0; - - lat = NaN - long = NaN vertexconnectivity = NaN @@ -64,5 +61,4 @@ md = checkfield(md,'planetmesh.numberofelements','>',0); md = checkfield(md,'planetmesh.numberofvertices','>',0); - %no checks for numberofedges lat long and hemisphere if (md.planetmesh.dimension==2), md = checkfield(md,'planetmesh.average_vertex_connectivity','>=',9,'message','''planetmesh.average_vertex_connectivity'' should be at least 9 in 2d'); @@ -92,11 +88,11 @@ fielddisplay(obj,'numberofelements','number of elements'); fielddisplay(obj,'numberofvertices','number of vertices'); - fielddisplay(obj,'elements','index into (x,y,z), coordinates of the vertices'); - fielddisplay(obj,'x','vertices x coordinate'); - fielddisplay(obj,'y','vertices y coordinate'); - fielddisplay(obj,'z','vertices z coordinate'); - fielddisplay(obj,'r','vertices r coordinate'); - fielddisplay(obj,'theta','vertices theta coordinate'); - fielddisplay(obj,'phi','vertices phi coordinate'); + fielddisplay(obj,'elements','vertex indices of the mesh elements'); + fielddisplay(obj,'x','vertices x coordinate [m]'); + fielddisplay(obj,'y','vertices y coordinate [m]'); + fielddisplay(obj,'z','vertices z coordinate [m]'); + fielddisplay(obj,'r','vertices r coordinate [m]'); + fielddisplay(obj,'theta','vertices theta coordinate [degrees]'); + fielddisplay(obj,'phi','vertices phi coordinate [degrees]'); disp(sprintf('\n Properties:')); Index: /issm/trunk-jpl/src/m/classes/plotoptions.py =================================================================== --- /issm/trunk-jpl/src/m/classes/plotoptions.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/plotoptions.py (revision 14640) @@ -10,5 +10,5 @@ ''' - def __init__(self,*arg): + def __init__(self,*arg):# {{{ self.numberofplots = 0 self.figurenumber = 1 @@ -16,5 +16,5 @@ self.buildlist(*arg) - + #}}} def __repr__(self): #{{{ s="\n" Index: /issm/trunk-jpl/src/m/classes/private.py =================================================================== --- /issm/trunk-jpl/src/m/classes/private.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/private.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from collections import OrderedDict from fielddisplay import fielddisplay @@ -13,7 +12,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.isconsistent = True self.runtimename = '' @@ -25,6 +22,5 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=' private parameters: do not change' @@ -35,12 +31,8 @@ return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ return md # }}} - Index: /issm/trunk-jpl/src/m/classes/prognostic.m =================================================================== --- /issm/trunk-jpl/src/m/classes/prognostic.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/prognostic.m (revision 14640) @@ -53,8 +53,8 @@ function disp(obj) % {{{ disp(sprintf(' Prognostic solution parameters:')); - fielddisplay(obj,'spcthickness','thickness constraints (NaN means no constraint)'); - fielddisplay(obj,'min_thickness','minimum ice thickness allowed'); + fielddisplay(obj,'spcthickness','thickness constraints (NaN means no constraint) [m]'); + fielddisplay(obj,'min_thickness','minimum ice thickness allowed [m]'); fielddisplay(obj,'hydrostatic_adjustment','adjustment of ice shelves surface and bed elevations: ''Incremental'' or ''Absolute'' '); - fielddisplay(obj,'stabilization','0->no, 1->artificial_diffusivity, 2->streamline upwinding, 3->discontinuous Galerkin'); + fielddisplay(obj,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding, 3: discontinuous Galerkin'); disp(sprintf('\n %s','Penalty options:')); Index: /issm/trunk-jpl/src/m/classes/prognostic.py =================================================================== --- /issm/trunk-jpl/src/m/classes/prognostic.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/prognostic.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from fielddisplay import fielddisplay from EnumDefinitions import * @@ -14,7 +13,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.spcthickness = float('NaN') self.min_thickness = 0 @@ -29,18 +26,15 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=' Prognostic solution parameters:' - string="%s\n%s"%(string,fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint)')) - string="%s\n%s"%(string,fielddisplay(self,'min_thickness','minimum ice thickness allowed')) + string="%s\n%s"%(string,fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint) [m]')) + string="%s\n%s"%(string,fielddisplay(self,'min_thickness','minimum ice thickness allowed [m]')) string="%s\n%s"%(string,fielddisplay(self,'hydrostatic_adjustment','adjustment of ice shelves surface and bed elevations: ''Incremental'' or ''Absolute'' ')) - string="%s\n%s"%(string,fielddisplay(self,'stabilization','0->no, 1->artificial_diffusivity, 2->streamline upwinding, 3->discontinuous Galerkin')) + string="%s\n%s"%(string,fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: streamline upwinding, 3: discontinuous Galerkin')) string="%s\n%s"%(string,fielddisplay(self,'requested_outputs','additional outputs requested')) return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ #Type of stabilization to use 0:nothing 1:artificial_diffusivity 3:Discontinuous Galerkin @@ -58,5 +52,4 @@ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -74,5 +67,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','spcthickness','format','DoubleMat','mattype',1) @@ -84,3 +76,2 @@ WriteData(fid,'object',self,'fieldname','requested_outputs','format','DoubleMat','mattype',3); # }}} - Index: /issm/trunk-jpl/src/m/classes/qmu.py =================================================================== --- /issm/trunk-jpl/src/m/classes/qmu.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/qmu.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports import numpy from collections import OrderedDict @@ -16,7 +15,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.isdakota = 0 self.variables = OrderedDict() @@ -40,7 +37,5 @@ #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ return self #}}} @@ -156,3 +151,2 @@ WriteData(fid,'data',flag,'enum',QmuMassFluxSegmentsPresentEnum(),'format','Boolean'); # }}} - Index: /issm/trunk-jpl/src/m/classes/radaroverlay.m =================================================================== --- /issm/trunk-jpl/src/m/classes/radaroverlay.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/radaroverlay.m (revision 14640) @@ -26,6 +26,6 @@ fielddisplay(obj,'pwr','radar power image (matrix)'); - fielddisplay(obj,'x','corresponding x coordinates'); - fielddisplay(obj,'y','corresponding y coordinates'); + fielddisplay(obj,'x','corresponding x coordinates [m]'); + fielddisplay(obj,'y','corresponding y coordinates [m]'); end % }}} Index: /issm/trunk-jpl/src/m/classes/radaroverlay.py =================================================================== --- /issm/trunk-jpl/src/m/classes/radaroverlay.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/radaroverlay.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from fielddisplay import fielddisplay @@ -10,7 +9,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.pwr = float('NaN') self.x = float('NaN') @@ -21,16 +18,12 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=' radaroverlay parameters:' string="%s\n%s"%(string,fielddisplay(self,'pwr','radar power image (matrix)')) - string="%s\n%s"%(string,fielddisplay(self,'x','corresponding x coordinates')) - string="%s\n%s"%(string,fielddisplay(self,'y','corresponding y coordinates')) + string="%s\n%s"%(string,fielddisplay(self,'x','corresponding x coordinates [m]')) + string="%s\n%s"%(string,fielddisplay(self,'y','corresponding y coordinates [m]')) return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ return self #}}} - Index: /issm/trunk-jpl/src/m/classes/results.py =================================================================== --- /issm/trunk-jpl/src/m/classes/results.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/results.py (revision 14640) @@ -17,5 +17,4 @@ pass # }}} - def __repr__(self): # {{{ s =" Model results:\n" @@ -44,16 +43,12 @@ return s # }}} - def setdefaultparameters(self): # {{{ #do nothing return self # }}} - def checkconsistency(self,md,solution,analyses): # {{{ return md # }}} - def marshall(self,fid): # {{{ pass # }}} - Index: /issm/trunk-jpl/src/m/classes/rifts.py =================================================================== --- /issm/trunk-jpl/src/m/classes/rifts.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/rifts.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports import numpy from fielddisplay import fielddisplay @@ -15,7 +14,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.riftstruct = [] self.riftproperties = [] @@ -25,6 +22,5 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=' rifts parameters:' @@ -33,10 +29,7 @@ return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ if (not self.riftstruct) or numpy.any(isnans(self.riftstruct)): @@ -61,5 +54,4 @@ return md # }}} - def marshall(self,fid): # {{{ @@ -90,3 +82,2 @@ WriteData(fid,'data',data,'enum',RiftsRiftstructEnum(),'format','DoubleMat','mattype',3) # }}} - Index: /issm/trunk-jpl/src/m/classes/settings.py =================================================================== --- /issm/trunk-jpl/src/m/classes/settings.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/settings.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from fielddisplay import fielddisplay from EnumDefinitions import * @@ -13,7 +12,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.io_gather = 0 self.lowmem = 0 @@ -26,6 +23,5 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=" general settings parameters:" @@ -37,7 +33,5 @@ return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ #are we short in memory ? (0 faster but requires more memory) @@ -61,5 +55,4 @@ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ md = checkfield(md,'settings.io_gather','numel',[1],'values',[0,1]) @@ -71,5 +64,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','io_gather','format','Boolean') @@ -82,3 +74,2 @@ WriteData(fid,'enum',SettingsWaitonlockEnum(),'data',False,'format','Boolean'); # }}} - Index: /issm/trunk-jpl/src/m/classes/steadystate.py =================================================================== --- /issm/trunk-jpl/src/m/classes/steadystate.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/steadystate.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports import numpy from fielddisplay import fielddisplay @@ -14,7 +13,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.reltol = 0 self.maxiter = 0 @@ -25,6 +22,5 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=' steadystate solution parameters:' string="%s\n%s"%(string,fielddisplay(self,'reltol','relative tolerance criterion')) @@ -33,7 +29,5 @@ return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ #maximum of steady state iterations @@ -45,5 +39,4 @@ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -60,5 +53,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','reltol','format','Double') @@ -66,3 +58,2 @@ WriteData(fid,'object',self,'fieldname','requested_outputs','format','DoubleMat','mattype',3) # }}} - Index: /issm/trunk-jpl/src/m/classes/surfaceforcings.m =================================================================== --- /issm/trunk-jpl/src/m/classes/surfaceforcings.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/surfaceforcings.m (revision 14640) @@ -74,8 +74,8 @@ fielddisplay(obj,'ispdd','is pdd activated (0 or 1, default is 0)'); fielddisplay(obj,'isdelta18o','is temperature and precipitation delta18o parametrisation activated (0 or 1, default is 0)'); - fielddisplay(obj,'monthlytemperatures','monthly surface temperatures [Kelvin], required if pdd is activated and delta18o not activated'); + fielddisplay(obj,'monthlytemperatures','monthly surface temperatures [K], required if pdd is activated and delta18o not activated'); fielddisplay(obj,'precipitation','surface precipitation [m/yr water eq]'); - fielddisplay(obj,'temperatures_presentday','monthly present day surface temperatures [Kelvin], required if pdd is activated and delta18o activated'); - fielddisplay(obj,'temperatures_lgm','monthly LGM surface temperatures [Kelvin], required if pdd is activated and delta18o activated'); + fielddisplay(obj,'temperatures_presentday','monthly present day surface temperatures [K], required if pdd is activated and delta18o activated'); + fielddisplay(obj,'temperatures_lgm','monthly LGM surface temperatures [K], required if pdd is activated and delta18o activated'); fielddisplay(obj,'precipitations_presentday','monthly surface precipitation [m/yr water eq], required if pdd is activated and delta18o activated'); fielddisplay(obj,'delta18o','delta18o, required if pdd is activated and delta18o activated'); Index: /issm/trunk-jpl/src/m/classes/surfaceforcings.py =================================================================== --- /issm/trunk-jpl/src/m/classes/surfaceforcings.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/surfaceforcings.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from fielddisplay import fielddisplay from EnumDefinitions import * @@ -13,7 +12,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.precipitation = float('NaN') self.mass_balance = float('NaN') @@ -36,6 +33,5 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=" surface forcings parameters:" @@ -44,8 +40,8 @@ string="%s\n%s"%(string,fielddisplay(self,'ispdd','is pdd activated (0 or 1, default is 0)')) string="%s\n%s"%(string,fielddisplay(self,'isdelta18o','is temperature and precipitation delta18o parametrisation activated (0 or 1, default is 0)')) - string="%s\n%s"%(string,fielddisplay(self,'monthlytemperatures','monthly surface temperatures [Kelvin], required if pdd is activated and delta18o not activated')) + string="%s\n%s"%(string,fielddisplay(self,'monthlytemperatures','monthly surface temperatures [K], required if pdd is activated and delta18o not activated')) string="%s\n%s"%(string,fielddisplay(self,'precipitation','surface precipitation [m/yr water eq]')) - string="%s\n%s"%(string,fielddisplay(self,'temperatures_presentday','monthly present day surface temperatures [Kelvin], required if pdd is activated and delta18o activated')) - string="%s\n%s"%(string,fielddisplay(self,'temperatures_lgm','monthly LGM surface temperatures [Kelvin], required if pdd is activated and delta18o activated')) + string="%s\n%s"%(string,fielddisplay(self,'temperatures_presentday','monthly present day surface temperatures [K], required if pdd is activated and delta18o activated')) + string="%s\n%s"%(string,fielddisplay(self,'temperatures_lgm','monthly LGM surface temperatures [K], required if pdd is activated and delta18o activated')) string="%s\n%s"%(string,fielddisplay(self,'precipitations_presentday','monthly surface precipitation [m/yr water eq], required if pdd is activated and delta18o activated')) string="%s\n%s"%(string,fielddisplay(self,'delta18o','delta18o, required if pdd is activated and delta18o activated')) @@ -59,6 +55,5 @@ return string #}}} - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ #pdd method not used in default mode @@ -69,5 +64,4 @@ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -98,5 +92,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','precipitation','format','DoubleMat','mattype',1) @@ -124,3 +117,2 @@ WriteData(fid,'object',self,'fieldname','b_neg','format','DoubleMat','mattype',1) # }}} - Index: /issm/trunk-jpl/src/m/classes/taoinversion.m =================================================================== --- /issm/trunk-jpl/src/m/classes/taoinversion.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/taoinversion.m (revision 14640) @@ -1,3 +1,3 @@ -%INVERSION class definition +%TAOINVERSION class definition % % Usage: @@ -93,6 +93,6 @@ disp(sprintf(' taoinversion parameters:')); fielddisplay(obj,'iscontrol','is inversion activated?'); - fielddisplay(obj,'incomplete_adjoint','do we assume linear viscosity?'); - fielddisplay(obj,'control_parameters','parameter where inverse control is carried out; ex: {''FrictionCoefficient''}, or {''MaterialsRheologyBbar''}'); + fielddisplay(obj,'incomplete_adjoint','1: linear viscosity, 0: non-linear viscosity'); + fielddisplay(obj,'control_parameters','ex: {''FrictionCoefficient''}, or {''MaterialsRheologyBbar''}'); fielddisplay(obj,'nsteps','number of optimization searches'); fielddisplay(obj,'cost_functions','indicate the type of response for each optimization step'); @@ -100,7 +100,7 @@ fielddisplay(obj,'min_parameters','absolute minimum acceptable value of the inversed parameter on each vertex'); fielddisplay(obj,'max_parameters','absolute maximum acceptable value of the inversed parameter on each vertex'); - fielddisplay(obj,'vx_obs','observed velocity x component [m/a]'); - fielddisplay(obj,'vy_obs','observed velocity y component [m/a]'); - fielddisplay(obj,'vel_obs','observed velocity magnitude [m/a]'); + fielddisplay(obj,'vx_obs','observed velocity x component [m/yr]'); + fielddisplay(obj,'vy_obs','observed velocity y component [m/yr]'); + fielddisplay(obj,'vel_obs','observed velocity magnitude [m/yr]'); fielddisplay(obj,'thickness_obs','observed thickness [m]'); disp('Available cost functions:'); Index: /issm/trunk-jpl/src/m/classes/thermal.m =================================================================== --- /issm/trunk-jpl/src/m/classes/thermal.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/thermal.m (revision 14640) @@ -57,6 +57,6 @@ disp(sprintf(' Thermal solution parameters:')); - fielddisplay(obj,'spctemperature','temperature constraints (NaN means no constraint)'); - fielddisplay(obj,'stabilization','0->no, 1->artificial_diffusivity, 2->SUPG'); + fielddisplay(obj,'spctemperature','temperature constraints (NaN means no constraint) [K]'); + fielddisplay(obj,'stabilization','0: no, 1: artificial_diffusivity, 2: SUPG'); fielddisplay(obj,'maxiter','maximum number of non linear iterations'); fielddisplay(obj,'penalty_lock','stabilize unstable thermal constraints that keep zigzagging after n iteration (default is 0, no stabilization)'); Index: /issm/trunk-jpl/src/m/classes/thermal.py =================================================================== --- /issm/trunk-jpl/src/m/classes/thermal.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/thermal.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports import numpy from fielddisplay import fielddisplay @@ -14,7 +13,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.spctemperature = float('NaN') self.penalty_threshold = 0 @@ -29,9 +26,8 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=' Thermal solution parameters:' - string="%s\n%s"%(string,fielddisplay(self,'spctemperature','temperature constraints (NaN means no constraint)')) - string="%s\n%s"%(string,fielddisplay(self,'stabilization','0->no, 1->artificial_diffusivity, 2->SUPG')) + string="%s\n%s"%(string,fielddisplay(self,'spctemperature','temperature constraints (NaN means no constraint) [K]')) + string="%s\n%s"%(string,fielddisplay(self,'stabilization','0: no, 1: artificial_diffusivity, 2: SUPG')) string="%s\n%s"%(string,fielddisplay(self,'maxiter','maximum number of non linear iterations')) string="%s\n%s"%(string,fielddisplay(self,'penalty_lock','stabilize unstable thermal constraints that keep zigzagging after n iteration (default is 0, no stabilization)')) @@ -40,7 +36,5 @@ return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ #Number of unstable constraints acceptable @@ -61,5 +55,4 @@ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -78,5 +71,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','spctemperature','format','DoubleMat','mattype',1) @@ -88,3 +80,2 @@ WriteData(fid,'object',self,'fieldname','isenthalpy','format','Boolean') # }}} - Index: /issm/trunk-jpl/src/m/classes/timestepping.m =================================================================== --- /issm/trunk-jpl/src/m/classes/timestepping.m (revision 14639) +++ /issm/trunk-jpl/src/m/classes/timestepping.m (revision 14640) @@ -47,7 +47,7 @@ disp(sprintf(' timestepping parameters:')); - fielddisplay(obj,'start_time','simulation starting time [yrs]'); - fielddisplay(obj,'final_time','final time to stop the simulation [yrs]'); - fielddisplay(obj,'time_step','length of time steps [yrs]'); + fielddisplay(obj,'start_time','simulation starting time [yr]'); + fielddisplay(obj,'final_time','final time to stop the simulation [yr]'); + fielddisplay(obj,'time_step','length of time steps [yr]'); fielddisplay(obj,'time_adapt','use cfl condition to define time step ? (0 or 1) '); fielddisplay(obj,'cfl_coefficient','coefficient applied to cfl condition'); Index: /issm/trunk-jpl/src/m/classes/timestepping.py =================================================================== --- /issm/trunk-jpl/src/m/classes/timestepping.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/timestepping.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from fielddisplay import fielddisplay from EnumDefinitions import * @@ -13,7 +12,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.start_time = 0. self.final_time = 0. @@ -26,17 +23,14 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=" timestepping parameters:" - string="%s\n%s"%(string,fielddisplay(self,"start_time","simulation starting time [yrs]")) - string="%s\n%s"%(string,fielddisplay(self,"final_time","final time to stop the simulation [yrs]")) - string="%s\n%s"%(string,fielddisplay(self,"time_step","length of time steps [yrs]")) + string="%s\n%s"%(string,fielddisplay(self,"start_time","simulation starting time [yr]")) + string="%s\n%s"%(string,fielddisplay(self,"final_time","final time to stop the simulation [yr]")) + string="%s\n%s"%(string,fielddisplay(self,"time_step","length of time steps [yr]")) string="%s\n%s"%(string,fielddisplay(self,"time_adapt","use cfl condition to define time step ? (0 or 1) ")) string="%s\n%s"%(string,fielddisplay(self,"cfl_coefficient","coefficient applied to cfl condition")) return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ #time between 2 time steps @@ -52,5 +46,4 @@ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -65,5 +58,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','start_time','format','Double') @@ -73,3 +65,2 @@ WriteData(fid,'object',self,'fieldname','cfl_coefficient','format','Double') # }}} - Index: /issm/trunk-jpl/src/m/classes/toolkits.py =================================================================== --- /issm/trunk-jpl/src/m/classes/toolkits.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/toolkits.py (revision 14640) @@ -25,5 +25,11 @@ #The other properties are dynamic # }}} + def __repr__(self): # {{{ + s ="List of toolkits options per analysis:\n\n" + for analysis in vars(self).iterkeys(): + s+="%s\n" % fielddisplay(self,analysis,'') + return s + # }}} def addoptions(self,analysis,*args): # {{{ # Usage example: @@ -45,13 +51,4 @@ return self # }}} - - def __repr__(self): # {{{ - s ="List of toolkits options per analysis:\n\n" - for analysis in vars(self).iterkeys(): - s+="%s\n" % fielddisplay(self,analysis,'') - - return s - # }}} - def checkconsistency(self,md,solution,analyses): # {{{ for analysis in vars(self).iterkeys(): @@ -61,5 +58,4 @@ return md # }}} - def ToolkitsFile(self,filename): # {{{ """ @@ -106,3 +102,2 @@ fid.close() # }}} - Index: /issm/trunk-jpl/src/m/classes/transient.py =================================================================== --- /issm/trunk-jpl/src/m/classes/transient.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/transient.py (revision 14640) @@ -1,3 +1,2 @@ -#module imports from fielddisplay import fielddisplay from EnumDefinitions import * @@ -13,7 +12,5 @@ """ - #properties - def __init__(self): - # {{{ Properties + def __init__(self): # {{{ self.isprognostic = False self.isdiagnostic = False @@ -27,6 +24,5 @@ #}}} - def __repr__(self): - # {{{ Display + def __repr__(self): # {{{ string=' transient solution parameters:' string="%s\n%s"%(string,fielddisplay(self,'isprognostic','indicates if a prognostic solution is used in the transient')) @@ -38,7 +34,5 @@ return string #}}} - - def setdefaultparameters(self): - # {{{setdefaultparameters + def setdefaultparameters(self): # {{{ #full analysis: Diagnostic, Prognostic and Thermal but no groundingline migration for now @@ -51,5 +45,4 @@ return self #}}} - def checkconsistency(self,md,solution,analyses): # {{{ @@ -68,5 +61,4 @@ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'object',self,'fieldname','isprognostic','format','Boolean') Index: /issm/trunk-jpl/src/m/classes/verbose.py =================================================================== --- /issm/trunk-jpl/src/m/classes/verbose.py (revision 14639) +++ /issm/trunk-jpl/src/m/classes/verbose.py (revision 14640) @@ -72,5 +72,4 @@ raise TypeError("verbose supported field values are logicals only (True or False)") # }}} - def __repr__(self): # {{{ @@ -89,5 +88,4 @@ return s # }}} - def VerboseToBinary(self): # {{{ @@ -114,5 +112,4 @@ return binary # }}} - def BinaryToVerbose(self,binary): # {{{ @@ -128,11 +125,8 @@ #ENDBIN2VERB # }}} - def checkconsistency(self,md,solution,analyses): # {{{ return md # }}} - def marshall(self,fid): # {{{ WriteData(fid,'data',self.VerboseToBinary(),'enum',VerboseEnum(),'format','Integer') # }}} -