Changeset 16248


Ignore:
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:
5 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified issm/trunk-jpl/src/c/analyses/control_core.cpp

    r15849 r16248  
    2121        int        nsteps;
    2222        IssmDouble tol_cm;
    23         bool       cm_gradient;
    2423        int        dim;
    2524        int        solution_type;
     
    5453        femmodel->parameters->FindParam(&cm_jump,NULL,InversionStepThresholdEnum);
    5554        femmodel->parameters->FindParam(&tol_cm,InversionCostFunctionThresholdEnum);
    56         femmodel->parameters->FindParam(&cm_gradient,InversionGradientOnlyEnum);
    5755        femmodel->parameters->FindParam(&dim,MeshDimensionEnum);
    5856        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
     
    9290                gradient_core(femmodel,n,search_scalar==0.);
    9391
    94                 /*Return gradient if asked: */
    95                 if (cm_gradient){
    96                         InputToResultx(femmodel,GradientEnum);
    97                         goto cleanup_and_return;
    98                 }
    99 
    10092                if(VerboseControl()) _printf0_("   optimizing along gradient direction\n");
    10193                optpars.maxiter=reCast<int,IssmDouble>(maxiter[n]); optpars.cm_jump=cm_jump[n];
     
    126118        }
    127119
    128         cleanup_and_return:
    129120        /*Free ressources: */
    130121        xDelete<int>(control_type);
  • TabularUnified issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp

    r15000 r16248  
    3737                if(!tao_analysis){
    3838                        parameters->AddObject(iomodel->CopyConstantObject(InversionCostFunctionThresholdEnum));
    39                         parameters->AddObject(iomodel->CopyConstantObject(InversionGradientOnlyEnum));
    4039                }
    4140
  • TabularUnified issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

    r16243 r16248  
    127127        InversionCostFunctionsCoefficientsEnum,
    128128        InversionCostFunctionsEnum,
    129         InversionGradientOnlyEnum,
    130129        InversionGradientScalingEnum,
    131130        InversionIscontrolEnum,
  • TabularUnified issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

    r16243 r16248  
    135135                case InversionCostFunctionsCoefficientsEnum : return "InversionCostFunctionsCoefficients";
    136136                case InversionCostFunctionsEnum : return "InversionCostFunctions";
    137                 case InversionGradientOnlyEnum : return "InversionGradientOnly";
    138137                case InversionGradientScalingEnum : return "InversionGradientScaling";
    139138                case InversionIscontrolEnum : return "InversionIscontrol";
  • TabularUnified issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

    r16243 r16248  
    135135              else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum;
    136136              else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum;
    137               else if (strcmp(name,"InversionGradientOnly")==0) return InversionGradientOnlyEnum;
    138137              else if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum;
     138              else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum;
    139139         else stage=2;
    140140   }
    141141   if(stage==2){
    142               if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum;
    143               else if (strcmp(name,"InversionTao")==0) return InversionTaoEnum;
     142              if (strcmp(name,"InversionTao")==0) return InversionTaoEnum;
    144143              else if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum;
    145144              else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum;
     
    260259              else if (strcmp(name,"SurfaceforcingsIssmbgradients")==0) return SurfaceforcingsIssmbgradientsEnum;
    261260              else if (strcmp(name,"SurfaceforcingsMonthlytemperatures")==0) return SurfaceforcingsMonthlytemperaturesEnum;
     261              else if (strcmp(name,"SurfaceforcingsHref")==0) return SurfaceforcingsHrefEnum;
    262262         else stage=3;
    263263   }
    264264   if(stage==3){
    265               if (strcmp(name,"SurfaceforcingsHref")==0) return SurfaceforcingsHrefEnum;
    266               else if (strcmp(name,"SurfaceforcingsSmbref")==0) return SurfaceforcingsSmbrefEnum;
     265              if (strcmp(name,"SurfaceforcingsSmbref")==0) return SurfaceforcingsSmbrefEnum;
    267266              else if (strcmp(name,"SurfaceforcingsBPos")==0) return SurfaceforcingsBPosEnum;
    268267              else if (strcmp(name,"SurfaceforcingsBNeg")==0) return SurfaceforcingsBNegEnum;
     
    383382              else if (strcmp(name,"TransientParam")==0) return TransientParamEnum;
    384383              else if (strcmp(name,"Matice")==0) return MaticeEnum;
     384              else if (strcmp(name,"Matpar")==0) return MatparEnum;
    385385         else stage=4;
    386386   }
    387387   if(stage==4){
    388               if (strcmp(name,"Matpar")==0) return MatparEnum;
    389               else if (strcmp(name,"Node")==0) return NodeEnum;
     388              if (strcmp(name,"Node")==0) return NodeEnum;
    390389              else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
    391390              else if (strcmp(name,"NumericalfluxType")==0) return NumericalfluxTypeEnum;
     
    506505              else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum;
    507506              else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum;
     507              else if (strcmp(name,"GiaW")==0) return GiaWEnum;
    508508         else stage=5;
    509509   }
    510510   if(stage==5){
    511               if (strcmp(name,"GiaW")==0) return GiaWEnum;
    512               else if (strcmp(name,"P0")==0) return P0Enum;
     511              if (strcmp(name,"P0")==0) return P0Enum;
    513512              else if (strcmp(name,"P1")==0) return P1Enum;
    514513              else if (strcmp(name,"P1DG")==0) return P1DGEnum;
Note: See TracChangeset for help on using the changeset viewer.