Changeset 9799

Timestamp:

09/13/11 16:40:07 (14 years ago)

Author:

seroussi

Message:

minor displayes

Location:

issm/trunk/src/m/classes

Files:

• autodiff.m (modified) (1 diff)
• balancethickness.m (modified) (1 diff)
• basalforcings.m (modified) (1 diff)
• constants.m (modified) (1 diff)
• debug.m (modified) (1 diff)
• diagnostic.m (modified) (3 diffs)
• flowequation.m (modified) (1 diff)

issm/trunk/src/m/classes/autodiff.m

@@ -38 +38 @@
 
                 end % }}}
+                function disp(obj) % {{{
+                        disp(sprintf('   automatic differentiation parameters:'));
+
+                        fielddisplay(obj,'analysis','indicates if the automatic differentiation is activated');
+                        fielddisplay(obj,'forward','forward differentiation');
+                        fielddisplay(obj,'reverse','backward differentiation');
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/balancethickness.m

@@ -44 +44 @@
                         end
                 end % }}}
+                function disp(obj) % {{{
+                        disp(sprintf('   balance thickness solution parameters:'));
+
+                        fielddisplay(obj,'spcthickness','thickness constraints (NaN means no constraint)');
+                        fielddisplay(obj,'thickening_rate','ice thickening rate used in the mass conservation (dh/dt)');
+                        fielddisplay(obj,'stabilization','0->no, 1->artificial_diffusivity, 3->discontinuous Galerkin');
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/basalforcings.m

@@ -40 +40 @@
                         %checksize(md,'basalforcings',fields,[md.mesh.numberofvertices 1]);
                 end % }}}
+                function disp(obj) % {{{
+                        disp(sprintf('   basal forcings parameters:'));
+
+                        fielddisplay(obj,'melting_rate','basal melting rate (positive if melting)');
+                        fielddisplay(obj,'melting_rate_correction','additional melting applied when the grounding line retreats');
+                        fielddisplay(obj,'geothermalflux','geothermal heat flux [W/m^2]');
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/constants.m

@@ -52 +52 @@
 
                 end % }}}
+                function disp(obj) % {{{
+                        disp(sprintf('   constants parameters:'));
+
+                        fielddisplay(obj,'g','gravitational acceleration');
+                        fielddisplay(obj,'yts','number of secongs in a year');
+                        fielddisplay(obj,'referencetemperature','reference temperature used in the enthalpy model');
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/debug.m

@@ -10 +10 @@
         end
         methods
-                %no methods for now
+                function disp(obj) % {{{
+                        disp(sprintf('   debug parameters:'));
+
+                        fielddisplay(obj,'valgrind','use Valgrind to debug (0 or 1)');
+                        fielddisplay(obj,'gprof','use gnu-profiler find out where the time is spent');
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/diagnostic.m

@@ -108 +108 @@
                         disp(sprintf('   Diagnostic solution parameters:'));
 
-                        disp(sprintf('\n      %s','Newton convergence criteria:'));
+                        disp(sprintf('\n      %s','Convergence criteria:'));
                         fielddisplay(obj,'restol','mechanical equilibrium residue convergence criterion');
                         fielddisplay(obj,'reltol','velocity relative convergence criterion, NaN -> not applied');
@@ -115 +115 @@
                         fielddisplay(obj,'viscosity_overshoot','over-shooting constant new=new+C*(new-old)');
 
-                        disp(sprintf('\n      boundary conditions:'));
+                        disp(sprintf('\n      %s','boundary conditions:'));
                         fielddisplay(obj,'spcvx','x-axis velocity constraint (NaN means no constraint)');
                         fielddisplay(obj,'spcvy','y-axis velocity constraint (NaN means no constraint)');
@@ -121 +121 @@
                         fielddisplay(obj,'icefront','segments on ice front list');
 
-                        disp(sprintf('\n      %s','Penalties:'));
+                        disp(sprintf('\n      %s','Rift options:'));
+                        fielddisplay(obj,'rift_penalty_threshold','threshold for instability of mechanical constraints');
+                        fielddisplay(obj,'rift_penalty_lock','number of iterations before rift penalties are locked');
+
+                        disp(sprintf('\n      %s','Penalty options:'));
                         fielddisplay(obj,'penalty_factor','offset used by penalties: penalty = Kmax*10^offset');
-                        fielddisplay(obj,'rift_penalty_threshold','threshold for instability of mechanical constraints');
+                        fielddisplay(obj,'vertex_pairing','pairs of vertices that are penalized');
+
+                        disp(sprintf('\n      %s','Other:'));
+                        fielddisplay(obj,'shelf_dampening','use dampening for floating ice ? Only for Stokes model');
+                        fielddisplay(obj,'referential','local referential');
+                        fielddisplay(obj,'requested_outputs','additional outputs requested');
 
                 end % }}}

issm/trunk/src/m/classes/flowequation.m

@@ -44 +44 @@
 
                 end % }}}
+                function disp(obj) % {{{
+                        disp(sprintf('   flow equation parameters:'));
+
+                        fielddisplay(obj,'ismacayealpattyn','is the macayeal or pattyn approximation used ?');
+                        fielddisplay(obj,'ishutter','is the shallow ice approximation used ?');
+                        fielddisplay(obj,'isstokes','are the Full-Stokes equations used ?');
+                        fielddisplay(obj,'vertex_equation','flow equation for each vertex');
+                        fielddisplay(obj,'element_equation','flow equation for each element');
+                        fielddisplay(obj,'bordermacayeal','vertices on MacAyeal''s border (for tiling)');
+                        fielddisplay(obj,'borderpattyn','vertices on Pattyn''s border (for tiling)');
+                        fielddisplay(obj,'borderstokes','vertices on Stokes'' border (for tiling)');
+
+                end % }}}
         end
 end