Changeset 11306 for issm/trunk-jpl/src/m/solutions/control_core.m

Timestamp:

02/02/12 11:31:06 (13 years ago)

Author:

Mathieu Morlighem

Message:

improving CM algorithm

File:

• issm/trunk-jpl/src/m/solutions/control_core.m (modified) (3 diffs)

issm/trunk-jpl/src/m/solutions/control_core.m

@@ -25 +25 @@
         %Initialize misfits with a vector of zeros
         J=zeros(nsteps,1);
-        search_scalar=0;
+        search_scalar=1;
 
         %Get core from solution type
@@ -42 +42 @@
                 femmodel.parameters.StepResponses=responses(n,:);
 
-                %In case we are running a steady state control method, compute new temperature field using new parameter distribution: 
+                %In steady state inversion, compute new temperature field now
                 if (solution_type==SteadystateSolutionEnum)
                         femmodel=steadystate_core(femmodel);
@@ -50 +50 @@
                 eval(['femmodel=' adjointcore '(femmodel);']);
 
-                femmodel=gradient_core(femmodel,n,search_scalar);
+                femmodel=gradient_core(femmodel,n,search_scalar==0);
 
                 %Return gradient if asked