Changeset 18676

Timestamp:

10/24/14 14:40:01 (10 years ago)

Author:

seroussi

Message:

CHG: only take necessary observations in inversions

File:

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

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

@@ -12 +12 @@
 
         /*Intermediary*/
-        int       control;
+        int       control,cost_function;
         Element  *element = NULL;
         Material *material = NULL;
-        int       num_control_type;
+        int       num_control_type,num_cost_functions;
         bool      control_analysis;
 
@@ -25 +25 @@
         if(!control_analysis) return;
 
+        iomodel->FetchData(5,InversionControlParametersEnum,InversionCostFunctionsEnum,InversionCostFunctionsCoefficientsEnum,InversionMinParametersEnum,InversionMaxParametersEnum);
+
         /*Fetch data needed: */
-        iomodel->FetchDataToInput(elements,InversionVxObsEnum,0.);
-        iomodel->FetchDataToInput(elements,InversionVyObsEnum,0.); 
-        iomodel->FetchDataToInput(elements,InversionThicknessObsEnum,0.);
-        iomodel->FetchDataToInput(elements,InversionSurfaceObsEnum,0.);
-
-        iomodel->FetchData(5,InversionControlParametersEnum,InversionCostFunctionsEnum,InversionCostFunctionsCoefficientsEnum,InversionMinParametersEnum,InversionMaxParametersEnum);
+        iomodel->Constant(&num_cost_functions,InversionNumCostFunctionsEnum);
+        for(int i=0;i<num_cost_functions;i++){
+                cost_function= reCast<int,IssmDouble>(iomodel->Data(InversionCostFunctionsEnum)[i]);
+                if(cost_function==ThicknessAbsMisfitEnum) iomodel->FetchDataToInput(elements,InversionThicknessObsEnum,0.);
+                else if(cost_function==SurfaceAbsVelMisfitEnum || cost_function==SurfaceRelVelMisfitEnum || cost_function==SurfaceLogVelMisfitEnum || cost_function==SurfaceLogVxVyMisfitEnum || cost_function==SurfaceAverageVelMisfitEnum){
+                        iomodel->FetchDataToInput(elements,InversionVxObsEnum,0.);
+                        iomodel->FetchDataToInput(elements,InversionVyObsEnum,0.); 
+                }
+        }
+        //iomodel->FetchDataToInput(elements,InversionSurfaceObsEnum,0.);
 
         for(int i=0;i<num_control_type;i++){