Changeset 9782

Timestamp:

09/12/11 15:45:32 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added better model display

Location:

issm/trunk/src/m

Files:

• classes/model/model.m (modified) (1 diff)
• model/display/displaybc.m (deleted)
• model/display/displaymesh.m (deleted)
• model/display/displayparallel.m (deleted)
• model/display/displayparameters.m (deleted)
• model/display/displayresults.m (deleted)
• model/display/fielddisplay2.m (added)

issm/trunk/src/m/classes/model/model.m

@@ -395 +395 @@
                  %}}}
                  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