Changeset 170

Timestamp:

05/01/09 14:41:07 (16 years ago)

Author:

Mathieu Morlighem

Message:

Fixed control for macayeal

File:

• issm/trunk/src/m/solutions/macayeal/control.m (modified) (3 diffs)

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

@@ -125 +125 @@
 
 %nu_bar=10^14*ones(nel,1);  %initial element viscosity distribution.
-nu_bar=viscosity(index,nel,alpha,beta,vx_obs,vy_obs,B_bar,glen_coeff);
+nu_bar=viscosity(index,nel,alpha,beta,[],[],B_bar,glen_coeff);
 
 %%%AK velfinder;    %forward model that determines first velocity field used 
@@ -132 +132 @@
 c_velfinder;
 
-if strcmp(md.control_type{1},'B'),
+if strcmp(md.control_type,'B'),
     for niteration=1:nsteps,
 
@@ -237 +237 @@
     %Load results onto md:
     md.cont_J=J;
-    md.cont_parameters=B;
+    md.cont_parameter=B;
 
 elseif strcmp(md.control_type,'basal'),