Index: /issm/trunk/src/m/classes/model/model.m =================================================================== --- /issm/trunk/src/m/classes/model/model.m (revision 9781) +++ /issm/trunk/src/m/classes/model/model.m (revision 9782) @@ -395,37 +395,36 @@ %}}} function disp(obj) % {{{ - fielddisplay(obj,'mesh' ,'mesh properties'); - fielddisplay(obj,'mask' ,'defines grounded and floating elements'); - fielddisplay(obj,'geometry' ,'surface elevation, bedrock topography, ice thicknes,...'); - fielddisplay(obj,'constants' ,'physical constants'); - fielddisplay(obj,'surfaceforcings' ,'surface mass balance'); - fielddisplay(obj,'basalforcings' ,'bed forcings'); - fielddisplay(obj,'materials' ,'material properties'); - fielddisplay(obj,'friction' ,'friction properties'); - fielddisplay(obj,'flowequation' ,'flow equations'); - fielddisplay(obj,'timestepping' ,'time stepping for transient models'); - fielddisplay(obj,'initialization' ,'initial guess/state'); - fielddisplay(obj,'rifts' ,'rifts properties'); - fielddisplay(obj,'debug' ,'debugging tools (valgrind, gprof)'); - fielddisplay(obj,'verbose' ,'verbosity in solve'); - fielddisplay(obj,'settings' ,'settings properties'); - fielddisplay(obj,'solver' ,'solver properties'); - fielddisplay(obj,'cluster' ,'cluster properties'); - fielddisplay(obj,'balancethickness' ,'balancethickness properties'); - fielddisplay(obj,'diagnostic' ,'diagnostic properties'); - fielddisplay(obj,'groundingline' ,'groundingline properties'); - fielddisplay(obj,'hydrology' ,'hydrology properties'); - fielddisplay(obj,'prognostic' ,'prognostic properties'); - fielddisplay(obj,'thermal' ,'thermal properties'); - fielddisplay(obj,'steadystate' ,'steadystate properties'); - fielddisplay(obj,'transient' ,'transient properties'); - fielddisplay(obj,'autodiff' ,'autodiff properties'); - fielddisplay(obj,'flaim' ,'flaim properties'); - fielddisplay(obj,'inversion' ,'inversion properties'); - fielddisplay(obj,'qmu' ,'qmu properties'); - fielddisplay(obj,'results' ,'results properties'); - fielddisplay(obj,'radaroverlay' ,'radaroverlay properties'); - fielddisplay(obj,'miscellaneous' ,'miscellaneous properties'); - fielddisplay(obj,'private' ,'private properties'); + fielddisplay2(obj,'mesh' ,'mesh properties'); + fielddisplay2(obj,'mask' ,'defines grounded and floating elements'); + fielddisplay2(obj,'geometry' ,'surface elevation, bedrock topography, ice thicknes,...'); + fielddisplay2(obj,'constants' ,'physical constants'); + fielddisplay2(obj,'surfaceforcings' ,'surface forcings'); + fielddisplay2(obj,'basalforcings' ,'bed forcings'); + fielddisplay2(obj,'materials' ,'material properties'); + fielddisplay2(obj,'friction' ,'basal friction/drag properties'); + fielddisplay2(obj,'flowequation' ,'flow equations'); + fielddisplay2(obj,'timestepping' ,'time stepping for transient models'); + fielddisplay2(obj,'initialization' ,'initial guess/state'); + fielddisplay2(obj,'rifts' ,'rifts properties'); + fielddisplay2(obj,'debug' ,'debugging tools (valgrind, gprof)'); + fielddisplay2(obj,'verbose' ,'verbosity level in solve'); + fielddisplay2(obj,'settings' ,'settings properties'); + fielddisplay2(obj,'solver' ,'PETSc options for each solution'); + fielddisplay2(obj,'cluster' ,'cluster parameters (number of cpus...)'); + fielddisplay2(obj,'balancethickness' ,'parameters for balancethickness solution'); + fielddisplay2(obj,'diagnostic' ,'parameters for diagnostic solution'); + fielddisplay2(obj,'groundingline' ,'parameters for groundingline solution'); + fielddisplay2(obj,'hydrology' ,'parameters for hydrology solution'); + fielddisplay2(obj,'prognostic' ,'parameters for prognostic solution'); + fielddisplay2(obj,'thermal' ,'parameters for thermal solution'); + fielddisplay2(obj,'steadystate' ,'parameters for steadystate solution'); + fielddisplay2(obj,'transient' ,'parameters for transient solution'); + fielddisplay2(obj,'autodiff' ,'automatic differenciation parameters'); + fielddisplay2(obj,'flaim' ,'flaim parameters'); + fielddisplay2(obj,'inversion' ,'parameters for inverse methods'); + fielddisplay2(obj,'qmu' ,'dakota properties'); + fielddisplay2(obj,'results' ,'model results'); + fielddisplay2(obj,'radaroverlay' ,'radar image for plot overlay'); + fielddisplay2(obj,'miscellaneous' ,'miscellaneous fields'); end % }}} end Index: sm/trunk/src/m/model/display/displaybc.m =================================================================== --- /issm/trunk/src/m/model/display/displaybc.m (revision 9781) +++ (revision ) @@ -1,23 +1,0 @@ -function displaybc(md) -%DISPLAYBC - display of the boundary conditions fileds -% -% to avoid clobbering display.m with every field from model md, -% we create this routine that displays boundary conditions from model md, -% only if requested. -% -% Usage: -% displaybc(md) - -disp(sprintf(' Boundary conditions:')); - -disp(sprintf('\n diagnostic:')); -fielddisplay(md,'diagnostic.spcvx','x-axis velocity constraint (NaN means no constraint)'); -fielddisplay(md,'diagnostic.spcvy','y-axis velocity constraint (NaN means no constraint)'); -fielddisplay(md,'diagnostic.spcvz','z-axis velocity constraint (NaN means no constraint)'); -fielddisplay(md,'pressureload','segments on ice front list (0:Air 1:Water 2:Ice)'); - -disp(sprintf('\n prognostic:')); -fielddisplay(md,'spcthickness','thickness constraints (NaN means no constraint)'); - -disp(sprintf('\n thermal:')); -fielddisplay(md,'spctemperature','temperature constraints (NaN means no constraint)'); Index: sm/trunk/src/m/model/display/displaymesh.m =================================================================== --- /issm/trunk/src/m/model/display/displaymesh.m (revision 9781) +++ (revision ) @@ -1,43 +1,0 @@ -function displaymesh(md) -%DISPLAYMESH - display mesh information -% -% To avoid clobbering display.m with every field from model md, -% we create this routine that displays mesh information from model md, -% only if requested. -% -% Usage: -% displaymesh(md) - -disp(sprintf(' Mesh:')); - -if md.mesh.dimension==3, - - disp(sprintf('\n Elements and nodes of the original 2d mesh:')); - fielddisplay(md,'numberofelements2d','number of elements'); - fielddisplay(md,'numberofnodes2d','number of nodes'); - fielddisplay(md,'elements2d','index into (x,y,z), coordinates of the nodes'); - fielddisplay(md,'x2d','nodes x coordinate'); - fielddisplay(md,'y2d','nodes y coordinate'); - - disp(sprintf('\n Elements and nodes of the extruded 3d mesh:')); -else - disp(sprintf('\n Elements and nodes:')); -end -fielddisplay(md,'numberofelements','number of elements'); -fielddisplay(md,'numberofnodes','number of nodes'); -fielddisplay(md,'elements','index into (x,y,z), coordinates of the nodes'); -fielddisplay(md,'elements_type','element types'); -fielddisplay(md,'x','nodes x coordinate'); -fielddisplay(md,'y','nodes y coordinate'); -fielddisplay(md,'z','nodes z coordinate'); -fielddisplay(md,'edges','edges of the 2d mesh (node1 node2 element1 element2)'); - -disp(sprintf('\n Properties:')); -fielddisplay(md,'dim','mesh dimension (2d or 3d)'); -fielddisplay(md,'numlayers','number of extrusion layers'); -fielddisplay(md,'bamg','Geometry and 2d mesh properties (if generated by Bamg)'); -fielddisplay(md,'penalties','penalties list'); -fielddisplay(md,'mesh.vertexonbed','lower nodes flags list'); -fielddisplay(md,'mesh.elementonbed','lower elements flags list'); -fielddisplay(md,'mesh.vertexonsurface','upper nodes flags list'); -fielddisplay(md,'mesh.elementonsurface','upper elements flags list'); Index: sm/trunk/src/m/model/display/displayparallel.m =================================================================== --- /issm/trunk/src/m/model/display/displayparallel.m (revision 9781) +++ (revision ) @@ -1,15 +1,0 @@ -function displayparallel(md) -%DISPLAYPARALLEL - display parallel computation parameters -% -% To avoid clobbering display.m with every field from model md, -% we create this routine that displays all fields related to -% parallel computation from model md, only if requested. -% -% Usage: -% displayparallel(md) - -disp(sprintf(' parallel computation parameters:')); -disp('Cluster:'); -disp(md.cluster) -fielddisplay(md,'alloc_cleanup','allocation cleanup before starting a job, default 1'); -fielddisplay(md,'waitonlock','maximum number of minutes to wait for batch results, or return 0'); Index: sm/trunk/src/m/model/display/displayparameters.m =================================================================== --- /issm/trunk/src/m/model/display/displayparameters.m (revision 9781) +++ (revision ) @@ -1,27 +1,0 @@ -function displayparameters(md) -%DISPLAYPARAMETERS - display parameters -% -% To avoid clobbering display.m with every field from model md, -% we create this routine that displays parameters from model md, -% only if requested. -% -% Usage: -% displayparameters(md) - -disp(sprintf(' Parameters:')); - -disp(sprintf('\n geometrical parameters:')); -fielddisplay(md,'surface','surface height [m]'); -fielddisplay(md,'thickness','thickness [m]'); -fielddisplay(md,'bed','bed height [m]'); -fielddisplay(md,'bathymetry','bathymetry elevation (with respect to sea level) [m]'); -fielddisplay(md,'firn_layer','firn layer height [m]'); -fielddisplay(md,'mesh.elementonbed','element on bed flags list'); -fielddisplay(md,'mesh.elementonsurface','element on surface flags list'); -fielddisplay(md,'mesh.vertexonbed','node on bed flags list'); -fielddisplay(md,'mesh.vertexonsurface','node on surface flags list'); - -disp(sprintf('\n physical parameters:')); -fielddisplay(md,'g','acceleration due to gravity [m/s^2]'); - - Index: sm/trunk/src/m/model/display/displayresults.m =================================================================== --- /issm/trunk/src/m/model/display/displayresults.m (revision 9781) +++ (revision ) @@ -1,19 +1,0 @@ -function displayresults(md) -%DISPLAYRESULTS - display results -% -% To avoid clobbering display.m with every field from model md, -% we create this routine that displays results from model md, -% only if requested. -% -% Usage: -% displayresults(md) - -disp(sprintf(' Results:')); - -disp(sprintf('\n solution results:')); -fielddisplay(md,'results',''); - -disp(sprintf('\n output parameters:')); -fielddisplay(md,'stress','stress [Pa]'); -fielddisplay(md,'deviatoricstress','deviatoric stress [Pa]'); -fielddisplay(md,'strainrate','strain rate [1/yr]'); Index: /issm/trunk/src/m/model/display/fielddisplay2.m =================================================================== --- /issm/trunk/src/m/model/display/fielddisplay2.m (revision 9782) +++ /issm/trunk/src/m/model/display/fielddisplay2.m (revision 9782) @@ -0,0 +1,14 @@ +function fielddisplay2(md,name,comment) +%FIELDDISPLAY2 - display model field +% +% Usage: +% fielddisplay2(md,offset,name,comment) + + %get field + field=md.(name); + + if length(name)>23, + name=[name(1:20) '...']; + end + + disp(sprintf('%s%-23s -- %s',' ',name,comment));