Changeset 18830

Timestamp:

11/21/14 15:46:32 (10 years ago)

Author:

hongjuy

Message:

CHG: no vy in flowline models, and new control parameter

File:

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

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

@@ -12 +12 @@
 
         /*Intermediary*/
-        int       control,cost_function;
+        int       control,cost_function,domaintype;
         Element  *element = NULL;
         Material *material = NULL;
@@ -29 +29 @@
         /*Fetch Observations */
         iomodel->Constant(&num_cost_functions,InversionNumCostFunctionsEnum);
+        iomodel->Constant(&domaintype,DomainTypeEnum);
         for(int i=0;i<num_cost_functions;i++){
                 cost_function= reCast<int,IssmDouble>(iomodel->Data(InversionCostFunctionsEnum)[i]);
@@ -39 +40 @@
                           || cost_function==SurfaceAverageVelMisfitEnum){
                         iomodel->FetchDataToInput(elements,InversionVxObsEnum);
-                        iomodel->FetchDataToInput(elements,InversionVyObsEnum); 
+                        if (domaintype!=Domain2DverticalEnum) iomodel->FetchDataToInput(elements,InversionVyObsEnum); 
                 }
         }
@@ -54 +55 @@
                         case BalancethicknessApparentMassbalanceEnum:
                         case BalancethicknessOmegaEnum:
+                        case MaterialsRheologyBEnum: 
                                 iomodel->FetchData(1,control); 
                                 break;