Changeset 18876

Timestamp:

11/28/14 09:47:05 (10 years ago)

Author:

Eric.Larour

Message:

CHG: hook up for the ad inversion class (m1qn3 style control). Also made sure the incomplete adjoint
option is control class dependent, not generic for all control classes.

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (modified) (6 diffs)

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

@@ -31 +31 @@
                 parameters->AddObject(iomodel->CopyConstantObject(InversionNumControlParametersEnum));
                 parameters->AddObject(iomodel->CopyConstantObject(InversionNumCostFunctionsEnum));
-                parameters->AddObject(iomodel->CopyConstantObject(InversionIncompleteAdjointEnum));
 
                 /*What solution type?*/
@@ -50 +49 @@
                 switch(inversiontype){
                         case 0:/*Brent Search*/
+                                parameters->AddObject(iomodel->CopyConstantObject(InversionIncompleteAdjointEnum));
                                 parameters->AddObject(iomodel->CopyConstantObject(InversionNstepsEnum));
                                 parameters->AddObject(iomodel->CopyConstantObject(InversionCostFunctionThresholdEnum));
@@ -60 +60 @@
                                 break;
                         case 1:/*TAO*/
+                                parameters->AddObject(iomodel->CopyConstantObject(InversionIncompleteAdjointEnum));
                                 parameters->AddObject(iomodel->CopyConstantObject(InversionFatolEnum));
                                 parameters->AddObject(iomodel->CopyConstantObject(InversionFrtolEnum));
@@ -70 +71 @@
                                 break;
                         case 2:/*M1QN3*/
+                                parameters->AddObject(iomodel->CopyConstantObject(InversionIncompleteAdjointEnum));
                                 parameters->AddObject(iomodel->CopyConstantObject(InversionDxminEnum));
                                 parameters->AddObject(iomodel->CopyConstantObject(InversionGttolEnum));
@@ -78 +80 @@
                                 break;
                         case 3:/*Validation*/
+                                parameters->AddObject(iomodel->CopyConstantObject(InversionIncompleteAdjointEnum));
+                                iomodel->FetchData(&control_scaling_factors,NULL,NULL,InversionControlScalingFactorsEnum);
+                                parameters->AddObject(new DoubleVecParam(InversionControlScalingFactorsEnum,control_scaling_factors,num_controls));
+                                break;
+                        case 4:/*M1QN3 AD*/
+                                parameters->AddObject(iomodel->CopyConstantObject(InversionDxminEnum));
+                                parameters->AddObject(iomodel->CopyConstantObject(InversionGttolEnum));
+                                parameters->AddObject(iomodel->CopyConstantObject(InversionMaxstepsEnum));
+                                parameters->AddObject(iomodel->CopyConstantObject(InversionMaxiterEnum));
                                 iomodel->FetchData(&control_scaling_factors,NULL,NULL,InversionControlScalingFactorsEnum);
                                 parameters->AddObject(new DoubleVecParam(InversionControlScalingFactorsEnum,control_scaling_factors,num_controls));
@@ -87 +98 @@
 
                 xDelete<int>(control_type);
-                xDelete<int>(cm_responses);
                 xDelete<int>(maxiter);
                 xDelete<IssmDouble>(control_scaling_factors);