Changeset 240

Timestamp:

05/05/09 12:07:23 (16 years ago)

Author:

Mathieu Morlighem

Message:

some fixing in CM (xmin=0)

Location:

issm/trunk/src/m/solutions/cielo

Files:

• control.m (modified) (1 diff)
• controlfinalsol.m (modified) (2 diffs)
• plot_direction.m (modified) (1 diff)

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

@@ -51 +51 @@
                 
                 disp('      optimizing along gradient direction...'); 
-                [search_scalar c(n).J]=ControlOptimization('objectivefunctionC',-1,1,options,m,p_g,u_g_obs,c(n).grad_g,n);
+                [search_scalar c(n).J]=ControlOptimization('objectivefunctionC',0,1,options,m,p_g,u_g_obs,c(n).grad_g,n);
+                %[search_scalar c(n).J]=fminbnd('objectivefunctionC',0,1,options,m,p_g,u_g_obs,c(n).grad_g,n);
                 disp('      done.');
 

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

@@ -3 +3 @@
 %From parameters, build inputs for icediagnostic_core, using the final parameters
 eval(['inputs.' m.parameters.control_type '=p_g;']);
-
 u_g=diagnostic_core_nonlinear(m,inputs);
 
 %Build partitioning vectors to recover solution
-indx=m.part(1:2:end);
-indy=m.part(2:2:end);
+indx=[1:2:m.nodesets.gsize];
+indy=[2:2:m.nodesets.gsize];
 
 %Recover velocity, and parameters, in the correct partitioning.
@@ -14 +13 @@
 vy=u_g(indy);
 vel=sqrt(vx.^2+vy.^2);
-
 parameter=p_g(indx);
 

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

@@ -1 @@
-plotmodel(md,'data',sqrt(c(n).grad_g(1:2:end).^2+c(n).grad_g(2:2:end).^2),'title',['Normalized Direction for ' m.parameters.control_type],'figure',1,'colorbar#all','on'); pause(1);
+plotmodel(md,'data',c(n).grad_g(1:2:end),'title',['Normalized Direction for ' m.parameters.control_type],'figure',1,'colorbar#all','on'); pause(1);