Changeset 14141


Ignore:
Timestamp:
12/12/12 10:23:46 (12 years ago)
Author:
jschierm
Message:

CHG: Make all the matlab and python class output consistent.

Location:
issm/trunk-jpl/src/m/classes
Files:
25 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk-jpl/src/m/classes/balancethickness.py

    r13020 r14141  
    2929                string='   balance thickness solution parameters:'
    3030               
    31                 string="%s\n\n%s"%(string,fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint)'))
     31                string="%s\n%s"%(string,fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint)'))
    3232                string="%s\n%s"%(string,fielddisplay(self,'thickening_rate','ice thickening rate used in the mass conservation (dh/dt)'))
    3333                string="%s\n%s"%(string,fielddisplay(self,'stabilization',"0: None, 1: SU, 2: MacAyeal's artificial diffusivity, 3:DG"))

  • issm/trunk-jpl/src/m/classes/basalforcings.py

    r13020 r14141  
    2828                string="   basal forcings parameters:"
    2929
    30                 string="%s\n\n%s"%(string,fielddisplay(self,"melting_rate","basal melting rate (positive if melting)"))
     30                string="%s\n%s"%(string,fielddisplay(self,"melting_rate","basal melting rate (positive if melting)"))
    3131                string="%s\n%s"%(string,fielddisplay(self,"melting_rate_correction","additional melting applied when the grounding line retreats"))
    3232                string="%s\n%s"%(string,fielddisplay(self,"geothermalflux","geothermal heat flux [W/m^2]"))

  • issm/trunk-jpl/src/m/classes/constants.py

    r12958 r14141  
    2727                # {{{ Display
    2828                string="   constants parameters:"
    29                 string="%s\n\n%s"%(string,fielddisplay(self,"g","gravitational acceleration"))
     29
     30                string="%s\n%s"%(string,fielddisplay(self,"g","gravitational acceleration"))
    3031                string="%s\n%s"%(string,fielddisplay(self,"yts","number of seconds in a year"))
    3132                string="%s\n%s"%(string,fielddisplay(self,"referencetemperature","reference temperature used in the enthalpy model"))
    3233
    33 
    3434                return string
    3535                #}}}
    36                
    3736        def setdefaultparameters(self):
    3837                # {{{setdefaultparameters

  • issm/trunk-jpl/src/m/classes/debug.py

    r12958 r14141  
    2626                string="   debug parameters:"
    2727
    28                 string="%s\n\n%s"%(string,fielddisplay(self,"valgrind","use Valgrind to debug (0 or 1)"))
     28                string="%s\n%s"%(string,fielddisplay(self,"valgrind","use Valgrind to debug (0 or 1)"))
    2929                string="%s\n%s"%(string,fielddisplay(self,"gprof","use gnu-profiler to find out where the time is spent"))
    3030                string="%s\n%s"%(string,fielddisplay(self,'profiling','enables profiling (memory, flops, time)'))

  • issm/trunk-jpl/src/m/classes/diagnostic.py

    r13740 r14141  
    4545                # {{{ Display
    4646               
    47                 string='\n   Diagnostic solution parameters:'
    48                 string="%s\n\n%s"%(string,'      Convergence criteria:')
     47                string='   Diagnostic solution parameters:'
     48                string="%s\n%s"%(string,'      Convergence criteria:')
    4949                       
    5050                string="%s\n%s"%(string,fielddisplay(self,'restol','mechanical equilibrium residual convergence criterion'))
    … …  
    5555                string="%s\n%s"%(string,fielddisplay(self,'viscosity_overshoot','over-shooting constant new=new+C*(new-old)'))
    5656
    57                 string="%s\n%s"%(string,'      boundary conditions:')
     57                string="%s\n%s"%(string,'\n      boundary conditions:')
    5858
    5959                string="%s\n%s"%(string,fielddisplay(self,'spcvx','x-axis velocity constraint (NaN means no constraint)'))
    … …  
    6262                string="%s\n%s"%(string,fielddisplay(self,'icefront','segments on ice front list (last column 0-> Air, 1-> Water, 2->Ice'))
    6363
    64                 string="%s\n%s"%(string,'      Rift options:')
     64                string="%s\n%s"%(string,'\n      Rift options:')
    6565                string="%s\n%s"%(string,fielddisplay(self,'rift_penalty_threshold','threshold for instability of mechanical constraints'))
    6666                string="%s\n%s"%(string,fielddisplay(self,'rift_penalty_lock','number of iterations before rift penalties are locked'))
    6767
    68                 string="%s\n%s"%(string,'      Penalty options:')
     68                string="%s\n%s"%(string,'\n      Penalty options:')
    6969                string="%s\n%s"%(string,fielddisplay(self,'penalty_factor','offset used by penalties: penalty = Kmax*10^offset'))
    7070                string="%s\n%s"%(string,fielddisplay(self,'vertex_pairing','pairs of vertices that are penalized'))
    7171
    72                 string="%s\n%s"%(string,'      Other:')
     72                string="%s\n%s"%(string,'\n      Other:')
    7373                string="%s\n%s"%(string,fielddisplay(self,'shelf_dampening','use dampening for floating ice ? Only for Stokes model'))
    7474                string="%s\n%s"%(string,fielddisplay(self,'stokesreconditioning','multiplier for incompressibility equation. Only for Stokes model'))

  • issm/trunk-jpl/src/m/classes/flowequation.py

    r13994 r14141  
    3737                string='   flow equation parameters:'
    3838
    39                 string="%s\n\n%s"%(string,fielddisplay(self,'ismacayealpattyn',"is the macayeal or pattyn approximation used ?"))
     39                string="%s\n%s"%(string,fielddisplay(self,'ismacayealpattyn',"is the macayeal or pattyn approximation used ?"))
    4040                string="%s\n%s"%(string,fielddisplay(self,'ishutter',"is the shallow ice approximation used ?"))
    4141                string="%s\n%s"%(string,fielddisplay(self,'isl1l2',"are l1l2 equations used ?"))

  • issm/trunk-jpl/src/m/classes/friction.py

    r13023 r14141  
    2727                # {{{ Display
    2828                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"
    29                 string="%s\n\n%s"%(string,fielddisplay(self,"coefficient","friction coefficient [SI]"))
     29
     30                string="%s\n%s"%(string,fielddisplay(self,"coefficient","friction coefficient [SI]"))
    3031                string="%s\n%s"%(string,fielddisplay(self,"p","p exponent"))
    3132                string="%s\n%s"%(string,fielddisplay(self,"q","q exponent"))

  • issm/trunk-jpl/src/m/classes/geometry.py

    r13043 r14141  
    3131                string="   geometry parameters:"
    3232
    33                 string="%s\n\n%s"%(string,fielddisplay(self,'surface','surface elevation'))
     33                string="%s\n%s"%(string,fielddisplay(self,'surface','surface elevation'))
    3434                string="%s\n%s"%(string,fielddisplay(self,'thickness','ice thickness'))
    3535                string="%s\n%s"%(string,fielddisplay(self,'bed','bed elevation'))

  • issm/trunk-jpl/src/m/classes/groundingline.py

    r13043 r14141  
    3030                string='   grounding line solution parameters:'
    3131
    32                 string="%s\n\n%s"%(string,fielddisplay(self,'migration','type of grounding line migration: ''SoftMigration'',''AgressiveMigration'' or ''None'''))
     32                string="%s\n%s"%(string,fielddisplay(self,'migration','type of grounding line migration: ''SoftMigration'',''AgressiveMigration'' or ''None'''))
    3333                string="%s\n%s"%(string,fielddisplay(self,'melting_rate','melting rate applied when previously grounded parts start floating'))
    3434                return string

  • issm/trunk-jpl/src/m/classes/hydrology.py

    r13023 r14141  
    3232               
    3333                string='   hydrology solution parameters:'
    34                 string="%s\n\n%s"%(string,fielddisplay(self,'spcwatercolumn','water thickness constraints (NaN means no constraint)'))
     34                string="%s\n%s"%(string,fielddisplay(self,'spcwatercolumn','water thickness constraints (NaN means no constraint)'))
    3535                string="%s\n%s"%(string,fielddisplay(self,'n','Manning roughness coefficient'))
    3636                string="%s\n%s"%(string,fielddisplay(self,'CR','tortuosity parameter'))

  • issm/trunk-jpl/src/m/classes/inversion.m

    r13148 r14141  
    105105                end % }}}
    106106                function disp(obj) % {{{
     107                        disp(sprintf('      inversion parameters:'));
    107108                        fielddisplay(obj,'iscontrol','is inversion activated?');
    108109                        fielddisplay(obj,'incomplete_adjoint','do we assume linear viscosity?');

  • issm/trunk-jpl/src/m/classes/inversion.py

    r13856 r14141  
    4545        def __repr__(self):
    4646                # {{{ Display
    47                 string='\n   Inversion parameters:'
     47                string='   inversion parameters:'
    4848                string="%s\n%s"%(string,fielddisplay(self,'iscontrol','is inversion activated?'))
    4949                string="%s\n%s"%(string,fielddisplay(self,'incomplete_adjoint','do we assume linear viscosity?'))

  • issm/trunk-jpl/src/m/classes/mask.m

    r12663 r14141  
    3535                end % }}}
    3636                function disp(obj) % {{{
     37                        disp(sprintf('   masks:'));
     38
    3739                        fielddisplay(obj,'elementonfloatingice','element on floating ice flags list');
    3840                        fielddisplay(obj,'vertexonfloatingice','vertex on floating ice flags list');

  • issm/trunk-jpl/src/m/classes/mask.py

    r13984 r14141  
    2929        def __repr__(self):
    3030                # {{{ Display
     31                string="   masks:"
    3132
    32                 string="";
    3333                string="%s\n%s"%(string,fielddisplay(self,"elementonfloatingice","element on floating ice flags list"))
    3434                string="%s\n%s"%(string,fielddisplay(self,"vertexonfloatingice","vertex on floating ice flags list"))

  • issm/trunk-jpl/src/m/classes/matice.m

    r13254 r14141  
    8989                end % }}}
    9090                function disp(obj) % {{{
    91                         disp(sprintf('   Materials:\n'));
     91                        disp(sprintf('   Materials:'));
    9292
    9393                        fielddisplay(obj,'rho_ice','ice density [kg/m^3]');

  • issm/trunk-jpl/src/m/classes/matice.py

    r13439 r14141  
    3838                string="   Materials:"
    3939
    40                 string="%s\n\n%s"%(string,fielddisplay(self,"rho_ice","ice density [kg/m^3]"))
     40                string="%s\n%s"%(string,fielddisplay(self,"rho_ice","ice density [kg/m^3]"))
    4141                string="%s\n%s"%(string,fielddisplay(self,"rho_water","water density [kg/m^3]"))
    4242                string="%s\n%s"%(string,fielddisplay(self,"rho_freshwater","fresh water density [kg/m^3]"))

  • issm/trunk-jpl/src/m/classes/mesh.py

    r14006 r14141  
    6363        def __repr__(self):
    6464                # {{{ Display
     65                string="   Mesh:"
     66
    6567
    6668                if self.dimension==3:
    67                         string="\n%s"%("      Elements and vertices of the original 2d mesh:")
     69                        string="%s\n%s"%(string,"\n      Elements and vertices of the original 2d mesh:")
    6870                       
    6971                        string="%s\n%s"%(string,fielddisplay(self,"numberofelements2d","number of elements"))
    … …  
    7375                        string="%s\n%s"%(string,fielddisplay(self,"y2d","vertices y coordinate"))
    7476
    75                         string="%s\n%s" %(string,"Elements and vertices of the extruded 3d mesh:")
     77                        string="%s\n%s"%(string,"\n\n      Elements and vertices of the extruded 3d mesh:")
    7678                else:
    77                         string="\n%s"%("      Elements and vertices:")
     79                        string="%s\n%s"%(string,"\n      Elements and vertices:")
    7880                string="%s\n%s"%(string,fielddisplay(self,"numberofelements","number of elements"))
    7981                string="%s\n%s"%(string,fielddisplay(self,"numberofvertices","number of vertices"))
    … …  
    8587                string="%s\n%s"%(string,fielddisplay(self,"numberofedges","number of edges of the 2d mesh"))
    8688
    87                 string="%s%s"%(string,"\n      Properties:")
     89                string="%s%s"%(string,"\n\n      Properties:")
    8890                string="%s\n%s"%(string,fielddisplay(self,"dimension","mesh dimension (2d or 3d)"))
    8991                string="%s\n%s"%(string,fielddisplay(self,"numberoflayers","number of extrusion layers"))
    … …  
    103105                string="%s\n%s"%(string,fielddisplay(self,"average_vertex_connectivity","average number of vertices connected to one vertex"))
    104106
    105                 string="%s%s"%(string,"\n      Extracted model:")
     107                string="%s%s"%(string,"\n\n      Extracted model:")
    106108                string="%s\n%s"%(string,fielddisplay(self,"extractedvertices","vertices extracted from the model"))
    107109                string="%s\n%s"%(string,fielddisplay(self,"extractedelements","elements extracted from the model"))
    108110
    109                 string="%s%s"%(string,"\n      Projection:")
     111                string="%s%s"%(string,"\n\n      Projection:")
    110112                string="%s\n%s"%(string,fielddisplay(self,"lat","vertices latitude"))
    111113                string="%s\n%s"%(string,fielddisplay(self,"long","vertices longitude"))

  • issm/trunk-jpl/src/m/classes/miscellaneous.py

    r13116 r14141  
    2929                string='   miscellaneous parameters:'
    3030
    31                 string="%s\n\n%s"%(string,fielddisplay(self,'notes','notes in a cell of strings'))
     31                string="%s\n%s"%(string,fielddisplay(self,'notes','notes in a cell of strings'))
    3232                string="%s\n%s"%(string,fielddisplay(self,'name','model name'))
    3333                string="%s\n%s"%(string,fielddisplay(self,'dummy','empty field to store some data'))

  • issm/trunk-jpl/src/m/classes/prognostic.py

    r13469 r14141  
    3232                # {{{ Display
    3333                string='   Prognostic solution parameters:'
    34                 string="%s\n\n%s"%(string,fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint)'))
     34                string="%s\n%s"%(string,fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint)'))
    3535                string="%s\n%s"%(string,fielddisplay(self,'min_thickness','minimum ice thickness allowed'))
    3636                string="%s\n%s"%(string,fielddisplay(self,'hydrostatic_adjustment','adjustment of ice shelves surface and bed elevations: ''Incremental'' or ''Absolute'' '))

  • issm/trunk-jpl/src/m/classes/radaroverlay.py

    r13030 r14141  
    2424                # {{{ Display
    2525                string='   radaroverlay parameters:'
    26                 string="%s\n\n%s"%(string,fielddisplay(self,'pwr','radar power image (matrix)'))
     26                string="%s\n%s"%(string,fielddisplay(self,'pwr','radar power image (matrix)'))
    2727                string="%s\n%s"%(string,fielddisplay(self,'x','corresponding x coordinates'))
    2828                string="%s\n%s"%(string,fielddisplay(self,'y','corresponding y coordinates'))

  • issm/trunk-jpl/src/m/classes/rifts.py

    r13716 r14141  
    2929                string='   rifts parameters:'
    3030
    31                 string="%s\n\n%s"%(string,fielddisplay(self,'riftstruct','structure containing all rift information (vertices coordinates, segments, type of melange, ...)'))
     31                string="%s\n%s"%(string,fielddisplay(self,'riftstruct','structure containing all rift information (vertices coordinates, segments, type of melange, ...)'))
    3232                string="%s\n%s"%(string,fielddisplay(self,'riftproperties',''))
    3333                return string

  • issm/trunk-jpl/src/m/classes/solver.py

    r13098 r14141  
    33from iluasmoptions import *
    44from EnumToString import EnumToString
    5 from MatlabFuncs import *
     5from fielddisplay import fielddisplay
    66from EnumDefinitions import *
    77from checkfield import *
     8from MatlabFuncs import *
    89
    910class solver(object):
    … …  
    4849                s ="List of solver options per analysis:\n\n"
    4950                for analysis in vars(self).iterkeys():
    50                         s+="%s :\n" % analysis
    51                         s+="%s\n" % getattr(self,analysis)
     51#                       s+="%s:\n\n" % analysis
     52#                       s+="%s\n" % getattr(self,analysis)
     53                        s+="%s\n" % fielddisplay(self,analysis,'')
    5254
    5355                return s

  • issm/trunk-jpl/src/m/classes/surfaceforcings.py

    r13686 r14141  
    4545                string="   surface forcings parameters:"
    4646
    47                 string="%s\n\n%s"%(string,fielddisplay(self,'precipitation','surface precipitation [m/yr water eq]'))
     47                string="%s\n%s"%(string,fielddisplay(self,'precipitation','surface precipitation [m/yr water eq]'))
    4848                string="%s\n%s"%(string,fielddisplay(self,'mass_balance','surface mass balance [m/yr ice eq]'))
    4949                string="%s\n%s"%(string,fielddisplay(self,'ispdd','is pdd activated (0 or 1, default is 0)'))
    … …  
    6969                return string
    7070                #}}}
    71                
    7271        def setdefaultparameters(self):
    7372                # {{{setdefaultparameters

  • issm/trunk-jpl/src/m/classes/thermal.py

    r13462 r14141  
    3232                # {{{ Display
    3333                string='   Thermal solution parameters:'
    34                 string="%s\n\n%s"%(string,fielddisplay(self,'spctemperature','temperature constraints (NaN means no constraint)'))
     34                string="%s\n%s"%(string,fielddisplay(self,'spctemperature','temperature constraints (NaN means no constraint)'))
    3535                string="%s\n%s"%(string,fielddisplay(self,'stabilization','0->no, 1->artificial_diffusivity, 2->SUPG'))
    3636                string="%s\n%s"%(string,fielddisplay(self,'maxiter','maximum number of non linear iterations'))

  • issm/trunk-jpl/src/m/classes/timestepping.py

    r14103 r14141  
    2929                # {{{ Display
    3030                string="   timestepping parameters:"
    31                 string="%s\n\n%s"%(string,fielddisplay(self,"start_time","simulation starting time [yrs]"))
     31                string="%s\n%s"%(string,fielddisplay(self,"start_time","simulation starting time [yrs]"))
    3232                string="%s\n%s"%(string,fielddisplay(self,"final_time","final time to stop the simulation [yrs]"))
    3333                string="%s\n%s"%(string,fielddisplay(self,"time_step","length of time steps [yrs]"))
Note: See TracChangeset for help on using the changeset viewer.