Changeset 509

Timestamp:

05/19/09 16:19:36 (16 years ago)

Author:

Eric.Larour

Message:

new output logic

File:

• issm/trunk/src/m/classes/public/loadresultsfromdisk.m (modified) (6 diffs)

issm/trunk/src/m/classes/public/loadresultsfromdisk.m

@@ -22 +22 @@
 end
 
-%Get gsize
-gsize=results{2};
-
 %Get part
-part=results{3};
+part=results{2};
 
 %now to specialized reading
@@ -32 +29 @@
 
         %Get u_g
-        u_g=results{4};
+        u_g=results{3};
+        p_g=results{4};
 
         if strcmpi(md.type,'2d'),
+                gsize=md.numberofgrids*2;
                 %Used to recover velocities
                 indx=1:2:gsize;
@@ -47 +46 @@
         else
                 %Used to recover velocities
-                indx=1:3:gsize;
-                indy=2:3:gsize;
-                indz=3:3:gsize;
+                gsize=length(u_g);
+                offset=gsize/md.numberofgrids;
+                indx=1:offset:gsize;
+                indy=2:offset:gsize;
+                indz=3:offset:gsize;
                 indx=indx(part);
                 indy=indy(part);
@@ -59 +60 @@
                 md.vz=u_g(indz)*md.yts;
                 md.vel=sqrt(md.vx.^2+md.vy.^2+md.vz.^2);
+                md.pressure=p_g;
         end
 
@@ -64 +66 @@
 
         %Get u_g
-        u_g=results{4};
+        u_g=results{3};
+        gsize=length(u_g);
 
         %Used to recover velocities
@@ -88 +91 @@
         md.cont_J=results{7};
 
-elseif strcmpi(analysis_type,'thermalsteady'),
+elseif strcmpi(analysis_type,'thermal'),
 
         %read t_g
-        t_g=results{4};
+        t_g=results{3};
+        m_g=results{4};
 
         %Used to recover velocities
-        indx=1:6:gsize;
-        indx=indx(part);
 
         %Recover velocity
-        md.temperature=t_g(indx);
+        md.temperature=t_g;
+        md.melting=m_g;
+
 else
         error(['loadresultsfromdisk error message: unknow solution type ',analysis_type]);