Index: /issm/trunk/src/m/classes/public/display/displaybc.m =================================================================== --- /issm/trunk/src/m/classes/public/display/displaybc.m (revision 1276) +++ /issm/trunk/src/m/classes/public/display/displaybc.m (revision 1277) @@ -12,24 +12,24 @@ disp(sprintf('\n geography:')); -fielddisplay(md,' ','gridonboundary','grid on boundary flags list'); -fielddisplay(md,' ','elementoniceshelf','element on ice shelf flags list'); -fielddisplay(md,' ','gridoniceshelf','grid on ice shelf flags list'); -fielddisplay(md,' ','elementonicesheet','element on ice sheet flags list'); -fielddisplay(md,' ','gridonicesheet','grid on ice sheet flags list'); +fielddisplay(md,'gridonboundary','grid on boundary flags list'); +fielddisplay(md,'elementoniceshelf','element on ice shelf flags list'); +fielddisplay(md,'gridoniceshelf','grid on ice shelf flags list'); +fielddisplay(md,'elementonicesheet','element on ice sheet flags list'); +fielddisplay(md,'gridonicesheet','grid on ice sheet flags list'); disp(sprintf('\n diagnostic:')); -fielddisplay(md,' ','gridondirichlet_diag','grid on dirichlet flags list'); -fielddisplay(md,' ','dirichletvalues_diag','values of the dirichlet [m/a]'); -fielddisplay(md,' ','segmentonneumann_diag','segments on ice front list'); -fielddisplay(md,' ','neumannvalues_diag','values of the Neumann [N]'); +fielddisplay(md,'gridondirichlet_diag','grid on dirichlet flags list'); +fielddisplay(md,'dirichletvalues_diag','values of the dirichlet [m/a]'); +fielddisplay(md,'segmentonneumann_diag','segments on ice front list'); +fielddisplay(md,'neumannvalues_diag','values of the Neumann [N]'); disp(sprintf('\n prognostic:')); -fielddisplay(md,' ','gridondirichlet_prog','grid on dirichlet flags list'); -fielddisplay(md,' ','dirichletvalues_prog','values of the dirichlet [m]'); -fielddisplay(md,' ','segmentonneumann_prog','segments on ice front list'); -fielddisplay(md,' ','neumannvalues_prog','values of the Neumann [m/a]'); +fielddisplay(md,'gridondirichlet_prog','grid on dirichlet flags list'); +fielddisplay(md,'dirichletvalues_prog','values of the dirichlet [m]'); +fielddisplay(md,'segmentonneumann_prog','segments on ice front list'); +fielddisplay(md,'neumannvalues_prog','values of the Neumann [m/a]'); disp(sprintf('\n thermal:')); -fielddisplay(md,' ','gridondirichlet_thermal','grid on dirichlet flags list'); -fielddisplay(md,' ','dirichletvalues_thermal','values of the dirichlet [m]'); -fielddisplay(md,' ','melting','melting rate [m/a]'); +fielddisplay(md,'gridondirichlet_thermal','grid on dirichlet flags list'); +fielddisplay(md,'dirichletvalues_thermal','values of the dirichlet [m]'); +fielddisplay(md,'melting','melting rate [m/a]'); Index: /issm/trunk/src/m/classes/public/display/displaycontrol.m =================================================================== --- /issm/trunk/src/m/classes/public/display/displaycontrol.m (revision 1276) +++ /issm/trunk/src/m/classes/public/display/displaycontrol.m (revision 1277) @@ -9,15 +9,15 @@ % displaycontrol(md) -disp(sprintf(' Control:\n')); +disp(sprintf(' Control solution parameters:\n')); -fielddisplay(md,' ','control_type','parameter where inverse control is carried out; ex: ''drag'', or ''B'')'); -fielddisplay(md,' ','nsteps','number of optimization searches'); -fielddisplay(md,' ','optscal','scaling factor on gradient direction during optimization, for each optimization step'); -fielddisplay(md,' ','fit','''absolute: 0'', ''relative: 1'', or ''logarithmic: 2''. default is ''absolute: 0'', for each optimization steps'); -fielddisplay(md,' ','maxiter','maximum iterations during each optimization step'); -fielddisplay(md,' ','tolx','minimum tolerance which will stop one optimization search'); -fielddisplay(md,' ','mincontrolconstraint','minimum contraint for the controlled parameters'); -fielddisplay(md,' ','maxcontrolconstraint','maximum contraint for the controlled parameters'); -fielddisplay(md,' ','meanvel','velocity scaling factor when evaluating relative or logarithmic misfit'); -fielddisplay(md,' ','epsvel','for relative fit, avoids misfit becoming infinity, for logarithmic fit, threshold for velocity'); -fielddisplay(md,' ','plot','visualization of the results of each iteration yes -> 1 no -> 0. Default is 1'); +fielddisplay(md,'control_type','parameter where inverse control is carried out; ex: ''drag'', or ''B'')'); +fielddisplay(md,'nsteps','number of optimization searches'); +fielddisplay(md,'optscal','scaling factor on gradient direction during optimization, for each optimization step'); +fielddisplay(md,'fit','''absolute: 0'', ''relative: 1'', or ''logarithmic: 2''. default is ''absolute: 0'', for each optimization steps'); +fielddisplay(md,'maxiter','maximum iterations during each optimization step'); +fielddisplay(md,'tolx','minimum tolerance which will stop one optimization search'); +fielddisplay(md,'mincontrolconstraint','minimum contraint for the controlled parameters'); +fielddisplay(md,'maxcontrolconstraint','maximum contraint for the controlled parameters'); +fielddisplay(md,'meanvel','velocity scaling factor when evaluating relative or logarithmic misfit'); +fielddisplay(md,'epsvel','for relative fit, avoids misfit becoming infinity, for logarithmic fit, threshold for velocity'); +fielddisplay(md,'plot','visualization of the results of each iteration yes -> 1 no -> 0. Default is 1'); Index: /issm/trunk/src/m/classes/public/display/displaydiagnostic.m =================================================================== --- /issm/trunk/src/m/classes/public/display/displaydiagnostic.m (revision 1276) +++ /issm/trunk/src/m/classes/public/display/displaydiagnostic.m (revision 1277) @@ -9,27 +9,27 @@ % displaydiagnostic(md) -disp(sprintf(' Diagnostic parameters:')); +disp(sprintf(' Diagnostic solution parameters:')); disp(sprintf('\n %s','Newton convergence criteria:')); -fielddisplay(md,' ','eps_rel','velocity relative convergence criterion'); -fielddisplay(md,' ','eps_abs','velocity absolute convergence criterion'); -fielddisplay(md,' ','viscosity_overshoot','over-shooting constant new=new+C*(new-old)'); +fielddisplay(md,'eps_rel','velocity relative convergence criterion'); +fielddisplay(md,'eps_abs','velocity absolute convergence criterion'); +fielddisplay(md,'viscosity_overshoot','over-shooting constant new=new+C*(new-old)'); disp(sprintf('\n boundary conditions:')); -fielddisplay(md,' ','gridondirichlet_diag','grid on dirichlet flags list'); -fielddisplay(md,' ','dirichletvalues_diag','values of the dirichlet [m/a]'); -fielddisplay(md,' ','segmentonneumann_diag','segments on ice front list'); -fielddisplay(md,' ','neumannvalues_diag','values of the Neumann [N]'); +fielddisplay(md,'gridondirichlet_diag','grid on dirichlet flags list'); +fielddisplay(md,'dirichletvalues_diag','values of the dirichlet [m/a]'); +fielddisplay(md,'segmentonneumann_diag','segments on ice front list'); +fielddisplay(md,'neumannvalues_diag','values of the Neumann [N]'); disp(sprintf('\n %s','Penalties:')); -fielddisplay(md,' ','penalty_offset','offset used by penalties: penalty = Kmax*10^offset'); +fielddisplay(md,'penalty_offset','offset used by penalties: penalty = Kmax*10^offset'); disp(sprintf('\n %s','Memory management:')); -fielddisplay(md,' ','lowmem','Set to 1 if you are running low on cluster memory'); -fielddisplay(md,' ','sparsity','matrix sparsity. Set to .001 for < 1M dof, .0001 for 5M dof, and .00001 for > 10M dof'); -fielddisplay(md,' ','connectivity','element connectivity'); +fielddisplay(md,'lowmem','Set to 1 if you are running low on cluster memory'); +fielddisplay(md,'sparsity','matrix sparsity. Set to .001 for < 1M dof, .0001 for 5M dof, and .00001 for > 10M dof'); +fielddisplay(md,'connectivity','element connectivity'); disp(sprintf('\n %s','Debugging:')); -fielddisplay(md,' ','debug','output debug statements when possible yes-> 1, no -> 0. Default is 1'); -fielddisplay(md,' ','element_debug','output debug statements for elementswhen possible yes-> 1, no -> 0. Default is 0'); -fielddisplay(md,' ','element_debugid','if element_debug on, id of element for which to output messages'); +fielddisplay(md,'debug','output debug statements when possible yes-> 1, no -> 0. Default is 1'); +fielddisplay(md,'element_debug','output debug statements for elementswhen possible yes-> 1, no -> 0. Default is 0'); +fielddisplay(md,'element_debugid','if element_debug on, id of element for which to output messages'); Index: /issm/trunk/src/m/classes/public/display/displayexppar.m =================================================================== --- /issm/trunk/src/m/classes/public/display/displayexppar.m (revision 1276) +++ /issm/trunk/src/m/classes/public/display/displayexppar.m (revision 1277) @@ -10,9 +10,9 @@ disp(sprintf('\n Outlines:')); -fielddisplay(md,' ','domainoutline','domain outline Argus file'); -fielddisplay(md,' ','riftoutline','rift outline Argus file'); -fielddisplay(md,' ','iceshelfoutline','ice shelf outline Argus file'); -fielddisplay(md,' ','icesheetoutline','ice sheet outline Argus file'); +fielddisplay(md,'domainoutline','domain outline Argus file'); +fielddisplay(md,'riftoutline','rift outline Argus file'); +fielddisplay(md,'iceshelfoutline','ice shelf outline Argus file'); +fielddisplay(md,'icesheetoutline','ice sheet outline Argus file'); disp(sprintf('\n Model files:')); -fielddisplay(md,' ','parameterfile','parameter file content'); +fielddisplay(md,'parameterfile','parameter file content'); Index: /issm/trunk/src/m/classes/public/display/displaymaterials.m =================================================================== --- /issm/trunk/src/m/classes/public/display/displaymaterials.m (revision 1276) +++ /issm/trunk/src/m/classes/public/display/displaymaterials.m (revision 1277) @@ -11,12 +11,12 @@ disp(sprintf(' Materials:\n')); -fielddisplay(md,' ','rho_ice','ice density [kg/m^3]'); -fielddisplay(md,' ','rho_water','water density [kg/m^3]'); -fielddisplay(md,' ','B','flow law parameter [Pa/s^(1/n)]'); -fielddisplay(md,' ','heatcapacity','heat capacity [J/kg/K]'); -fielddisplay(md,' ','thermalconductivity','ice thermal conductivity [W/m/K]'); -fielddisplay(md,' ','meltingpoint','melting point of ice at 1atm in K'); -fielddisplay(md,' ','latentheat','latent heat of fusion [J/m^3]'); -fielddisplay(md,' ','beta','rate of change of melting point with pressure [K/Pa]'); -fielddisplay(md,' ','mixed_layer_capacity','mixed layer capacity [W/kg/K]'); -fielddisplay(md,' ','thermal_exchange_velocity','thermal exchange velocity [m/s]'); +fielddisplay(md,'rho_ice','ice density [kg/m^3]'); +fielddisplay(md,'rho_water','water density [kg/m^3]'); +fielddisplay(md,'B','flow law parameter [Pa/s^(1/n)]'); +fielddisplay(md,'heatcapacity','heat capacity [J/kg/K]'); +fielddisplay(md,'thermalconductivity','ice thermal conductivity [W/m/K]'); +fielddisplay(md,'meltingpoint','melting point of ice at 1atm in K'); +fielddisplay(md,'latentheat','latent heat of fusion [J/m^3]'); +fielddisplay(md,'beta','rate of change of melting point with pressure [K/Pa]'); +fielddisplay(md,'mixed_layer_capacity','mixed layer capacity [W/kg/K]'); +fielddisplay(md,'thermal_exchange_velocity','thermal exchange velocity [m/s]'); Index: /issm/trunk/src/m/classes/public/display/displaymesh.m =================================================================== --- /issm/trunk/src/m/classes/public/display/displaymesh.m (revision 1276) +++ /issm/trunk/src/m/classes/public/display/displaymesh.m (revision 1277) @@ -14,11 +14,11 @@ disp(sprintf('\n Elements and nodes of the original 2d mesh:')); - fielddisplay(md,' ','numberofelements2d','number of elements'); - fielddisplay(md,' ','numberofgrids2d','number of nodes'); - fielddisplay(md,' ','elements2d','index into (x,y,z), coordinates of the grids'); - fielddisplay(md,' ','elements_type2d','element types'); - fielddisplay(md,' ','x2d','nodes x coordinate'); - fielddisplay(md,' ','y2d','nodes y coordinate'); - fielddisplay(md,' ','z2d','nodes z coordinate'); + fielddisplay(md,'numberofelements2d','number of elements'); + fielddisplay(md,'numberofgrids2d','number of nodes'); + fielddisplay(md,'elements2d','index into (x,y,z), coordinates of the grids'); + fielddisplay(md,'elements_type2d','element types'); + fielddisplay(md,'x2d','nodes x coordinate'); + fielddisplay(md,'y2d','nodes y coordinate'); + fielddisplay(md,'z2d','nodes z coordinate'); disp(sprintf('\n Elements and nodes of the extruded 3d mesh:')); @@ -26,19 +26,19 @@ disp(sprintf('\n Elements and nodes:')); end -fielddisplay(md,' ','numberofelements','number of elements'); -fielddisplay(md,' ','numberofgrids','number of nodes'); -fielddisplay(md,' ','elements','index into (x,y,z), coordinates of the grids'); -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,' ','numlayers','number of extrusion layers'); -fielddisplay(md,' ','dof','maximum number of dofs solved'); +fielddisplay(md,'numberofelements','number of elements'); +fielddisplay(md,'numberofgrids','number of nodes'); +fielddisplay(md,'elements','index into (x,y,z), coordinates of the grids'); +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,'numlayers','number of extrusion layers'); +fielddisplay(md,'dof','maximum number of dofs solved'); disp(sprintf('\n Properties:')); -fielddisplay(md,' ','type','mesh type'); -fielddisplay(md,' ','penalties','penalties list'); -fielddisplay(md,' ','gridonbed','lower nodes flags list'); -fielddisplay(md,' ','elementonbed','lower elements flags list'); -fielddisplay(md,' ','gridonsurface','upper nodes flags list'); -fielddisplay(md,' ','elementonsurface','upper elements flags list'); +fielddisplay(md,'type','mesh type'); +fielddisplay(md,'penalties','penalties list'); +fielddisplay(md,'gridonbed','lower nodes flags list'); +fielddisplay(md,'elementonbed','lower elements flags list'); +fielddisplay(md,'gridonsurface','upper nodes flags list'); +fielddisplay(md,'elementonsurface','upper elements flags list'); Index: /issm/trunk/src/m/classes/public/display/displaymesh2grid.m =================================================================== --- /issm/trunk/src/m/classes/public/display/displaymesh2grid.m (revision 1276) +++ /issm/trunk/src/m/classes/public/display/displaymesh2grid.m (revision 1277) @@ -11,12 +11,12 @@ disp(sprintf(' Mesh2grid solution parameters:\n')); -fielddisplay(md,' ','mesh2grid_parameters','list of parameters for which mesh 2 grid interpolation is carried out; ex: {''drag''}, or {''drag'',''B''}'); -fielddisplay(md,' ','mesh2grid_interpolation','list of interpolation (''node'' or ''element'') for each parameter ex: {''node''}, or {''node'',''element''}'); -fielddisplay(md,' ','mesh2grid_filter','list of filter (''average'' or ''nearest'') for each parameter ex: {''average''}, or {''average'',''nearest''}'); -fielddisplay(md,' ','mesh2grid_cornereast','corner east of square grid'); -fielddisplay(md,' ','mesh2grid_cornernorth','corner north of square grid'); -fielddisplay(md,' ','mesh2grid_xposting','x posting of grid [m]'); -fielddisplay(md,' ','mesh2grid_yposting','y posting of grid [m]'); -fielddisplay(md,' ','mesh2grid_nlines','number of grid lines'); -fielddisplay(md,' ','mesh2grid_ncolumns','number of grid columns'); -fielddisplay(md,' ','mesh2grid_windowsize','size of filter'); +fielddisplay(md,'mesh2grid_parameters','list of parameters for which mesh 2 grid interpolation is carried out; ex: {''drag''}, or {''drag'',''B''}'); +fielddisplay(md,'mesh2grid_interpolation','list of interpolation (''node'' or ''element'') for each parameter ex: {''node''}, or {''node'',''element''}'); +fielddisplay(md,'mesh2grid_filter','list of filter (''average'' or ''nearest'') for each parameter ex: {''average''}, or {''average'',''nearest''}'); +fielddisplay(md,'mesh2grid_cornereast','corner east of square grid'); +fielddisplay(md,'mesh2grid_cornernorth','corner north of square grid'); +fielddisplay(md,'mesh2grid_xposting','x posting of grid [m]'); +fielddisplay(md,'mesh2grid_yposting','y posting of grid [m]'); +fielddisplay(md,'mesh2grid_nlines','number of grid lines'); +fielddisplay(md,'mesh2grid_ncolumns','number of grid columns'); +fielddisplay(md,'mesh2grid_windowsize','size of filter'); Index: /issm/trunk/src/m/classes/public/display/displayobservations.m =================================================================== --- /issm/trunk/src/m/classes/public/display/displayobservations.m (revision 1276) +++ /issm/trunk/src/m/classes/public/display/displayobservations.m (revision 1277) @@ -11,8 +11,8 @@ disp(sprintf(' Observations:\n')); -fielddisplay(md,' ','vx_obs','observed velocity x component [m/a]'); -fielddisplay(md,' ','vy_obs','observed velocity y component [m/a]'); -fielddisplay(md,' ','vel_obs','observed velocity magnitude [m/a]'); -fielddisplay(md,' ','accumulation','surface accumulation rate [m/a]'); -fielddisplay(md,' ','observed_temperature','observed temperature [K]'); -fielddisplay(md,' ','geothermalflux','geothermal heat flux [W/m^2]'); +fielddisplay(md,'vx_obs','observed velocity x component [m/a]'); +fielddisplay(md,'vy_obs','observed velocity y component [m/a]'); +fielddisplay(md,'vel_obs','observed velocity magnitude [m/a]'); +fielddisplay(md,'accumulation','surface accumulation rate [m/a]'); +fielddisplay(md,'observed_temperature','observed temperature [K]'); +fielddisplay(md,'geothermalflux','geothermal heat flux [W/m^2]'); Index: /issm/trunk/src/m/classes/public/display/displayparallel.m =================================================================== --- /issm/trunk/src/m/classes/public/display/displayparallel.m (revision 1276) +++ /issm/trunk/src/m/classes/public/display/displayparallel.m (revision 1277) @@ -12,14 +12,14 @@ disp(sprintf('\n parallelisation:')); -fielddisplay(md,' ','cluster','set to ''cluster_name'' to run in cluster, ''none'' to run serially'); -fielddisplay(md,' ','np','number of CPUS requested on cluster'); -fielddisplay(md,' ','exclusive','set to 1 if CPUS used are not to be shared with other users, 0 otherwise'); -fielddisplay(md,' ','time','amount of time requested on cluster'); -fielddisplay(md,' ','alloc_cleanup','allocation cleanup before starting a job, default 1'); -fielddisplay(md,' ','waitonlock','wait for batch results 1, or return 0. default is to return'); -fielddisplay(md,' ','queue','special queue name on cluster? default is '''' '); +fielddisplay(md,'cluster','set to ''cluster_name'' to run in cluster, ''none'' to run serially'); +fielddisplay(md,'np','number of CPUS requested on cluster'); +fielddisplay(md,'exclusive','set to 1 if CPUS used are not to be shared with other users, 0 otherwise'); +fielddisplay(md,'time','amount of time requested on cluster'); +fielddisplay(md,'alloc_cleanup','allocation cleanup before starting a job, default 1'); +fielddisplay(md,'waitonlock','wait for batch results 1, or return 0. default is to return'); +fielddisplay(md,'queue','special queue name on cluster? default is '''' '); disp(sprintf('\n ice solver options:')); -fielddisplay(md,' ','solver_type','solver type for Ice: ''general'', ''lu'' or ''cholesky'''); +fielddisplay(md,'solver_type','solver type for Ice: ''general'', ''lu'' or ''cholesky'''); disp(sprintf('\n cielo solver options:')); -fielddisplay(md,' ','solverstring','solver string for Petsc. See solversetto... routines. Default is mumps'); +fielddisplay(md,'solverstring','solver string for Petsc. See solversetto... routines. Default is mumps'); Index: /issm/trunk/src/m/classes/public/display/displayparameters.m =================================================================== --- /issm/trunk/src/m/classes/public/display/displayparameters.m (revision 1276) +++ /issm/trunk/src/m/classes/public/display/displayparameters.m (revision 1277) @@ -12,19 +12,19 @@ disp(sprintf('\n geometry:')); -fielddisplay(md,' ','surface','surface height [m]'); -fielddisplay(md,' ','thickness','thickness [m]'); -fielddisplay(md,' ','bed','bed height [m]'); -fielddisplay(md,' ','firn_layer','firn layer height [m]'); -fielddisplay(md,' ','elementonbed','element on bed flags list'); -fielddisplay(md,' ','elementonsurface','element on surface flags list'); -fielddisplay(md,' ','gridonbed','grid on bed flags list'); -fielddisplay(md,' ','gridonsurface','grid on surface flags list'); +fielddisplay(md,'surface','surface height [m]'); +fielddisplay(md,'thickness','thickness [m]'); +fielddisplay(md,'bed','bed height [m]'); +fielddisplay(md,'firn_layer','firn layer height [m]'); +fielddisplay(md,'elementonbed','element on bed flags list'); +fielddisplay(md,'elementonsurface','element on surface flags list'); +fielddisplay(md,'gridonbed','grid on bed flags list'); +fielddisplay(md,'gridonsurface','grid on surface flags list'); disp(sprintf('\n physical parameters:')); -fielddisplay(md,' ','g','acceleration due to gravity [m/s^2]'); +fielddisplay(md,'g','acceleration due to gravity [m/s^2]'); disp(sprintf('\n Friction parameters (Sigma= drag^2 * Neff ^r * u ^s, with Neff=rho_ice*g*thickness+rho_ice*g*bed, r=q/p and s=1/p)')); -fielddisplay(md,' ','drag_type','0: none, 1:plastic, 2:viscous'); -fielddisplay(md,' ','drag','friction coefficient [IS]'); -fielddisplay(md,' ','p','p exponent'); -fielddisplay(md,' ','q','q exponent'); +fielddisplay(md,'drag_type','0: none, 1:plastic, 2:viscous'); +fielddisplay(md,'drag','friction coefficient [IS]'); +fielddisplay(md,'p','p exponent'); +fielddisplay(md,'q','q exponent'); Index: /issm/trunk/src/m/classes/public/display/displayprognostic.m =================================================================== --- /issm/trunk/src/m/classes/public/display/displayprognostic.m (revision 1276) +++ /issm/trunk/src/m/classes/public/display/displayprognostic.m (revision 1277) @@ -12,11 +12,11 @@ disp(sprintf('\n transient:')); -fielddisplay(md,' ','dt','time step [yr]'); -fielddisplay(md,' ','ndt','time span [yr]'); -fielddisplay(md,' ','artificial_diffusivity','yes->1, no->0'); +fielddisplay(md,'dt','time step [yr]'); +fielddisplay(md,'ndt','time span [yr]'); +fielddisplay(md,'artificial_diffusivity','yes->1, no->0'); disp(sprintf('\n boundary conditions:')); -fielddisplay(md,' ','gridondirichlet_prog','grid on dirichlet flags list'); -fielddisplay(md,' ','dirichletvalues_prog','values of the dirichlet [m]'); -fielddisplay(md,' ','segmentonneumann_prog','segments on ice front list'); -fielddisplay(md,' ','neumannvalues_prog','values of the Neumann [m/a]'); +fielddisplay(md,'gridondirichlet_prog','grid on dirichlet flags list'); +fielddisplay(md,'dirichletvalues_prog','values of the dirichlet [m]'); +fielddisplay(md,'segmentonneumann_prog','segments on ice front list'); +fielddisplay(md,'neumannvalues_prog','values of the Neumann [m/a]'); Index: /issm/trunk/src/m/classes/public/display/displayresults.m =================================================================== --- /issm/trunk/src/m/classes/public/display/displayresults.m (revision 1276) +++ /issm/trunk/src/m/classes/public/display/displayresults.m (revision 1277) @@ -12,8 +12,8 @@ disp(sprintf('\n solution results:')); -fielddisplay(md,' ','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]'); +fielddisplay(md,'stress','stress [Pa]'); +fielddisplay(md,'deviatoricstress','deviatoric stress [Pa]'); +fielddisplay(md,'strainrate','strain rate [1/yr]'); Index: /issm/trunk/src/m/classes/public/display/displaythermal.m =================================================================== --- /issm/trunk/src/m/classes/public/display/displaythermal.m (revision 1276) +++ /issm/trunk/src/m/classes/public/display/displaythermal.m (revision 1277) @@ -12,9 +12,9 @@ disp(sprintf('\n boundary conditions:')); -fielddisplay(md,' ','gridondirichlet_thermal','grid on dirichlet flags list'); -fielddisplay(md,' ','dirichletvalues_thermal','values of the dirichlet [m]'); -fielddisplay(md,' ','melting','melting rate [m/a]'); +fielddisplay(md,'gridondirichlet_thermal','grid on dirichlet flags list'); +fielddisplay(md,'dirichletvalues_thermal','values of the dirichlet [m]'); +fielddisplay(md,'melting','melting rate [m/a]'); disp(sprintf('\n transient:')); -fielddisplay(md,' ','dt','time step [yr]'); -fielddisplay(md,' ','ndt','time span [yr]'); +fielddisplay(md,'dt','time step [yr]'); +fielddisplay(md,'ndt','time span [yr]'); Index: /issm/trunk/src/m/classes/public/display/displaytransient.m =================================================================== --- /issm/trunk/src/m/classes/public/display/displaytransient.m (revision 1276) +++ /issm/trunk/src/m/classes/public/display/displaytransient.m (revision 1277) @@ -18,9 +18,9 @@ disp(sprintf(' Transient solution parameters:\n')); -fielddisplay(md,' ','timestepping','adptative time stepping implemented - default to 0'); -fielddisplay(md,' ','deltaH','minimum thickness difference between two time steps'); -fielddisplay(md,' ','DeltaH','maximum thickness difference between two time steps'); -fielddisplay(md,' ','deltaT','minimum temperature difference between two time steps'); -fielddisplay(md,' ','DeltaT','maximum temperature difference between two time steps'); -fielddisplay(md,' ','timeacc','multiplier to time step when time stepping increases time step'); -fielddisplay(md,' ','timedec','multiplier to time step when time stepping decresaes time step'); +fielddisplay(md,'timestepping','adptative time stepping implemented - default to 0'); +fielddisplay(md,'deltaH','minimum thickness difference between two time steps'); +fielddisplay(md,'DeltaH','maximum thickness difference between two time steps'); +fielddisplay(md,'deltaT','minimum temperature difference between two time steps'); +fielddisplay(md,'DeltaT','maximum temperature difference between two time steps'); +fielddisplay(md,'timeacc','multiplier to time step when time stepping increases time step'); +fielddisplay(md,'timedec','multiplier to time step when time stepping decresaes time step'); Index: /issm/trunk/src/m/classes/public/display/fielddisplay.m =================================================================== --- /issm/trunk/src/m/classes/public/display/fielddisplay.m (revision 1276) +++ /issm/trunk/src/m/classes/public/display/fielddisplay.m (revision 1277) @@ -1,3 +1,3 @@ -function fielddisplay(md,offset,name,comment) +function fielddisplay(md,name,comment) %FIELDDISPLAY - display model field % @@ -8,6 +8,6 @@ field=md.(name); - %disp corresponding line as a function of field type - parsedisplay(offset,name,field,comment); + %disp corresponding line as a function of field type (offset set as 9 spaces) + parsedisplay(' ',name,field,comment); end %function