Changeset 1253

Timestamp:

07/07/09 16:34:44 (16 years ago)

Author:

Mathieu Morlighem

Message:

improved display

Location:

issm/trunk/src/m/classes/@model

Files:

• display.m (modified) (3 diffs)
• subsref.m (modified) (2 diffs)

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

@@ -5 +5 @@
         
 disp(sprintf('\n%s = \n',inputname(1)));
-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'));
-disp(sprintf('%s%s%s','   Prognostic solution parameters: type ''',inputname(1),'.prognostic'' to display'));
-disp(sprintf('%s%s%s','   Transient solution parameters: type ''',inputname(1),'.transient'' to display'));
-disp(sprintf('%s%s%s','   Control solution parameters: type ''',inputname(1),'.control'' to display'));
-disp(sprintf('%s%s%s','   Mesh2grid solution parameters: type ''',inputname(1),'.mesh2grid'' to display'));
-disp(sprintf('%s%s%s','   Mesh: type ''',inputname(1),'.mesh'' to display'));
-disp(sprintf('%s%s%s','   Boundary conditions: type ''',inputname(1),'.bc'' to display'));
-disp(sprintf('%s%s%s','   Observations: type ''',inputname(1),'.obs'' to display'));
-disp(sprintf('%s%s%s','   Materials: type ''',inputname(1),'.mat'' to display'));
-disp(sprintf('%s%s%s','   Parameters: type ''',inputname(1),'.par'' to display'));
-disp(sprintf('%s%s%s','   Results: type ''',inputname(1),'.res'' to display'));
-disp(sprintf('%s%s%s','   ExpPar: type ''',inputname(1),'.exppar'' to display'));
-disp(sprintf('%s%s%s','   Qmu: type ''',inputname(1),'.qmu'' to display'));
-if(a.numrifts)disp(sprintf('      rifts: %i',a.numrifts));end
 
-%Diverse
-disp(sprintf('   Miscellaneous:'));
+%name
+disp(sprintf('   Name:'));
 if isempty(a.name),
-        disp(sprintf('      name: N/A'));
+        disp(sprintf('      N/A'));
 else
-        disp(sprintf('      name: %s',a.name));
+        disp(sprintf('      %s',a.name));
 end
 
 %notes: a.notes is a cell array of strings
+disp(sprintf('   Notes:'));
 if isempty(a.notes),
-        disp(sprintf('      notes: N/A'));
+        disp(sprintf('      N/A'));
 else
         if iscell(a.notes),
@@ -38 +24 @@
                         string=char(strings(i));
                         if i==1,
-                                disp(sprintf('      notes: %s',string));
+                                disp(sprintf('      %s',string));
                         else
-                                disp(sprintf('             %s',string));
+                                disp(sprintf('      %s',string));
                         end
                 end
         elseif ischar(a.notes),
-                disp(sprintf('      notes: %s',a.notes));
+                disp(sprintf('      %s',a.notes));
         else
                 disp('display error message: ''notes'' for model is neither a cell array of string, nor a string. Cannot display.');
@@ -52 +38 @@
 %repository
 if ~isempty(a.repository),
-        disp(sprintf('      repository: %s',a.repository));
+        disp(sprintf('   Repository: %s',a.repository));
 end
+
+%diverse
+disp(sprintf('   Mesh: %s',a.repository));
+disp(sprintf('%s%s%s','      Mesh: type ''',inputname(1),'.mesh'' to display'));
+disp(sprintf('   Parameters: %s',a.repository));
+disp(sprintf('%s%s%s','      Boundary conditions: type ''',inputname(1),'.bc'' to display'));
+disp(sprintf('%s%s%s','      Observations: type ''',inputname(1),'.obs'' to display'));
+disp(sprintf('%s%s%s','      Materials: type ''',inputname(1),'.mat'' to display'));
+disp(sprintf('%s%s%s','      Parameters: type ''',inputname(1),'.par'' to display'));
+disp(sprintf('%s%s%s','      Results: type ''',inputname(1),'.res'' to display'));
+disp(sprintf('%s%s%s','      ExpPar: type ''',inputname(1),'.exppar'' to display'));
+disp(sprintf('   Solution parameters: %s',a.repository));
+disp(sprintf('%s%s%s','      Qmu: type ''',inputname(1),'.qmu'' 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'));
+disp(sprintf('%s%s%s','      Prognostic solution parameters: type ''',inputname(1),'.prognostic'' to display'));
+disp(sprintf('%s%s%s','      Transient solution parameters: type ''',inputname(1),'.transient'' to display'));
+disp(sprintf('%s%s%s','      Control solution parameters: type ''',inputname(1),'.control'' to display'));
+disp(sprintf('%s%s%s','      Mesh2grid solution parameters: type ''',inputname(1),'.mesh2grid'' to display'));
+if(a.numrifts)disp(sprintf('      rifts: %i',a.numrifts));end
+

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

@@ -10 +10 @@
 if length(index)==1,
         index1=index(1);
+
+        if(strcmp(index1.subs,'mesh')), displaymesh(md);return; end
+        if(strcmp(index1.subs,'bc')), displaybc(md);return; end
+        if(strcmp(index1.subs,'mat')), displaymaterials(md);return; end
+        if(strcmp(index1.subs,'par')), displayparameters(md);return; end
+        if(strcmp(index1.subs,'exppar')), displayexppar(md);return; end
         if(strcmp(index1.subs,'res')), displayresults(md);return; end
-        if(strcmp(index1.subs,'parallel')), displayparallel(md);return; end
+        if(strcmp(index1.subs,'obs')), displayobservations(md);return; end
+        if(strcmp(index1.subs,'qmu')), displayqmu(md);return; end
         if(strcmp(index1.subs,'diagnostic')), displaydiagnostic(md);return; end
         if(strcmp(index1.subs,'prognostic')), displayprognostic(md);return; end
@@ -18 +25 @@
         if(strcmp(index1.subs,'control')), displaycontrol(md);return; end
         if(strcmp(index1.subs,'mesh2grid')), displaymesh2grid(md);return; end
-        if(strcmp(index1.subs,'bc')), displaybc(md);return; end
-        if(strcmp(index1.subs,'mesh')), displaymesh(md);return; end
-        if(strcmp(index1.subs,'par')), displayparameters(md);return; end
-        if(strcmp(index1.subs,'exppar')), displayexppar(md);return; end
-        if(strcmp(index1.subs,'obs')), displayobservations(md);return; end
-        if(strcmp(index1.subs,'mat')), displaymaterials(md);return; end
-        if(strcmp(index1.subs,'qmu')), displayqmu(md);return; end
+        if(strcmp(index1.subs,'parallel')), displayparallel(md);return; end
 
         if ~isempty(md.repository),