Changeset 5466

Timestamp:

08/20/10 16:31:01 (15 years ago)

Author:

Mathieu Morlighem

Message:

gradient was never orthogonalized

Location:

issm/trunk/src/m/solutions

Files:

• control_core.m (modified) (3 diffs)
• gradient_core.m (modified) (1 diff)

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

@@ -27 +27 @@
         %Initialize misfits with a vector of zeros
         J=zeros(nsteps,1);
+        search_scalar=0;
 
         %Get core from solution type
@@ -34 +35 @@
         %Launch once a complete solution to set up all inputs
         disp('      preparing initial solution');
-        isstokes
         if isstokes,
                 eval(['femmodel=' solutioncore '(femmodel);']);
@@ -53 +53 @@
 
                 displaystring(verbose,'\n%s',['      computing gradJ...']);
-                femmodel=gradient_core(femmodel);
+                femmodel=gradient_core(femmodel,n,search_scalar);
 
                 %Return gradient if asked

issm/trunk/src/m/solutions/gradient_core.m

@@ -35 +35 @@
         end
 
-        if (step>0 && search_scalar==0),
+        if (step>1 && search_scalar==0),
                 displaystring(verbose,'\n%s',['      orthogonalization...']);
                 new_gradient=Orth(grad,old_gradient);