Changeset 10197

Timestamp:

10/13/11 09:12:04 (13 years ago)

Author:

Mathieu Morlighem

Message:

Changed control method convergence behavior

Location:

issm/trunk/src

Files:

• c/shared/Matlab/ModuleBoot.cpp (modified) (1 diff)
• c/solutions/control_core.cpp (modified) (3 diffs)
• c/solutions/controlconvergence.cpp (modified) (2 diffs)
• c/solutions/solutions.h (modified) (1 diff)
• m/solutions/control_core.m (modified) (2 diffs)
• m/solutions/controlconvergence.m (modified) (1 diff)

issm/trunk/src/c/shared/Matlab/ModuleBoot.cpp

@@ -28 +28 @@
         }
         else if (0){
+                PetscErrorCode   ierr;
                 PetscBool flg;
                 ierr=PetscInitialized(&flg);CHKERRQ(ierr);

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

@@ -20 +20 @@
         int     num_controls,num_responses;
         int     nsteps;
-        double  eps_cm;
+        double  tol_cm;
         bool    cm_gradient;
         int     dim;
@@ -53 +53 @@
         femmodel->parameters->FindParam(&maxiter,NULL,InversionMaxiterPerStepEnum);
         femmodel->parameters->FindParam(&cm_jump,NULL,InversionStepThresholdEnum);
-        femmodel->parameters->FindParam(&eps_cm,InversionCostFunctionThresholdEnum);
+        femmodel->parameters->FindParam(&tol_cm,InversionCostFunctionThresholdEnum);
         femmodel->parameters->FindParam(&cm_gradient,InversionGradientOnlyEnum);
         femmodel->parameters->FindParam(&dim,MeshDimensionEnum);
@@ -105 +105 @@
                 InputControlUpdatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,search_scalar,true);
                 
-                if(controlconvergence(J,responses,eps_cm,n)) break;
+                if(controlconvergence(J[n],tol_cm)) break;
 
                 /*Temporary saving every 5 control steps: */

issm/trunk/src/c/solutions/controlconvergence.cpp

@@ -17 +17 @@
 #include "./solutions.h"
 
-bool controlconvergence(double* J,double* responses, double eps_cm, int n){
+bool controlconvergence(double J, double tol_cm){
 
         int i;
@@ -23 +23 @@
 
         /*Has convergence been reached?*/
-        if (!isnan(eps_cm)){
-                i=n-2;
-
-                //go through the previous misfits(starting from n-2)
-                while(i>=0){
-                        if (responses[i]==responses[n]){
-                                //convergence test only if we have the same misfits
-                                if ((J[i]-J[n])/J[n] <= eps_cm){
-                                        //convergence if convergence criteria fullfilled
-                                        converged=true;
-                                        _printf_(VerboseConvergence(),"%s%g%s%g\n","      Convergence criterion: dJ/J = ",(J[i]-J[n])/J[n],"<",eps_cm);
-                                }
-                                else{
-                                        _printf_(VerboseConvergence(),"%s%g%s%g\n","      Convergence criterion: dJ/J = ",(J[i]-J[n])/J[n],">",eps_cm);
-                                }
-                                break;
-                        }
-                        i=i-1;
-                }
+        if (!isnan(tol_cm) && J<tol_cm){
+                converged=true;
+                _printf_(VerboseConvergence(),"      Convergence criterion reached: J = %g < %g",J,tol_cm);
         }
 

issm/trunk/src/c/solutions/solutions.h

@@ -36 +36 @@
 //convergence:
 void convergence(int* pconverged, Mat K_ff,Vec p_f,Vec u_f,Vec u_f_old,Parameters* parameters);
-bool controlconvergence(double* J, double* response, double eps_cm, int n);
+bool controlconvergence(double J,double tol_cm);
 bool steadystateconvergence(FemModel* femmodel);
 

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

@@ -15 +15 @@
         maxiter=femmodel.parameters.InversionMaxiterPerStep;
         step_threshold=femmodel.parameters.InversionStepThreshold;
-        eps_cm=femmodel.parameters.InversionCostFunctionThreshold;
+        tol_cm=femmodel.parameters.InversionCostFunctionThreshold;
         gradient_only=femmodel.parameters.InversionGradientOnly;
         dim=femmodel.parameters.MeshDimension;
@@ -66 +66 @@
 
                 %Has convergence been reached?
-                converged=controlconvergence(J,responses,eps_cm,n);
+                converged=controlconvergence(J(n),tol_cm);
                 if converged,
                         break;

issm/trunk/src/m/solutions/controlconvergence.m

@@ -1 @@
-function convergence=controlconvergence(J,responses,eps_cm,n)
+function convergence=controlconvergence(J,tol_cm)
 %CONTROLCONVERGENCE - determine the convergence of control_core solution
 %
 %   Usage:
-%       converged=controlconvergence(J,responses,eps_cm,n);
+%       converged=controlconvergence(J,tol_cm)
 
         convergence=false;
-        if ~isnan(eps_cm),
-                i=n-2;
-                %go through the previous responsess(starting from n-2)
-                while (i>=1),
-                        if (strcmp(responses(i),responses(n))),
-                                %convergence test only if we have the same misfits
-                                if ((J(i)-J(n))/J(n) <= eps_cm),
-                                        %convergence if convergence criteria fullfilled
-                                        convergence=true;
-                                        issmprintf(VerboseConvergence(),'\n%s%g%s%g\n','      Convergence criterion: dJ/J = ',(J(i)-J(n))/J(n),'<',eps_cm);
-                                else
-                                        issmprintf(VerboseConvergence(),'\n%s%g%s%g\n','      Convergence criterion: dJ/J = ',(J(i)-J(n))/J(n),'>',eps_cm);
-                                end
-                                break;
-                        end
-                        i=i-1;                                                                                                                                         
-                end
+        if ~isnan(tol_cm) & J<tol_cm,
+                convergence=true;
+                issmprintf(VerboseConvergence(),'\n      Convergence criterion reached: %g < %g\n',J,tol_cm);
         end
-
-end %end function