Changeset 16248

Timestamp:

09/25/13 08:48:14 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: removed gradient_only option, use nsteps=0 instead

Location:

issm/trunk-jpl/src/c

Files:

• analyses/control_core.cpp (modified) (4 diffs)
• modules/ModelProcessorx/Control/CreateParametersControl.cpp (modified) (1 diff)
• shared/Enum/EnumDefinitions.h (modified) (1 diff)
• shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• shared/Enum/StringToEnumx.cpp (modified) (4 diffs)

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

@@ -21 +21 @@
         int        nsteps;
         IssmDouble tol_cm;
-        bool       cm_gradient;
         int        dim;
         int        solution_type;
@@ -54 +53 @@
         femmodel->parameters->FindParam(&cm_jump,NULL,InversionStepThresholdEnum);
         femmodel->parameters->FindParam(&tol_cm,InversionCostFunctionThresholdEnum);
-        femmodel->parameters->FindParam(&cm_gradient,InversionGradientOnlyEnum);
         femmodel->parameters->FindParam(&dim,MeshDimensionEnum);
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
@@ -92 +90 @@
                 gradient_core(femmodel,n,search_scalar==0.);
 
-                /*Return gradient if asked: */
-                if (cm_gradient){
-                        InputToResultx(femmodel,GradientEnum);
-                        goto cleanup_and_return;
-                }
-
                 if(VerboseControl()) _printf0_("   optimizing along gradient direction\n");
                 optpars.maxiter=reCast<int,IssmDouble>(maxiter[n]); optpars.cm_jump=cm_jump[n];
@@ -126 +118 @@
         }
 
-        cleanup_and_return:
         /*Free ressources: */
         xDelete<int>(control_type);

issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp

@@ -37 +37 @@
                 if(!tao_analysis){
                         parameters->AddObject(iomodel->CopyConstantObject(InversionCostFunctionThresholdEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject(InversionGradientOnlyEnum));
                 }
 

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -127 +127 @@
         InversionCostFunctionsCoefficientsEnum,
         InversionCostFunctionsEnum,
-        InversionGradientOnlyEnum,
         InversionGradientScalingEnum,
         InversionIscontrolEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -135 +135 @@
                 case InversionCostFunctionsCoefficientsEnum : return "InversionCostFunctionsCoefficients";
                 case InversionCostFunctionsEnum : return "InversionCostFunctions";
-                case InversionGradientOnlyEnum : return "InversionGradientOnly";
                 case InversionGradientScalingEnum : return "InversionGradientScaling";
                 case InversionIscontrolEnum : return "InversionIscontrol";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -135 +135 @@
               else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum;
               else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum;
-              else if (strcmp(name,"InversionGradientOnly")==0) return InversionGradientOnlyEnum;
               else if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum;
+              else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum;
-              else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum;
+              if (strcmp(name,"InversionTao")==0) return InversionTaoEnum;
               else if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum;
               else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum;
@@ -260 +259 @@
               else if (strcmp(name,"SurfaceforcingsIssmbgradients")==0) return SurfaceforcingsIssmbgradientsEnum;
               else if (strcmp(name,"SurfaceforcingsMonthlytemperatures")==0) return SurfaceforcingsMonthlytemperaturesEnum;
+              else if (strcmp(name,"SurfaceforcingsHref")==0) return SurfaceforcingsHrefEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"SurfaceforcingsHref")==0) return SurfaceforcingsHrefEnum;
-              else if (strcmp(name,"SurfaceforcingsSmbref")==0) return SurfaceforcingsSmbrefEnum;
+              if (strcmp(name,"SurfaceforcingsSmbref")==0) return SurfaceforcingsSmbrefEnum;
               else if (strcmp(name,"SurfaceforcingsBPos")==0) return SurfaceforcingsBPosEnum;
               else if (strcmp(name,"SurfaceforcingsBNeg")==0) return SurfaceforcingsBNegEnum;
@@ -383 +382 @@
               else if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
               else if (strcmp(name,"Matice")==0) return MaticeEnum;
+              else if (strcmp(name,"Matpar")==0) return MatparEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"Matpar")==0) return MatparEnum;
-              else if (strcmp(name,"Node")==0) return NodeEnum;
+              if (strcmp(name,"Node")==0) return NodeEnum;
               else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
               else if (strcmp(name,"NumericalfluxType")==0) return NumericalfluxTypeEnum;
@@ -506 +505 @@
               else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum;
               else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum;
+              else if (strcmp(name,"GiaW")==0) return GiaWEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"GiaW")==0) return GiaWEnum;
-              else if (strcmp(name,"P0")==0) return P0Enum;
+              if (strcmp(name,"P0")==0) return P0Enum;
               else if (strcmp(name,"P1")==0) return P1Enum;
               else if (strcmp(name,"P1DG")==0) return P1DGEnum;