Index: /issm/trunk-jpl/src/m/classes/balancethickness.py =================================================================== --- /issm/trunk-jpl/src/m/classes/balancethickness.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/balancethickness.py (revision 14141) @@ -29,5 +29,5 @@ string=' balance thickness solution parameters:' - string="%s\n\n%s"%(string,fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint)')) + 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,'stabilization',"0: None, 1: SU, 2: MacAyeal's artificial diffusivity, 3:DG")) Index: /issm/trunk-jpl/src/m/classes/basalforcings.py =================================================================== --- /issm/trunk-jpl/src/m/classes/basalforcings.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/basalforcings.py (revision 14141) @@ -28,5 +28,5 @@ string=" basal forcings parameters:" - string="%s\n\n%s"%(string,fielddisplay(self,"melting_rate","basal melting rate (positive if melting)")) + 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,"geothermalflux","geothermal heat flux [W/m^2]")) Index: /issm/trunk-jpl/src/m/classes/constants.py =================================================================== --- /issm/trunk-jpl/src/m/classes/constants.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/constants.py (revision 14141) @@ -27,12 +27,11 @@ # {{{ Display string=" constants parameters:" - string="%s\n\n%s"%(string,fielddisplay(self,"g","gravitational acceleration")) + + 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")) - return string #}}} - def setdefaultparameters(self): # {{{setdefaultparameters Index: /issm/trunk-jpl/src/m/classes/debug.py =================================================================== --- /issm/trunk-jpl/src/m/classes/debug.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/debug.py (revision 14141) @@ -26,5 +26,5 @@ string=" debug parameters:" - string="%s\n\n%s"%(string,fielddisplay(self,"valgrind","use Valgrind to debug (0 or 1)")) + string="%s\n%s"%(string,fielddisplay(self,"valgrind","use Valgrind to debug (0 or 1)")) string="%s\n%s"%(string,fielddisplay(self,"gprof","use gnu-profiler to find out where the time is spent")) string="%s\n%s"%(string,fielddisplay(self,'profiling','enables profiling (memory, flops, time)')) Index: /issm/trunk-jpl/src/m/classes/diagnostic.py =================================================================== --- /issm/trunk-jpl/src/m/classes/diagnostic.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/diagnostic.py (revision 14141) @@ -45,6 +45,6 @@ # {{{ Display - string='\n Diagnostic solution parameters:' - string="%s\n\n%s"%(string,' Convergence criteria:') + string=' Diagnostic solution parameters:' + string="%s\n%s"%(string,' Convergence criteria:') string="%s\n%s"%(string,fielddisplay(self,'restol','mechanical equilibrium residual convergence criterion')) @@ -55,5 +55,5 @@ string="%s\n%s"%(string,fielddisplay(self,'viscosity_overshoot','over-shooting constant new=new+C*(new-old)')) - string="%s\n%s"%(string,' boundary conditions:') + string="%s\n%s"%(string,'\n boundary conditions:') string="%s\n%s"%(string,fielddisplay(self,'spcvx','x-axis velocity constraint (NaN means no constraint)')) @@ -62,13 +62,13 @@ 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,' Rift options:') + string="%s\n%s"%(string,'\n Rift options:') string="%s\n%s"%(string,fielddisplay(self,'rift_penalty_threshold','threshold for instability of mechanical constraints')) string="%s\n%s"%(string,fielddisplay(self,'rift_penalty_lock','number of iterations before rift penalties are locked')) - string="%s\n%s"%(string,' Penalty options:') + string="%s\n%s"%(string,'\n Penalty options:') string="%s\n%s"%(string,fielddisplay(self,'penalty_factor','offset used by penalties: penalty = Kmax*10^offset')) string="%s\n%s"%(string,fielddisplay(self,'vertex_pairing','pairs of vertices that are penalized')) - string="%s\n%s"%(string,' Other:') + string="%s\n%s"%(string,'\n Other:') string="%s\n%s"%(string,fielddisplay(self,'shelf_dampening','use dampening for floating ice ? Only for Stokes model')) string="%s\n%s"%(string,fielddisplay(self,'stokesreconditioning','multiplier for incompressibility equation. Only for Stokes model')) Index: /issm/trunk-jpl/src/m/classes/flowequation.py =================================================================== --- /issm/trunk-jpl/src/m/classes/flowequation.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/flowequation.py (revision 14141) @@ -37,5 +37,5 @@ string=' flow equation parameters:' - string="%s\n\n%s"%(string,fielddisplay(self,'ismacayealpattyn',"is the macayeal or pattyn approximation used ?")) + string="%s\n%s"%(string,fielddisplay(self,'ismacayealpattyn',"is the macayeal or pattyn approximation used ?")) string="%s\n%s"%(string,fielddisplay(self,'ishutter',"is the shallow ice approximation used ?")) string="%s\n%s"%(string,fielddisplay(self,'isl1l2',"are l1l2 equations used ?")) Index: /issm/trunk-jpl/src/m/classes/friction.py =================================================================== --- /issm/trunk-jpl/src/m/classes/friction.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/friction.py (revision 14141) @@ -27,5 +27,6 @@ # {{{ Display 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" - string="%s\n\n%s"%(string,fielddisplay(self,"coefficient","friction coefficient [SI]")) + + string="%s\n%s"%(string,fielddisplay(self,"coefficient","friction coefficient [SI]")) string="%s\n%s"%(string,fielddisplay(self,"p","p exponent")) string="%s\n%s"%(string,fielddisplay(self,"q","q exponent")) Index: /issm/trunk-jpl/src/m/classes/geometry.py =================================================================== --- /issm/trunk-jpl/src/m/classes/geometry.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/geometry.py (revision 14141) @@ -31,5 +31,5 @@ string=" geometry parameters:" - string="%s\n\n%s"%(string,fielddisplay(self,'surface','surface elevation')) + 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')) Index: /issm/trunk-jpl/src/m/classes/groundingline.py =================================================================== --- /issm/trunk-jpl/src/m/classes/groundingline.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/groundingline.py (revision 14141) @@ -30,5 +30,5 @@ string=' grounding line solution parameters:' - string="%s\n\n%s"%(string,fielddisplay(self,'migration','type of grounding line migration: ''SoftMigration'',''AgressiveMigration'' or ''None''')) + 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')) return string Index: /issm/trunk-jpl/src/m/classes/hydrology.py =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrology.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/hydrology.py (revision 14141) @@ -32,5 +32,5 @@ string=' hydrology solution parameters:' - string="%s\n\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)')) string="%s\n%s"%(string,fielddisplay(self,'n','Manning roughness coefficient')) string="%s\n%s"%(string,fielddisplay(self,'CR','tortuosity parameter')) Index: /issm/trunk-jpl/src/m/classes/inversion.m =================================================================== --- /issm/trunk-jpl/src/m/classes/inversion.m (revision 14140) +++ /issm/trunk-jpl/src/m/classes/inversion.m (revision 14141) @@ -105,4 +105,5 @@ end % }}} function disp(obj) % {{{ + disp(sprintf(' inversion parameters:')); fielddisplay(obj,'iscontrol','is inversion activated?'); fielddisplay(obj,'incomplete_adjoint','do we assume linear viscosity?'); Index: /issm/trunk-jpl/src/m/classes/inversion.py =================================================================== --- /issm/trunk-jpl/src/m/classes/inversion.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/inversion.py (revision 14141) @@ -45,5 +45,5 @@ def __repr__(self): # {{{ Display - string='\n Inversion parameters:' + 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?')) Index: /issm/trunk-jpl/src/m/classes/mask.m =================================================================== --- /issm/trunk-jpl/src/m/classes/mask.m (revision 14140) +++ /issm/trunk-jpl/src/m/classes/mask.m (revision 14141) @@ -35,4 +35,6 @@ end % }}} function disp(obj) % {{{ + disp(sprintf(' masks:')); + fielddisplay(obj,'elementonfloatingice','element on floating ice flags list'); fielddisplay(obj,'vertexonfloatingice','vertex on floating ice flags list'); Index: /issm/trunk-jpl/src/m/classes/mask.py =================================================================== --- /issm/trunk-jpl/src/m/classes/mask.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/mask.py (revision 14141) @@ -29,6 +29,6 @@ def __repr__(self): # {{{ Display + string=" masks:" - string=""; string="%s\n%s"%(string,fielddisplay(self,"elementonfloatingice","element on floating ice flags list")) string="%s\n%s"%(string,fielddisplay(self,"vertexonfloatingice","vertex on floating ice flags list")) Index: /issm/trunk-jpl/src/m/classes/matice.m =================================================================== --- /issm/trunk-jpl/src/m/classes/matice.m (revision 14140) +++ /issm/trunk-jpl/src/m/classes/matice.m (revision 14141) @@ -89,5 +89,5 @@ end % }}} function disp(obj) % {{{ - disp(sprintf(' Materials:\n')); + disp(sprintf(' Materials:')); fielddisplay(obj,'rho_ice','ice density [kg/m^3]'); Index: /issm/trunk-jpl/src/m/classes/matice.py =================================================================== --- /issm/trunk-jpl/src/m/classes/matice.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/matice.py (revision 14141) @@ -38,5 +38,5 @@ string=" Materials:" - string="%s\n\n%s"%(string,fielddisplay(self,"rho_ice","ice density [kg/m^3]")) + string="%s\n%s"%(string,fielddisplay(self,"rho_ice","ice density [kg/m^3]")) string="%s\n%s"%(string,fielddisplay(self,"rho_water","water density [kg/m^3]")) string="%s\n%s"%(string,fielddisplay(self,"rho_freshwater","fresh water density [kg/m^3]")) Index: /issm/trunk-jpl/src/m/classes/mesh.py =================================================================== --- /issm/trunk-jpl/src/m/classes/mesh.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/mesh.py (revision 14141) @@ -63,7 +63,9 @@ def __repr__(self): # {{{ Display + string=" Mesh:" + if self.dimension==3: - string="\n%s"%(" Elements and vertices of the original 2d mesh:") + string="%s\n%s"%(string,"\n Elements and vertices of the original 2d mesh:") string="%s\n%s"%(string,fielddisplay(self,"numberofelements2d","number of elements")) @@ -73,7 +75,7 @@ string="%s\n%s"%(string,fielddisplay(self,"y2d","vertices y coordinate")) - string="%s\n%s" %(string,"Elements and vertices of the extruded 3d mesh:") + string="%s\n%s"%(string,"\n\n Elements and vertices of the extruded 3d mesh:") else: - string="\n%s"%(" Elements and vertices:") + string="%s\n%s"%(string,"\n Elements and vertices:") string="%s\n%s"%(string,fielddisplay(self,"numberofelements","number of elements")) string="%s\n%s"%(string,fielddisplay(self,"numberofvertices","number of vertices")) @@ -85,5 +87,5 @@ string="%s\n%s"%(string,fielddisplay(self,"numberofedges","number of edges of the 2d mesh")) - string="%s%s"%(string,"\n Properties:") + string="%s%s"%(string,"\n\n Properties:") string="%s\n%s"%(string,fielddisplay(self,"dimension","mesh dimension (2d or 3d)")) string="%s\n%s"%(string,fielddisplay(self,"numberoflayers","number of extrusion layers")) @@ -103,9 +105,9 @@ string="%s\n%s"%(string,fielddisplay(self,"average_vertex_connectivity","average number of vertices connected to one vertex")) - string="%s%s"%(string,"\n Extracted model:") + string="%s%s"%(string,"\n\n Extracted model:") string="%s\n%s"%(string,fielddisplay(self,"extractedvertices","vertices extracted from the model")) string="%s\n%s"%(string,fielddisplay(self,"extractedelements","elements extracted from the model")) - string="%s%s"%(string,"\n Projection:") + 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")) Index: /issm/trunk-jpl/src/m/classes/miscellaneous.py =================================================================== --- /issm/trunk-jpl/src/m/classes/miscellaneous.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/miscellaneous.py (revision 14141) @@ -29,5 +29,5 @@ string=' miscellaneous parameters:' - string="%s\n\n%s"%(string,fielddisplay(self,'notes','notes in a cell of strings')) + string="%s\n%s"%(string,fielddisplay(self,'notes','notes in a cell of strings')) string="%s\n%s"%(string,fielddisplay(self,'name','model name')) string="%s\n%s"%(string,fielddisplay(self,'dummy','empty field to store some data')) Index: /issm/trunk-jpl/src/m/classes/prognostic.py =================================================================== --- /issm/trunk-jpl/src/m/classes/prognostic.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/prognostic.py (revision 14141) @@ -32,5 +32,5 @@ # {{{ Display string=' Prognostic solution parameters:' - string="%s\n\n%s"%(string,fielddisplay(self,'spcthickness','thickness constraints (NaN means no constraint)')) + 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,'hydrostatic_adjustment','adjustment of ice shelves surface and bed elevations: ''Incremental'' or ''Absolute'' ')) Index: /issm/trunk-jpl/src/m/classes/radaroverlay.py =================================================================== --- /issm/trunk-jpl/src/m/classes/radaroverlay.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/radaroverlay.py (revision 14141) @@ -24,5 +24,5 @@ # {{{ Display string=' radaroverlay parameters:' - string="%s\n\n%s"%(string,fielddisplay(self,'pwr','radar power image (matrix)')) + 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')) Index: /issm/trunk-jpl/src/m/classes/rifts.py =================================================================== --- /issm/trunk-jpl/src/m/classes/rifts.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/rifts.py (revision 14141) @@ -29,5 +29,5 @@ string=' rifts parameters:' - string="%s\n\n%s"%(string,fielddisplay(self,'riftstruct','structure containing all rift information (vertices coordinates, segments, type of melange, ...)')) + string="%s\n%s"%(string,fielddisplay(self,'riftstruct','structure containing all rift information (vertices coordinates, segments, type of melange, ...)')) string="%s\n%s"%(string,fielddisplay(self,'riftproperties','')) return string Index: /issm/trunk-jpl/src/m/classes/solver.py =================================================================== --- /issm/trunk-jpl/src/m/classes/solver.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/solver.py (revision 14141) @@ -3,7 +3,8 @@ from iluasmoptions import * from EnumToString import EnumToString -from MatlabFuncs import * +from fielddisplay import fielddisplay from EnumDefinitions import * from checkfield import * +from MatlabFuncs import * class solver(object): @@ -48,6 +49,7 @@ s ="List of solver options per analysis:\n\n" for analysis in vars(self).iterkeys(): - s+="%s :\n" % analysis - s+="%s\n" % getattr(self,analysis) +# s+="%s:\n\n" % analysis +# s+="%s\n" % getattr(self,analysis) + s+="%s\n" % fielddisplay(self,analysis,'') return s Index: /issm/trunk-jpl/src/m/classes/surfaceforcings.py =================================================================== --- /issm/trunk-jpl/src/m/classes/surfaceforcings.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/surfaceforcings.py (revision 14141) @@ -45,5 +45,5 @@ string=" surface forcings parameters:" - string="%s\n\n%s"%(string,fielddisplay(self,'precipitation','surface precipitation [m/yr water eq]')) + string="%s\n%s"%(string,fielddisplay(self,'precipitation','surface precipitation [m/yr water eq]')) string="%s\n%s"%(string,fielddisplay(self,'mass_balance','surface mass balance [m/yr ice eq]')) string="%s\n%s"%(string,fielddisplay(self,'ispdd','is pdd activated (0 or 1, default is 0)')) @@ -69,5 +69,4 @@ return string #}}} - def setdefaultparameters(self): # {{{setdefaultparameters Index: /issm/trunk-jpl/src/m/classes/thermal.py =================================================================== --- /issm/trunk-jpl/src/m/classes/thermal.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/thermal.py (revision 14141) @@ -32,5 +32,5 @@ # {{{ Display string=' Thermal solution parameters:' - string="%s\n\n%s"%(string,fielddisplay(self,'spctemperature','temperature constraints (NaN means no constraint)')) + 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,'maxiter','maximum number of non linear iterations')) Index: /issm/trunk-jpl/src/m/classes/timestepping.py =================================================================== --- /issm/trunk-jpl/src/m/classes/timestepping.py (revision 14140) +++ /issm/trunk-jpl/src/m/classes/timestepping.py (revision 14141) @@ -29,5 +29,5 @@ # {{{ Display string=" timestepping parameters:" - string="%s\n\n%s"%(string,fielddisplay(self,"start_time","simulation starting time [yrs]")) + 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]"))