Changeset 1277


Ignore:
Timestamp:
07/09/09 15:09:59 (15 years ago)
Author:
Mathieu Morlighem
Message:

improved display

Location:
issm/trunk/src/m/classes/public/display
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • issm/trunk/src/m/classes/public/display/displaybc.m

    r1252 r1277  
    1212
    1313disp(sprintf('\n      geography:'));
    14 fielddisplay(md,'         ','gridonboundary','grid on boundary flags list');
    15 fielddisplay(md,'         ','elementoniceshelf','element on ice shelf flags list');
    16 fielddisplay(md,'         ','gridoniceshelf','grid on ice shelf flags list');
    17 fielddisplay(md,'         ','elementonicesheet','element on ice sheet flags list');
    18 fielddisplay(md,'         ','gridonicesheet','grid on ice sheet flags list');
     14fielddisplay(md,'gridonboundary','grid on boundary flags list');
     15fielddisplay(md,'elementoniceshelf','element on ice shelf flags list');
     16fielddisplay(md,'gridoniceshelf','grid on ice shelf flags list');
     17fielddisplay(md,'elementonicesheet','element on ice sheet flags list');
     18fielddisplay(md,'gridonicesheet','grid on ice sheet flags list');
    1919
    2020disp(sprintf('\n      diagnostic:'));
    21 fielddisplay(md,'         ','gridondirichlet_diag','grid on dirichlet flags list');
    22 fielddisplay(md,'         ','dirichletvalues_diag','values of the dirichlet [m/a]');
    23 fielddisplay(md,'         ','segmentonneumann_diag','segments on ice front list');
    24 fielddisplay(md,'         ','neumannvalues_diag','values of the Neumann [N]');
     21fielddisplay(md,'gridondirichlet_diag','grid on dirichlet flags list');
     22fielddisplay(md,'dirichletvalues_diag','values of the dirichlet [m/a]');
     23fielddisplay(md,'segmentonneumann_diag','segments on ice front list');
     24fielddisplay(md,'neumannvalues_diag','values of the Neumann [N]');
    2525
    2626disp(sprintf('\n      prognostic:'));
    27 fielddisplay(md,'         ','gridondirichlet_prog','grid on dirichlet flags list');
    28 fielddisplay(md,'         ','dirichletvalues_prog','values of the dirichlet [m]');
    29 fielddisplay(md,'         ','segmentonneumann_prog','segments on ice front list');
    30 fielddisplay(md,'         ','neumannvalues_prog','values of the Neumann [m/a]');
     27fielddisplay(md,'gridondirichlet_prog','grid on dirichlet flags list');
     28fielddisplay(md,'dirichletvalues_prog','values of the dirichlet [m]');
     29fielddisplay(md,'segmentonneumann_prog','segments on ice front list');
     30fielddisplay(md,'neumannvalues_prog','values of the Neumann [m/a]');
    3131
    3232disp(sprintf('\n      thermal:'));
    33 fielddisplay(md,'         ','gridondirichlet_thermal','grid on dirichlet flags list');
    34 fielddisplay(md,'         ','dirichletvalues_thermal','values of the dirichlet [m]');
    35 fielddisplay(md,'         ','melting','melting rate [m/a]');
     33fielddisplay(md,'gridondirichlet_thermal','grid on dirichlet flags list');
     34fielddisplay(md,'dirichletvalues_thermal','values of the dirichlet [m]');
     35fielddisplay(md,'melting','melting rate [m/a]');

  • issm/trunk/src/m/classes/public/display/displaycontrol.m

    r1252 r1277  
    99%      displaycontrol(md)
    1010
    11 disp(sprintf('   Control:\n'));
     11disp(sprintf('   Control solution parameters:\n'));
    1212
    13 fielddisplay(md,'      ','control_type','parameter where inverse control is carried out; ex: ''drag'', or ''B'')');
    14 fielddisplay(md,'      ','nsteps','number of optimization searches');
    15 fielddisplay(md,'      ','optscal','scaling factor on gradient direction during optimization, for each optimization step');
    16 fielddisplay(md,'      ','fit','''absolute: 0'', ''relative: 1'', or ''logarithmic: 2''. default is ''absolute: 0'', for each optimization steps');
    17 fielddisplay(md,'      ','maxiter','maximum iterations during each optimization step');
    18 fielddisplay(md,'      ','tolx','minimum tolerance which will stop one optimization search');
    19 fielddisplay(md,'      ','mincontrolconstraint','minimum contraint for the controlled parameters');
    20 fielddisplay(md,'      ','maxcontrolconstraint','maximum contraint for the controlled parameters');
    21 fielddisplay(md,'      ','meanvel','velocity scaling factor when evaluating relative or logarithmic misfit');
    22 fielddisplay(md,'      ','epsvel','for relative fit, avoids misfit becoming infinity, for logarithmic fit, threshold for velocity');
    23 fielddisplay(md,'      ','plot','visualization of the results of each iteration yes -> 1 no -> 0. Default is 1');
     13fielddisplay(md,'control_type','parameter where inverse control is carried out; ex: ''drag'', or ''B'')');
     14fielddisplay(md,'nsteps','number of optimization searches');
     15fielddisplay(md,'optscal','scaling factor on gradient direction during optimization, for each optimization step');
     16fielddisplay(md,'fit','''absolute: 0'', ''relative: 1'', or ''logarithmic: 2''. default is ''absolute: 0'', for each optimization steps');
     17fielddisplay(md,'maxiter','maximum iterations during each optimization step');
     18fielddisplay(md,'tolx','minimum tolerance which will stop one optimization search');
     19fielddisplay(md,'mincontrolconstraint','minimum contraint for the controlled parameters');
     20fielddisplay(md,'maxcontrolconstraint','maximum contraint for the controlled parameters');
     21fielddisplay(md,'meanvel','velocity scaling factor when evaluating relative or logarithmic misfit');
     22fielddisplay(md,'epsvel','for relative fit, avoids misfit becoming infinity, for logarithmic fit, threshold for velocity');
     23fielddisplay(md,'plot','visualization of the results of each iteration yes -> 1 no -> 0. Default is 1');

  • issm/trunk/src/m/classes/public/display/displaydiagnostic.m

    r1252 r1277  
    99%      displaydiagnostic(md)
    1010
    11 disp(sprintf('   Diagnostic parameters:'));
     11disp(sprintf('   Diagnostic solution parameters:'));
    1212
    1313disp(sprintf('\n      %s','Newton convergence criteria:'));
    14 fielddisplay(md,'         ','eps_rel','velocity relative convergence criterion');
    15 fielddisplay(md,'         ','eps_abs','velocity absolute convergence criterion');
    16 fielddisplay(md,'         ','viscosity_overshoot','over-shooting constant new=new+C*(new-old)');
     14fielddisplay(md,'eps_rel','velocity relative convergence criterion');
     15fielddisplay(md,'eps_abs','velocity absolute convergence criterion');
     16fielddisplay(md,'viscosity_overshoot','over-shooting constant new=new+C*(new-old)');
    1717
    1818disp(sprintf('\n      boundary conditions:'));
    19 fielddisplay(md,'         ','gridondirichlet_diag','grid on dirichlet flags list');
    20 fielddisplay(md,'         ','dirichletvalues_diag','values of the dirichlet [m/a]');
    21 fielddisplay(md,'         ','segmentonneumann_diag','segments on ice front list');
    22 fielddisplay(md,'         ','neumannvalues_diag','values of the Neumann [N]');
     19fielddisplay(md,'gridondirichlet_diag','grid on dirichlet flags list');
     20fielddisplay(md,'dirichletvalues_diag','values of the dirichlet [m/a]');
     21fielddisplay(md,'segmentonneumann_diag','segments on ice front list');
     22fielddisplay(md,'neumannvalues_diag','values of the Neumann [N]');
    2323
    2424disp(sprintf('\n      %s','Penalties:'));
    25 fielddisplay(md,'         ','penalty_offset','offset used by penalties: penalty = Kmax*10^offset');
     25fielddisplay(md,'penalty_offset','offset used by penalties: penalty = Kmax*10^offset');
    2626
    2727disp(sprintf('\n      %s','Memory management:'));
    28 fielddisplay(md,'         ','lowmem','Set to 1 if you are running low on cluster memory');
    29 fielddisplay(md,'         ','sparsity','matrix sparsity. Set to .001 for < 1M dof, .0001 for 5M dof, and .00001 for > 10M dof');
    30 fielddisplay(md,'         ','connectivity','element connectivity');
     28fielddisplay(md,'lowmem','Set to 1 if you are running low on cluster memory');
     29fielddisplay(md,'sparsity','matrix sparsity. Set to .001 for < 1M dof, .0001 for 5M dof, and .00001 for > 10M dof');
     30fielddisplay(md,'connectivity','element connectivity');
    3131
    3232disp(sprintf('\n      %s','Debugging:'));
    33 fielddisplay(md,'         ','debug','output debug statements when possible yes-> 1, no -> 0. Default is 1');
    34 fielddisplay(md,'         ','element_debug','output debug statements for elementswhen possible yes-> 1, no -> 0. Default is 0');
    35 fielddisplay(md,'         ','element_debugid','if element_debug on, id of element for which to output messages');
     33fielddisplay(md,'debug','output debug statements when possible yes-> 1, no -> 0. Default is 1');
     34fielddisplay(md,'element_debug','output debug statements for elementswhen possible yes-> 1, no -> 0. Default is 0');
     35fielddisplay(md,'element_debugid','if element_debug on, id of element for which to output messages');

  • issm/trunk/src/m/classes/public/display/displayexppar.m

    r1252 r1277  
    1010
    1111disp(sprintf('\n   Outlines:'));
    12 fielddisplay(md,'      ','domainoutline','domain outline Argus file');
    13 fielddisplay(md,'      ','riftoutline','rift outline Argus file');
    14 fielddisplay(md,'      ','iceshelfoutline','ice shelf outline Argus file');
    15 fielddisplay(md,'      ','icesheetoutline','ice sheet outline Argus file');
     12fielddisplay(md,'domainoutline','domain outline Argus file');
     13fielddisplay(md,'riftoutline','rift outline Argus file');
     14fielddisplay(md,'iceshelfoutline','ice shelf outline Argus file');
     15fielddisplay(md,'icesheetoutline','ice sheet outline Argus file');
    1616
    1717disp(sprintf('\n   Model files:'));
    18 fielddisplay(md,'      ','parameterfile','parameter file content');
     18fielddisplay(md,'parameterfile','parameter file content');

  • issm/trunk/src/m/classes/public/display/displaymaterials.m

    r1252 r1277  
    1111disp(sprintf('   Materials:\n'));
    1212
    13 fielddisplay(md,'      ','rho_ice','ice density [kg/m^3]');
    14 fielddisplay(md,'      ','rho_water','water density [kg/m^3]');
    15 fielddisplay(md,'      ','B','flow law parameter [Pa/s^(1/n)]');
    16 fielddisplay(md,'      ','heatcapacity','heat capacity [J/kg/K]');
    17 fielddisplay(md,'      ','thermalconductivity','ice thermal conductivity [W/m/K]');
    18 fielddisplay(md,'      ','meltingpoint','melting point of ice at 1atm in K');
    19 fielddisplay(md,'      ','latentheat','latent heat of fusion [J/m^3]');
    20 fielddisplay(md,'      ','beta','rate of change of melting point with pressure [K/Pa]');
    21 fielddisplay(md,'      ','mixed_layer_capacity','mixed layer capacity [W/kg/K]');
    22 fielddisplay(md,'      ','thermal_exchange_velocity','thermal exchange velocity [m/s]');
     13fielddisplay(md,'rho_ice','ice density [kg/m^3]');
     14fielddisplay(md,'rho_water','water density [kg/m^3]');
     15fielddisplay(md,'B','flow law parameter [Pa/s^(1/n)]');
     16fielddisplay(md,'heatcapacity','heat capacity [J/kg/K]');
     17fielddisplay(md,'thermalconductivity','ice thermal conductivity [W/m/K]');
     18fielddisplay(md,'meltingpoint','melting point of ice at 1atm in K');
     19fielddisplay(md,'latentheat','latent heat of fusion [J/m^3]');
     20fielddisplay(md,'beta','rate of change of melting point with pressure [K/Pa]');
     21fielddisplay(md,'mixed_layer_capacity','mixed layer capacity [W/kg/K]');
     22fielddisplay(md,'thermal_exchange_velocity','thermal exchange velocity [m/s]');

  • issm/trunk/src/m/classes/public/display/displaymesh.m

    r1252 r1277  
    1414
    1515        disp(sprintf('\n      Elements and nodes of the original 2d mesh:'));
    16         fielddisplay(md,'         ','numberofelements2d','number of elements');
    17         fielddisplay(md,'         ','numberofgrids2d','number of nodes');
    18         fielddisplay(md,'         ','elements2d','index into (x,y,z), coordinates of the grids');
    19         fielddisplay(md,'         ','elements_type2d','element types');
    20         fielddisplay(md,'         ','x2d','nodes x coordinate');
    21         fielddisplay(md,'         ','y2d','nodes y coordinate');
    22         fielddisplay(md,'         ','z2d','nodes z coordinate');
     16        fielddisplay(md,'numberofelements2d','number of elements');
     17        fielddisplay(md,'numberofgrids2d','number of nodes');
     18        fielddisplay(md,'elements2d','index into (x,y,z), coordinates of the grids');
     19        fielddisplay(md,'elements_type2d','element types');
     20        fielddisplay(md,'x2d','nodes x coordinate');
     21        fielddisplay(md,'y2d','nodes y coordinate');
     22        fielddisplay(md,'z2d','nodes z coordinate');
    2323
    2424        disp(sprintf('\n      Elements and nodes of the extruded 3d mesh:'));
    … …  
    2626        disp(sprintf('\n      Elements and nodes:'));
    2727end
    28 fielddisplay(md,'         ','numberofelements','number of elements');
    29 fielddisplay(md,'         ','numberofgrids','number of nodes');
    30 fielddisplay(md,'         ','elements','index into (x,y,z), coordinates of the grids');
    31 fielddisplay(md,'         ','elements_type','element types');
    32 fielddisplay(md,'         ','x','nodes x coordinate');
    33 fielddisplay(md,'         ','y','nodes y coordinate');
    34 fielddisplay(md,'         ','z','nodes z coordinate');
    35 fielddisplay(md,'         ','numlayers','number of extrusion layers');
    36 fielddisplay(md,'         ','dof','maximum number of dofs solved');
     28fielddisplay(md,'numberofelements','number of elements');
     29fielddisplay(md,'numberofgrids','number of nodes');
     30fielddisplay(md,'elements','index into (x,y,z), coordinates of the grids');
     31fielddisplay(md,'elements_type','element types');
     32fielddisplay(md,'x','nodes x coordinate');
     33fielddisplay(md,'y','nodes y coordinate');
     34fielddisplay(md,'z','nodes z coordinate');
     35fielddisplay(md,'numlayers','number of extrusion layers');
     36fielddisplay(md,'dof','maximum number of dofs solved');
    3737
    3838disp(sprintf('\n      Properties:'));
    39 fielddisplay(md,'         ','type','mesh type');
    40 fielddisplay(md,'         ','penalties','penalties list');
    41 fielddisplay(md,'         ','gridonbed','lower nodes flags list');
    42 fielddisplay(md,'         ','elementonbed','lower elements flags list');
    43 fielddisplay(md,'         ','gridonsurface','upper nodes flags list');
    44 fielddisplay(md,'         ','elementonsurface','upper elements flags list');
     39fielddisplay(md,'type','mesh type');
     40fielddisplay(md,'penalties','penalties list');
     41fielddisplay(md,'gridonbed','lower nodes flags list');
     42fielddisplay(md,'elementonbed','lower elements flags list');
     43fielddisplay(md,'gridonsurface','upper nodes flags list');
     44fielddisplay(md,'elementonsurface','upper elements flags list');

  • issm/trunk/src/m/classes/public/display/displaymesh2grid.m

    r1258 r1277  
    1111disp(sprintf('   Mesh2grid solution parameters:\n'));
    1212
    13 fielddisplay(md,'      ','mesh2grid_parameters','list of parameters for which mesh 2 grid interpolation is carried out; ex: {''drag''}, or {''drag'',''B''}');
    14 fielddisplay(md,'      ','mesh2grid_interpolation','list of interpolation (''node'' or ''element'') for each parameter ex: {''node''}, or {''node'',''element''}');
    15 fielddisplay(md,'      ','mesh2grid_filter','list of filter (''average'' or ''nearest'') for each parameter ex: {''average''}, or {''average'',''nearest''}');
    16 fielddisplay(md,'      ','mesh2grid_cornereast','corner east of square grid');
    17 fielddisplay(md,'      ','mesh2grid_cornernorth','corner north of square grid');
    18 fielddisplay(md,'      ','mesh2grid_xposting','x  posting of grid [m]');
    19 fielddisplay(md,'      ','mesh2grid_yposting','y  posting of grid [m]');
    20 fielddisplay(md,'      ','mesh2grid_nlines','number of grid lines');
    21 fielddisplay(md,'      ','mesh2grid_ncolumns','number of grid columns');
    22 fielddisplay(md,'      ','mesh2grid_windowsize','size of filter');
     13fielddisplay(md,'mesh2grid_parameters','list of parameters for which mesh 2 grid interpolation is carried out; ex: {''drag''}, or {''drag'',''B''}');
     14fielddisplay(md,'mesh2grid_interpolation','list of interpolation (''node'' or ''element'') for each parameter ex: {''node''}, or {''node'',''element''}');
     15fielddisplay(md,'mesh2grid_filter','list of filter (''average'' or ''nearest'') for each parameter ex: {''average''}, or {''average'',''nearest''}');
     16fielddisplay(md,'mesh2grid_cornereast','corner east of square grid');
     17fielddisplay(md,'mesh2grid_cornernorth','corner north of square grid');
     18fielddisplay(md,'mesh2grid_xposting','x  posting of grid [m]');
     19fielddisplay(md,'mesh2grid_yposting','y  posting of grid [m]');
     20fielddisplay(md,'mesh2grid_nlines','number of grid lines');
     21fielddisplay(md,'mesh2grid_ncolumns','number of grid columns');
     22fielddisplay(md,'mesh2grid_windowsize','size of filter');

  • issm/trunk/src/m/classes/public/display/displayobservations.m

    r1252 r1277  
    1111disp(sprintf('   Observations:\n'));
    1212
    13 fielddisplay(md,'      ','vx_obs','observed velocity x component [m/a]');
    14 fielddisplay(md,'      ','vy_obs','observed velocity y component [m/a]');
    15 fielddisplay(md,'      ','vel_obs','observed velocity magnitude [m/a]');
    16 fielddisplay(md,'      ','accumulation','surface accumulation rate [m/a]');
    17 fielddisplay(md,'      ','observed_temperature','observed temperature [K]');
    18 fielddisplay(md,'      ','geothermalflux','geothermal heat flux [W/m^2]');
     13fielddisplay(md,'vx_obs','observed velocity x component [m/a]');
     14fielddisplay(md,'vy_obs','observed velocity y component [m/a]');
     15fielddisplay(md,'vel_obs','observed velocity magnitude [m/a]');
     16fielddisplay(md,'accumulation','surface accumulation rate [m/a]');
     17fielddisplay(md,'observed_temperature','observed temperature [K]');
     18fielddisplay(md,'geothermalflux','geothermal heat flux [W/m^2]');

  • issm/trunk/src/m/classes/public/display/displayparallel.m

    r1252 r1277  
    1212
    1313disp(sprintf('\n      parallelisation:'));
    14 fielddisplay(md,'         ','cluster','set to ''cluster_name'' to run in cluster, ''none'' to run serially');
    15 fielddisplay(md,'         ','np','number of CPUS requested on cluster');
    16 fielddisplay(md,'         ','exclusive','set to 1 if CPUS used are not to be shared with other users, 0 otherwise');
    17 fielddisplay(md,'         ','time','amount of time requested on cluster');
    18 fielddisplay(md,'         ','alloc_cleanup','allocation cleanup before starting a job, default 1');
    19 fielddisplay(md,'         ','waitonlock','wait for batch results 1, or return 0. default is to return');
    20 fielddisplay(md,'         ','queue','special queue name on cluster? default is '''' ');
     14fielddisplay(md,'cluster','set to ''cluster_name'' to run in cluster, ''none'' to run serially');
     15fielddisplay(md,'np','number of CPUS requested on cluster');
     16fielddisplay(md,'exclusive','set to 1 if CPUS used are not to be shared with other users, 0 otherwise');
     17fielddisplay(md,'time','amount of time requested on cluster');
     18fielddisplay(md,'alloc_cleanup','allocation cleanup before starting a job, default 1');
     19fielddisplay(md,'waitonlock','wait for batch results 1, or return 0. default is to return');
     20fielddisplay(md,'queue','special queue name on cluster? default is '''' ');
    2121
    2222disp(sprintf('\n      ice solver options:'));
    23 fielddisplay(md,'         ','solver_type','solver type for Ice: ''general'', ''lu'' or ''cholesky''');
     23fielddisplay(md,'solver_type','solver type for Ice: ''general'', ''lu'' or ''cholesky''');
    2424disp(sprintf('\n      cielo solver options:'));
    25 fielddisplay(md,'         ','solverstring','solver string for Petsc. See solversetto... routines. Default is mumps');
     25fielddisplay(md,'solverstring','solver string for Petsc. See solversetto... routines. Default is mumps');

  • issm/trunk/src/m/classes/public/display/displayparameters.m

    r1252 r1277  
    1212
    1313disp(sprintf('\n      geometry:'));
    14 fielddisplay(md,'         ','surface','surface height [m]');
    15 fielddisplay(md,'         ','thickness','thickness [m]');
    16 fielddisplay(md,'         ','bed','bed height [m]');
    17 fielddisplay(md,'         ','firn_layer','firn layer height [m]');
    18 fielddisplay(md,'         ','elementonbed','element on bed flags list');
    19 fielddisplay(md,'         ','elementonsurface','element on surface flags list');
    20 fielddisplay(md,'         ','gridonbed','grid on bed flags list');
    21 fielddisplay(md,'         ','gridonsurface','grid on surface flags list');
     14fielddisplay(md,'surface','surface height [m]');
     15fielddisplay(md,'thickness','thickness [m]');
     16fielddisplay(md,'bed','bed height [m]');
     17fielddisplay(md,'firn_layer','firn layer height [m]');
     18fielddisplay(md,'elementonbed','element on bed flags list');
     19fielddisplay(md,'elementonsurface','element on surface flags list');
     20fielddisplay(md,'gridonbed','grid on bed flags list');
     21fielddisplay(md,'gridonsurface','grid on surface flags list');
    2222
    2323disp(sprintf('\n      physical parameters:'));
    24 fielddisplay(md,'         ','g','acceleration due to gravity [m/s^2]');
     24fielddisplay(md,'g','acceleration due to gravity [m/s^2]');
    2525
    2626disp(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)'));
    27 fielddisplay(md,'         ','drag_type','0: none, 1:plastic, 2:viscous');
    28 fielddisplay(md,'         ','drag','friction coefficient [IS]');
    29 fielddisplay(md,'         ','p','p exponent');
    30 fielddisplay(md,'         ','q','q exponent');
     27fielddisplay(md,'drag_type','0: none, 1:plastic, 2:viscous');
     28fielddisplay(md,'drag','friction coefficient [IS]');
     29fielddisplay(md,'p','p exponent');
     30fielddisplay(md,'q','q exponent');

  • issm/trunk/src/m/classes/public/display/displayprognostic.m

    r1252 r1277  
    1212
    1313disp(sprintf('\n      transient:'));
    14 fielddisplay(md,'         ','dt','time step [yr]');
    15 fielddisplay(md,'         ','ndt','time span [yr]');
    16 fielddisplay(md,'         ','artificial_diffusivity','yes->1, no->0');
     14fielddisplay(md,'dt','time step [yr]');
     15fielddisplay(md,'ndt','time span [yr]');
     16fielddisplay(md,'artificial_diffusivity','yes->1, no->0');
    1717
    1818disp(sprintf('\n      boundary conditions:'));
    19 fielddisplay(md,'         ','gridondirichlet_prog','grid on dirichlet flags list');
    20 fielddisplay(md,'         ','dirichletvalues_prog','values of the dirichlet [m]');
    21 fielddisplay(md,'         ','segmentonneumann_prog','segments on ice front list');
    22 fielddisplay(md,'         ','neumannvalues_prog','values of the Neumann [m/a]');
     19fielddisplay(md,'gridondirichlet_prog','grid on dirichlet flags list');
     20fielddisplay(md,'dirichletvalues_prog','values of the dirichlet [m]');
     21fielddisplay(md,'segmentonneumann_prog','segments on ice front list');
     22fielddisplay(md,'neumannvalues_prog','values of the Neumann [m/a]');

  • issm/trunk/src/m/classes/public/display/displayresults.m

    r1252 r1277  
    1212
    1313disp(sprintf('\n      solution results:'));
    14 fielddisplay(md,'         ','results','');
     14fielddisplay(md,'results','');
    1515
    1616disp(sprintf('\n      output parameters:'));
    17 fielddisplay(md,'         ','stress','stress [Pa]');
    18 fielddisplay(md,'         ','deviatoricstress','deviatoric stress [Pa]');
    19 fielddisplay(md,'         ','strainrate','strain rate [1/yr]');
     17fielddisplay(md,'stress','stress [Pa]');
     18fielddisplay(md,'deviatoricstress','deviatoric stress [Pa]');
     19fielddisplay(md,'strainrate','strain rate [1/yr]');

  • issm/trunk/src/m/classes/public/display/displaythermal.m

    r1252 r1277  
    1212
    1313disp(sprintf('\n      boundary conditions:'));
    14 fielddisplay(md,'         ','gridondirichlet_thermal','grid on dirichlet flags list');
    15 fielddisplay(md,'         ','dirichletvalues_thermal','values of the dirichlet [m]');
    16 fielddisplay(md,'         ','melting','melting rate [m/a]');
     14fielddisplay(md,'gridondirichlet_thermal','grid on dirichlet flags list');
     15fielddisplay(md,'dirichletvalues_thermal','values of the dirichlet [m]');
     16fielddisplay(md,'melting','melting rate [m/a]');
    1717
    1818disp(sprintf('\n      transient:'));
    19 fielddisplay(md,'         ','dt','time step [yr]');
    20 fielddisplay(md,'         ','ndt','time span [yr]');
     19fielddisplay(md,'dt','time step [yr]');
     20fielddisplay(md,'ndt','time span [yr]');

  • issm/trunk/src/m/classes/public/display/displaytransient.m

    r1252 r1277  
    1818disp(sprintf('   Transient solution parameters:\n'));
    1919
    20 fielddisplay(md,'      ','timestepping','adptative time stepping implemented - default to 0');
    21 fielddisplay(md,'      ','deltaH','minimum thickness difference between two time steps');
    22 fielddisplay(md,'      ','DeltaH','maximum thickness difference between two time steps');
    23 fielddisplay(md,'      ','deltaT','minimum temperature difference between two time steps');
    24 fielddisplay(md,'      ','DeltaT','maximum temperature difference between two time steps');
    25 fielddisplay(md,'      ','timeacc','multiplier to time step when time stepping increases time step');
    26 fielddisplay(md,'      ','timedec','multiplier to time step when time stepping decresaes time step');
     20fielddisplay(md,'timestepping','adptative time stepping implemented - default to 0');
     21fielddisplay(md,'deltaH','minimum thickness difference between two time steps');
     22fielddisplay(md,'DeltaH','maximum thickness difference between two time steps');
     23fielddisplay(md,'deltaT','minimum temperature difference between two time steps');
     24fielddisplay(md,'DeltaT','maximum temperature difference between two time steps');
     25fielddisplay(md,'timeacc','multiplier to time step when time stepping increases time step');
     26fielddisplay(md,'timedec','multiplier to time step when time stepping decresaes time step');

  • issm/trunk/src/m/classes/public/display/fielddisplay.m

    r1257 r1277  
    1 function fielddisplay(md,offset,name,comment)
     1function fielddisplay(md,name,comment)
    22%FIELDDISPLAY - display model field
    33%
    … …  
    88        field=md.(name);
    99
    10         %disp corresponding line as a function of field type
    11         parsedisplay(offset,name,field,comment);
     10        %disp corresponding line as a function of field type (offset set as 9 spaces)
     11        parsedisplay('         ',name,field,comment);
    1212
    1313end %function
Note: See TracChangeset for help on using the changeset viewer.