Changeset 740

Timestamp:

06/03/09 08:48:38 (15 years ago)

Author:

Mathieu Morlighem

Message:

results are now in md.results

Location:

issm/trunk/src/m/classes/public/plot

Files:

• plot_transient_movie.m (modified) (2 diffs)
• plot_transient_results.m (modified) (6 diffs)

issm/trunk/src/m/classes/public/plot/plot_transient_movie.m

@@ -16 +16 @@
                 end
         else
-                choice=input('Which field do you want to plot? (vel/vx/vy/vz/thickness/surface/bed/temperature)','s');
+                choice=input('Which field do you want to plot? (vel/vx/vy/vz/thickness/surface/bed/temperature/melting)','s');
                 if ~strcmp(choice,'vel') & ~strcmp(choice,'vx') & ~strcmp(choice,'vy') & ~strcmp(choice,'vz') & ~strcmp(choice,'temperature') & ~strcmp(choice,'thickness') & ~strcmp(choice,'bed') & ~strcmp(choice,'surface')
                         disp('plot_transient_movie error message: input not supported yet, exiting...')
@@ -27 +27 @@
 
         %loop over the time steps
-        for i=1:length(md.transient_results)
-                eval(['data=md.transient_results(' num2str(i) ').' num2str(choice) ';']);
+        for i=1:length(md.results.transient)
+                eval(['data=md.results.transient(' num2str(i) ').' num2str(choice) ';']);
 
                 %process data
                 [data isongrid]=processdata(md,data,options_structure);
-                titlestring=[choice ' at time ' num2str(md.transient_results(i).time) ' year'];
+                titlestring=[choice ' at time ' num2str(md.results.transient(i).time) ' year'];
                 plot_unit(x,y,z,elements,data,isongrid,is2d,options_structure)
                 apply_options_movie(md,options_structure,titlestring);

issm/trunk/src/m/classes/public/plot/plot_transient_results.m

@@ -23 +23 @@
 
 string='plotmodel(md';
-for i=1:length(md.transient_results),
-        string=[string ',''data'',''transient_results(' num2str(i) ').thickness'',''title'',''Thickness at time ' num2str(md.transient_results(i).time) ' a'''];
+for i=1:length(md.results.transient),
+        string=[string ',''data'',''results.transient(' num2str(i) ').thickness'',''title'',''Thickness at time ' num2str(md.results.transient(i).time) ' a'''];
 end
 string=[string ',''figure'',1,''colorbar#all'',''on'',''fontsize'',' num2str(options_structure.fontsize) ',''fontweight'',' num2str(options_structure.fontweight) ');'];
@@ -31 +31 @@
 
 string='plotmodel(md';
-for i=1:length(md.transient_results),
-        string=[string ',''data'',''transient_results(' num2str(i) ').vel'',''view'',3,''title'',''Velocity at time ' num2str(md.transient_results(i).time) ' a'''];
+for i=1:length(md.results.transient),
+        string=[string ',''data'',''results.transient(' num2str(i) ').vel'',''view'',3,''title'',''Velocity at time ' num2str(md.results.transient(i).time) ' a'''];
 end
 string=[string ',''figure'',2,''colorbar#all'',''on'',''fontsize'',' num2str(options_structure.fontsize) ',''fontweight'',' num2str(options_structure.fontweight)  ');'];
@@ -39 +39 @@
 
 string='plotmodel(md';
-for i=1:length(md.transient_results),
-        string=[string ',''data'',''transient_results(' num2str(i) ').temperature'',''view'',3,''title'',''Temperature at time ' num2str(md.transient_results(i).time) ' a'''];
+for i=1:length(md.results.transient),
+        string=[string ',''data'',''results.transient(' num2str(i) ').temperature'',''view'',3,''title'',''Temperature at time ' num2str(md.results.transient(i).time) ' a'''];
 end
 string=[string ',''figure'',3,''colorbar#all'',''on'',''view'',3,''fontsize'',' num2str(options_structure.fontsize) ',''fontweight'',' num2str(options_structure.fontweight)  ');'];
@@ -47 +47 @@
 
 string='plotmodel(md';
-for i=2:length(md.transient_results),
-        string=[string ',''data'',md.transient_results(' num2str(i) ').thickness-md.transient_results(' num2str(i-1) ').thickness,''title'',''Delta thickness at time ' num2str(md.transient_results(i).time) ' a'''];
+for i=2:length(md.results.transient),
+        string=[string ',''data'',md.results.transient(' num2str(i) ').thickness-md.results.transient(' num2str(i-1) ').thickness,''title'',''Delta thickness at time ' num2str(md.results.transient(i).time) ' a'''];
 end
 string=[string ',''figure'',4,''colorbar#all'',''on'',''fontsize'',' num2str(options_structure.fontsize) ',''fontweight'',' num2str(options_structure.fontweight)  ');'];
@@ -55 +55 @@
 
 string='plotmodel(md';
-for i=2:length(md.transient_results),
-        string=[string ',''data'',md.transient_results(' num2str(i) ').vel-md.transient_results(' num2str(i-1) ').vel,''view'',3,''title'',''Delta velocity at time ' num2str(md.transient_results(i).time) ' a'''];
+for i=2:length(md.results.transient),
+        string=[string ',''data'',md.results.transient(' num2str(i) ').vel-md.results.transient(' num2str(i-1) ').vel,''view'',3,''title'',''Delta velocity at time ' num2str(md.results.transient(i).time) ' a'''];
 end
 string=[string ',''figure'',5,''colorbar#all'',''on'',''fontsize'',' num2str(options_structure.fontsize) ',''fontweight'',' num2str(options_structure.fontweight)  ');'];
@@ -63 +63 @@
 
 string='plotmodel(md';
-for i=2:length(md.transient_results),
-        string=[string ',''data'',md.transient_results(' num2str(i) ').temperature-md.transient_results(' num2str(i-1) ').temperature,''view'',3,''title'',''Delta temperature at time ' num2str(md.transient_results(i).time) ' a'''];
+for i=2:length(md.results.transient),
+        string=[string ',''data'',md.results.transient(' num2str(i) ').temperature-md.results.transient(' num2str(i-1) ').temperature,''view'',3,''title'',''Delta temperature at time ' num2str(md.results.transient(i).time) ' a'''];
 end
 string=[string ',''figure'',6,''colorbar#all'',''on'',''fontsize'',' num2str(options_structure.fontsize) ',''fontweight'',' num2str(options_structure.fontweight)  ');'];