Changeset 16248
- Timestamp:
- 09/25/13 08:48:14 (11 years ago)
- 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 21 21 int nsteps; 22 22 IssmDouble tol_cm; 23 bool cm_gradient;24 23 int dim; 25 24 int solution_type; … … 54 53 femmodel->parameters->FindParam(&cm_jump,NULL,InversionStepThresholdEnum); 55 54 femmodel->parameters->FindParam(&tol_cm,InversionCostFunctionThresholdEnum); 56 femmodel->parameters->FindParam(&cm_gradient,InversionGradientOnlyEnum);57 55 femmodel->parameters->FindParam(&dim,MeshDimensionEnum); 58 56 femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum); … … 92 90 gradient_core(femmodel,n,search_scalar==0.); 93 91 94 /*Return gradient if asked: */95 if (cm_gradient){96 InputToResultx(femmodel,GradientEnum);97 goto cleanup_and_return;98 }99 100 92 if(VerboseControl()) _printf0_(" optimizing along gradient direction\n"); 101 93 optpars.maxiter=reCast<int,IssmDouble>(maxiter[n]); optpars.cm_jump=cm_jump[n]; … … 126 118 } 127 119 128 cleanup_and_return:129 120 /*Free ressources: */ 130 121 xDelete<int>(control_type); -
TabularUnified issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp ¶
r15000 r16248 37 37 if(!tao_analysis){ 38 38 parameters->AddObject(iomodel->CopyConstantObject(InversionCostFunctionThresholdEnum)); 39 parameters->AddObject(iomodel->CopyConstantObject(InversionGradientOnlyEnum));40 39 } 41 40 -
TabularUnified issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h ¶
r16243 r16248 127 127 InversionCostFunctionsCoefficientsEnum, 128 128 InversionCostFunctionsEnum, 129 InversionGradientOnlyEnum,130 129 InversionGradientScalingEnum, 131 130 InversionIscontrolEnum, -
TabularUnified issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp ¶
r16243 r16248 135 135 case InversionCostFunctionsCoefficientsEnum : return "InversionCostFunctionsCoefficients"; 136 136 case InversionCostFunctionsEnum : return "InversionCostFunctions"; 137 case InversionGradientOnlyEnum : return "InversionGradientOnly";138 137 case InversionGradientScalingEnum : return "InversionGradientScaling"; 139 138 case InversionIscontrolEnum : return "InversionIscontrol"; -
TabularUnified issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp ¶
r16243 r16248 135 135 else if (strcmp(name,"InversionCostFunctionsCoefficients")==0) return InversionCostFunctionsCoefficientsEnum; 136 136 else if (strcmp(name,"InversionCostFunctions")==0) return InversionCostFunctionsEnum; 137 else if (strcmp(name,"InversionGradientOnly")==0) return InversionGradientOnlyEnum;138 137 else if (strcmp(name,"InversionGradientScaling")==0) return InversionGradientScalingEnum; 138 else if (strcmp(name,"InversionIscontrol")==0) return InversionIscontrolEnum; 139 139 else stage=2; 140 140 } 141 141 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; 144 143 else if (strcmp(name,"InversionIncompleteAdjoint")==0) return InversionIncompleteAdjointEnum; 145 144 else if (strcmp(name,"InversionMaxParameters")==0) return InversionMaxParametersEnum; … … 260 259 else if (strcmp(name,"SurfaceforcingsIssmbgradients")==0) return SurfaceforcingsIssmbgradientsEnum; 261 260 else if (strcmp(name,"SurfaceforcingsMonthlytemperatures")==0) return SurfaceforcingsMonthlytemperaturesEnum; 261 else if (strcmp(name,"SurfaceforcingsHref")==0) return SurfaceforcingsHrefEnum; 262 262 else stage=3; 263 263 } 264 264 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; 267 266 else if (strcmp(name,"SurfaceforcingsBPos")==0) return SurfaceforcingsBPosEnum; 268 267 else if (strcmp(name,"SurfaceforcingsBNeg")==0) return SurfaceforcingsBNegEnum; … … 383 382 else if (strcmp(name,"TransientParam")==0) return TransientParamEnum; 384 383 else if (strcmp(name,"Matice")==0) return MaticeEnum; 384 else if (strcmp(name,"Matpar")==0) return MatparEnum; 385 385 else stage=4; 386 386 } 387 387 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; 390 389 else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum; 391 390 else if (strcmp(name,"NumericalfluxType")==0) return NumericalfluxTypeEnum; … … 506 505 else if (strcmp(name,"GiaCrossSectionShape")==0) return GiaCrossSectionShapeEnum; 507 506 else if (strcmp(name,"GiadWdt")==0) return GiadWdtEnum; 507 else if (strcmp(name,"GiaW")==0) return GiaWEnum; 508 508 else stage=5; 509 509 } 510 510 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; 513 512 else if (strcmp(name,"P1")==0) return P1Enum; 514 513 else if (strcmp(name,"P1DG")==0) return P1DGEnum;
Note:
See TracChangeset
for help on using the changeset viewer.