Changeset 9820

Timestamp:

09/16/11 10:29:16 (14 years ago)

Author:

seroussi

Message:

some displays

Location:

issm/trunk/src/m/classes

Files:

• groundingline.m (modified) (1 diff)
• hydrology.m (modified) (1 diff)
• initialization.m (modified) (1 diff)
• inversion.m (modified) (1 diff)

issm/trunk/src/m/classes/groundingline.m

@@ -69 +69 @@
 
                         fielddisplay(obj,'migration','type of grounding line migration: ''SoftMigration'',''AgressiveMigration'' or ''None''');
-                        fielddisplay(obj,'melting_rate','');
+                        fielddisplay(obj,'melting_rate','melting rate applied when previously grounded parts start floating');
 
                 end % }}}

issm/trunk/src/m/classes/hydrology.m

@@ -52 +52 @@
 
                 end % }}}
+                function disp(obj) % {{{
+                        disp(sprintf('   hydrology solution parameters:'));
+
+                        fielddisplay(obj,'spcwatercolumn','water thickness constraints (NaN means no constraint)');
+                        fielddisplay(obj,'n','Manning roughness coefficient');
+                        fielddisplay(obj,'CR','turtuosity parameter');
+                        fielddisplay(obj,'p','dimensionless exponent in Manning velocity formula');
+                        fielddisplay(obj,'q','dimensionless exponent in Manning velocity formula');
+                        fielddisplay(obj,'kn','parameter in effective pressure formula');
+                        fielddisplay(obj,'stabilization','0->no, 1->artificial_diffusivity');
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/initialization.m

@@ -44 +44 @@
 
                 end % }}}
+                function disp(obj) % {{{
+                        disp(sprintf('   initial field values:'));
+
+                        fielddisplay(obj,'vx','x component of velocity');
+                        fielddisplay(obj,'vy','y component of velocity');
+                        fielddisplay(obj,'vz','z component of velocity');
+                        fielddisplay(obj,'vel','velocity norm');
+                        fielddisplay(obj,'pressure','pressure field');
+                        fielddisplay(obj,'temperature','temperature in Kelvins');
+                        fielddisplay(obj,'watercolumn','thickness of subglacial water');
+                        fielddisplay(obj,'waterfraction','fraction of water in the ice');
+
+                end % }}}
         end
 end

issm/trunk/src/m/classes/inversion.m

@@ -145 +145 @@
                         fielddisplay(obj,'iscontrol','is inversion activated?');
                         fielddisplay(obj,'control_parameters','parameter where inverse control is carried out; ex: {''FrictionCoefficient''}, or {''RheologyBbar''}');
-                        fielddisplay(obj,'cost_functions_coefficients','cost_functions_coefficients applied to the misfit of each node');
+                        fielddisplay(obj,'cost_functions_coefficients','cost_functions_coefficients applied to the misfit of each vertex and for each control_parameter');
                         fielddisplay(obj,'nsteps','number of optimization searches');
+                        fielddisplay(obj,'maxiter_per_step','maximum iterations during each optimization step');
+                        fielddisplay(obj,'cost_functions','indicate the type of response for each optimization steps');
                         fielddisplay(obj,'cost_function_threshold','misfit convergence criterion. Default is 1%, NaN if not applied');
                         fielddisplay(obj,'gradient_scaling','scaling factor on gradient direction during optimization, for each optimization step');
-                        fielddisplay(obj,'cost_functions','indicate the type of response for each optimization steps');
-                        fielddisplay(obj,'maxiter_per_step','maximum iterations during each optimization step');
                         fielddisplay(obj,'step_threshold','decrease threshold for misfit, default is 30%');
-                        fielddisplay(obj,'min_parameters','absolute minimum acceptable value of the inversed parameter');
-                        fielddisplay(obj,'max_parameters','absolute maximum acceptable value of the inversed parameter');
+                        fielddisplay(obj,'min_parameters','absolute minimum acceptable value of the inversed parameter on each vertex');
+                        fielddisplay(obj,'max_parameters','absolute maximum acceptable value of the inversed parameter on each vertex');
                         fielddisplay(obj,'gradient_only','stop control method solution at gradient');
+                        fielddisplay(obj,'num_control_parameters','number of control_parameters');
+                        fielddisplay(obj,'num_cost_functions','number of cost_functions');
                         fielddisplay(obj,'vx_obs','observed velocity x component [m/a]');
                         fielddisplay(obj,'vy_obs','observed velocity y component [m/a]');
                         fielddisplay(obj,'vel_obs','observed velocity magnitude [m/a]');
+                        fielddisplay(obj,'thickness_obs','observed thickness [m]');
                         disp('Available responses:');
                         disp('   101: SurfaceAbsVelMisfit');