Changeset 684

Timestamp:

06/01/09 17:02:52 (15 years ago)

Author:

Mathieu Morlighem

Message:

control results are now in field results

Location:

issm/trunk/src/m

Files:

• classes/@model/model.m (modified) (1 diff)
• classes/public/isresultconsistent.m (modified) (1 diff)
• solutions/cielo/loadcontrolfinalsol.m (modified) (1 diff)

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

@@ -177 +177 @@
         %Control
         md.control_type='';
-        md.cont_vx=NaN;
-        md.cont_vy=NaN;
-        md.cont_vz=NaN;
-        md.cont_vel=NaN;
-        md.cont_parameter=NaN;
-        md.cont_J=[];
         md.nsteps=0;
         md.maxiter=[];

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

@@ -173 +173 @@
 end % end function
 
-function bool=testsize(md,fields,sizefield)
+function bool=testsize(md,fields,fieldsize)
         %TESTSIZE - test size of a field
         bool=1;
         for i=1:length(fields),
-                if length(eval(['md.' fields{i}]))~=sizefield
+                if length(eval(['md.' fields{i}]))~=fieldsize
                         disp(['results not consistent: field ' fields{i} ' size should be ' num2str(md.numberofgrids)]);
                         bool=0; return;

issm/trunk/src/m/solutions/cielo/loadcontrolfinalsol.m

@@ -1 +1 @@
 function md=loadfinalcontrolsol(md,solution);
 
-md.cont_vx=solution.vx*md.yts;
-md.cont_vy=solution.vy*md.yts;
-md.cont_vel=solution.vel*md.yts;
-md.cont_J=solution.J;
-md.cont_parameter=solution.parameter;
+md.control.vx=solution.vx*md.yts;
+md.control.vy=solution.vy*md.yts;
+md.control.vel=solution.vel*md.yts;
+md.control.J=solution.J;
+md.control.parameter=solution.parameter;