Changeset 107

Timestamp:

04/28/09 15:31:04 (16 years ago)

Author:

Eric.Larour

Message:

Redid loading of control results

File:

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

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

@@ -14 +14 @@
 
 results=parseresultsfromdisk(filename);
+save results results
 
 %First get solution type
@@ -41 +42 @@
 elseif strcmpi(analysis_type,'control'),
 
-        %read num_control_parameters
-        num_control_parameters=results{4};
-        nsteps=results{5};
+        %Get u_g
+        u_g=results{4};
+
+        %Used to recover velocities
+        indx=part(1:2:end);
+        indy=part(2:2:end);
+
+        %Recover velocity
+        md.cont_vx=u_g(indx)*md.yts;
+        md.cont_vy=u_g(indy)*md.yts;
+        md.cont_vel=sqrt(md.vx.^2+md.vy.^2);
+        
+        %recover parameter 
+        cont_parameter=results{5};
+        cont_parameter=cont_parameter(indx);
+        md.cont_parameter=cont_parameter;
         
         %read J
         md.cont_J=results{6};
 
-        %Used to recover parameters and velocit
-        indx=part(1:2:end);
-        indy=part(2:2:end);
-
-        %read parameters
-        for i=1:num_control_parameters,
-                control_parameter=results{6+i};
-                cont_parameters{i}=control_parameter(indx);
-        end
-        md.cont_parameters=cont_parameters;
-
-        %Recover velocity
-        u_g=results{7+num_control_parameters};
-
-        md.cont_vx=u_g(indx)*md.yts;
-        md.cont_vy=u_g(indy)*md.yts;
-        md.cont_vel=sqrt(md.cont_vx.^2+md.cont_vy.^2);
 elseif strcmpi(analysis_type,'thermalsteady'),