Changeset 683

Timestamp:

06/01/09 16:52:57 (15 years ago)

Author:

Mathieu Morlighem

Message:

minor

Location:

issm/trunk/src/m

Files:

• classes/public/isresultconsistent.m (modified) (1 diff)
• solutions/macayeal/control.m (modified) (1 diff)

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

@@ -80 +80 @@
 
         %check inversed parameter
-        if any(md.control.parameter<md.mincontrolconstraint | md.control.parameter>md.maxcontrolconstraint)
+        if any(md.results.control.parameter<md.mincontrolconstraint | md.results.control.parameter>md.maxcontrolconstraint)
                 disp(['''control'' result not consistent: inverse parameter out of range [' md.mincontrolconstraint ' ' md.maxcontrolconstraint ']']);
                 bool=0; return; 

issm/trunk/src/m/solutions/macayeal/control.m

@@ -231 +231 @@
        J(niteration)=objectivefunction_C_flow(0,B,glen_coeff,direction,Rhs,S,F,P,specified_velocity,nods,nel,vx_obs, ...
           vy_obs,u_objective, v_objective, index,alpha, beta, area,weighting,rowD,colD,rowDshort,colDshort,valueuu,valuevv,valueuv,matrix_bar,criterion);
-      disp(J(niteration));
 
       %do a backup every 5 iterations