Changeset 11302

Timestamp:

02/02/12 08:46:38 (13 years ago)

Author:

Mathieu Morlighem

Message:

minor

Location:

issm/trunk-jpl/src

Files:

• c/solutions/control_core.cpp (modified) (1 diff)
• c/solutions/gradient_core.cpp (modified) (3 diffs)
• m/solutions/control_core.m (modified) (1 diff)
• m/solutions/gradient_core.m (modified) (3 diffs)

issm/trunk-jpl/src/c/solutions/control_core.cpp

@@ -106 +106 @@
                 
                 if(controlconvergence(J[n],tol_cm)) break;
-
-                /*Temporary saving every 5 control steps: */
-                /*if (((n+1)%5)==0){
-                        _printf_(VerboseControl(),"%s\n","   saving temporary results");
-                        controlrestart(femmodel,J);
-                }*/
         }
 

issm/trunk-jpl/src/c/solutions/gradient_core.cpp

@@ -40 +40 @@
                 Gradjx(&gradient, femmodel->elements,femmodel->nodes, femmodel->vertices,femmodel->loads, femmodel->materials,femmodel->parameters, control_type[i]);
 
-                if(control_steady)diagnostic_core(femmodel);
-
                 if (step>0 && search_scalar==0){
                         _printf_(VerboseControl(),"   orthogonalization\n");
@@ -48 +46 @@
                 }
                 else{ 
-                        _printf_(VerboseControl(),"   normalizing directions\n");
-                        Orthx(&new_gradient,gradient,NULL); VecFree(&gradient);
+                        new_gradient=gradient;
                 }
 
@@ -66 +63 @@
         for (int i=0;i<num_controls;i++) ControlInputScaleGradientx(femmodel-> elements,femmodel-> nodes, femmodel-> vertices,femmodel-> loads, femmodel-> materials,  femmodel->parameters,control_type[i],optscal);
 
+        /*For Nightly run compatibility, do a last diagnostic FIXME: to be removed*/
+        if(control_steady)diagnostic_core(femmodel);
+
         /*Clean up and return*/
         xfree((void**)&control_type);

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

@@ -83 +83 @@
         end
         femmodel.results=AddExternalResult(femmodel.results,JEnum,J);
-        %femmodel.results=AddExternalResult(femmodel.results,InversionControlParametersEnum,control_type);
 
 end %end function

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

@@ -31 +31 @@
                 grad=Gradj(femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters,control_type(i));
 
-                if control_steady,
-                        femmodel=diagnostic_core(femmodel);
-                end
-
                 if (step>1 && search_scalar==0),
                         issmprintf(VerboseControl,'%s',['   orthogonalization']);
@@ -40 +36 @@
                         new_gradient=Orth(grad,old_gradient);
                 else
-                        issmprintf(VerboseControl,'%s',['   normalizing direction']);
-                        new_gradient=Orth(grad,[]);
+                        new_gradient=grad;
                 end
 
@@ -58 +53 @@
                 [femmodel.elements,femmodel.nodes,femmodel.vertices,femmodel.loads,femmodel.materials,femmodel.parameters]=ControlInputScaleGradient(femmodel.elements,femmodel.nodes, femmodel.vertices,femmodel.loads, femmodel.materials,  femmodel.parameters,control_type(i),gradient_scaling);
         end
+
+        if control_steady,
+                femmodel=diagnostic_core(femmodel);
+        end
+