Changeset 9778

Timestamp:

09/12/11 13:40:01 (14 years ago)

Author:

Mathieu Morlighem

Message:

minor

Location:

issm/trunk/src/m/classes

Files:

• basalforcings.m (modified) (1 diff)
• model/model.m (modified) (2 diffs)

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

@@ -37 +37 @@
                 function checkconsistency(obj,md) % {{{
 
-                        %fields={'melting_rate','geothermalflux'};
-                        checksize(md,'basalforcings',fields,[md.mesh.numberofvertices 1]);
+                        fields={'melting_rate','geothermalflux'};
+                        %checksize(md,'basalforcings',fields,[md.mesh.numberofvertices 1]);
                 end % }}}
         end

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

@@ -8 +8 @@
                  % {{{1
                  %Careful here: no other class should be used as default value this is a bug of matlab
-                 cluster          = modelfield('default',0,'marshall',false);
-                 verbose          = modelfield('default',0,'marshall',true,'preprocess','marshallverbose','format','Integer');
-                 results          = modelfield('default',0,'marshall',false);
-                 solver           = modelfield('default',0,'marshall',false);
-                 debug            = modelfield('default',0,'marshall',false);
+                 mesh             = modelfield('default',0,'marshall',true);
+                 mask             = modelfield('default',0,'marshall',true);
+
+                 geometry         = modelfield('default',0,'marshall',true);
                  constants        = modelfield('default',0,'marshall',true);
-                 flaim            = modelfield('default',0,'marshall',false);
                  surfaceforcings  = modelfield('default',0,'marshall',true);
                  basalforcings    = modelfield('default',0,'marshall',true);
+                 materials        = modelfield('default',0,'marshall',true);
                  friction         = modelfield('default',0,'marshall',true);
+                 flowequation     = modelfield('default',0,'marshall',true);
+                 timestepping     = modelfield('default',0,'marshall',true);
+                 initialization   = modelfield('default',0,'marshall',true);
+                 rifts            = modelfield('default',0,'marshall',true);
+
+                 debug            = modelfield('default',0,'marshall',false);
+                 verbose          = modelfield('default',0,'marshall',true,'preprocess','marshallverbose','format','Integer');
+                 settings         = modelfield('default',0,'marshall',true);
+                 solver           = modelfield('default',0,'marshall',false);
+                 cluster          = modelfield('default',0,'marshall',false);
+
+                 balancethickness = modelfield('default',0,'marshall',true);
+                 diagnostic       = modelfield('default',0,'marshall',true);
+                 groundingline    = modelfield('default',0,'marshall',true);
+                 hydrology        = modelfield('default',0,'marshall',true);
+                 prognostic       = modelfield('default',0,'marshall',true);
+                 thermal          = modelfield('default',0,'marshall',true);
+                 steadystate      = modelfield('default',0,'marshall',true);
+                 transient        = modelfield('default',0,'marshall',true);
+
+                 autodiff         = modelfield('default',0,'marshall',true);
+                 flaim            = modelfield('default',0,'marshall',false);
+                 inversion        = modelfield('default',0,'marshall',true);
+                 qmu              = modelfield('default',0,'marshall',true);
+
+                 results          = modelfield('default',0,'marshall',false);
+                 radaroverlay     = modelfield('default',0,'marshall',false);
+                 miscellaneous    = modelfield('default',0,'marshall',true);
                  private          = modelfield('default',0,'marshall',false);
-                 rifts            = modelfield('default',0,'marshall',true);
-                 hydrology        = modelfield('default',0,'marshall',true);
-                 settings         = modelfield('default',0,'marshall',true);
-                 radaroverlay     = modelfield('default',0,'marshall',false);
-                 thermal          = modelfield('default',0,'marshall',true);
-                 miscellaneous    = modelfield('default',0,'marshall',true);
-                 timestepping     = modelfield('default',0,'marshall',true);
-                 groundingline    = modelfield('default',0,'marshall',true);
-                 prognostic       = modelfield('default',0,'marshall',true);
-                 materials        = modelfield('default',0,'marshall',true);
-                 mask             = modelfield('default',0,'marshall',true);
-                 qmu              = modelfield('default',0,'marshall',true);
-                 balancethickness = modelfield('default',0,'marshall',true);
-                 flowequation     = modelfield('default',0,'marshall',true);
-                 steadystate      = modelfield('default',0,'marshall',true);
-                 inversion        = modelfield('default',0,'marshall',true);
-                 transient        = modelfield('default',0,'marshall',true);
-                 diagnostic       = modelfield('default',0,'marshall',true);
-                 initialization   = modelfield('default',0,'marshall',true);
-                 geometry         = modelfield('default',0,'marshall',true);
-                 autodiff         = modelfield('default',0,'marshall',true);
-                 mesh             = modelfield('default',0,'marshall',true);
 
                  %}}}
@@ -389 +394 @@
                  end
                  %}}}
+                 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');
+                 end % }}}
          end
  end