Changeset 9606 for issm/trunk

Timestamp:

09/06/11 09:33:22 (14 years ago)

Author:

Mathieu Morlighem

Message:

some correction for diaplay

Location:

issm/trunk/src/m

Files:

• classes/flaim.m (modified) (1 diff)
• classes/model/model.m (modified) (3 diffs)
• model/display/displayflaim.m (deleted)

issm/trunk/src/m/classes/flaim.m

@@ -46 +46 @@
 
                         disp(sprintf('\n      Input:'));
-                        fielddisplay(md,'tracks'             ,'name of kml tracks file');
-                        fielddisplay(md,'flightreqs'         ,'structure of kml flight requirements');
-                        fielddisplay(md,'criterion'          ,'element or nodal criterion for flight path evaluation');
+                        fielddisplay(obj,'tracks'             ,'name of kml tracks file');
+                        fielddisplay(obj,'flightreqs'         ,'structure of kml flight requirements');
+                        fielddisplay(obj,'criterion'          ,'element or nodal criterion for flight path evaluation');
 
                         disp(sprintf('\n      Arguments:'));
-                        fielddisplay(md,'gridsatequator'     ,'number of grids at equator (determines resolution)');
-                        fielddisplay(md,'usevalueordering'   ,'flag to consider target values for flight path evaluation');
-                        fielddisplay(md,'split_antimeridian' ,'flag to split polygons on the antimeridian');
+                        fielddisplay(obj,'gridsatequator'     ,'number of grids at equator (determines resolution)');
+                        fielddisplay(obj,'usevalueordering'   ,'flag to consider target values for flight path evaluation');
+                        fielddisplay(obj,'split_antimeridian' ,'flag to split polygons on the antimeridian');
 
                         disp(sprintf('\n      Output:'));
-                        fielddisplay(md,'solution'           ,'name of kml solution file');
-                        fielddisplay(md,'quality'            ,'quality of kml solution');
+                        fielddisplay(obj,'solution'           ,'name of kml solution file');
+                        fielddisplay(obj,'quality'            ,'quality of kml solution');
                 end % }}}
         end

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

@@ -388 +388 @@
                          disp(sprintf('   Solution parameters: %s'));
                          disp(sprintf('%s%s%s','      Qmu: type ''',inputname(1),'.qmu'' to display'));
-                         disp(sprintf('%s%s%s','      FLAIM: type ''',inputname(1),'.flaim'' to display'));
                          disp(sprintf('%s%s%s','      Diagnostic solution parameters: type ''',inputname(1),'.diagnostic'' to display'));
                          disp(sprintf('%s%s%s','      Thermal solution parameters: type ''',inputname(1),'.thermal'' to display'));
@@ -544 +543 @@
                          md.debug=debug;
                          md.constants=constants;
+                         md.flaim=flaim;
 
 
@@ -750 +750 @@
                                  if(strcmp(index1.subs,'obs')), displayobservations(md);return; end
                                  if(strcmp(index1.subs,'qmu')), displayqmu(md);return; end
-                                 if(strcmp(index1.subs,'flaim')), displayflaim(md);return; end
                                  if(strcmp(index1.subs,'diagnostic')), displaydiagnostic(md);return; end
                                  if(strcmp(index1.subs,'prognostic')), displayprognostic(md);return; end