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

Timestamp:

08/11/20 19:43:31 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving inputs2 back to inputs

File:

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

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

@@ -9 +9 @@
 #include "../ModelProcessorx.h"
 
-void    UpdateElementsAndMaterialsControl(Elements* elements,Parameters* parameters,Inputs2* inputs2,Materials* materials, IoModel* iomodel){
+void    UpdateElementsAndMaterialsControl(Elements* elements,Parameters* parameters,Inputs* inputs,Materials* materials, IoModel* iomodel){
         /*Intermediary*/
         bool       control_analysis;
@@ -34 +34 @@
         iomodel->FindConstant(&isautodiff,"md.autodiff.isautodiff");
         if(isautodiff){
-                UpdateElementsAndMaterialsControlAD(elements,parameters,inputs2,materials,iomodel);
+                UpdateElementsAndMaterialsControlAD(elements,parameters,inputs,materials,iomodel);
                 return;
         }
@@ -72 +72 @@
         for(int i=0;i<num_cost_functions;i++){
                 cost_function=cost_function_enums[i];
-                if(     cost_function==ThicknessAbsMisfitEnum) iomodel->FetchDataToInput(inputs2,elements,"md.inversion.thickness_obs",InversionThicknessObsEnum);
-                else if(cost_function==SurfaceAbsMisfitEnum)   iomodel->FetchDataToInput(inputs2,elements,"md.inversion.surface_obs",InversionSurfaceObsEnum);
-                else if(cost_function==RheologyBInitialguessMisfitEnum) iomodel->FetchDataToInput(inputs2,elements,"md.materials.rheology_B",RheologyBInitialguessEnum);
+                if(     cost_function==ThicknessAbsMisfitEnum) iomodel->FetchDataToInput(inputs,elements,"md.inversion.thickness_obs",InversionThicknessObsEnum);
+                else if(cost_function==SurfaceAbsMisfitEnum)   iomodel->FetchDataToInput(inputs,elements,"md.inversion.surface_obs",InversionSurfaceObsEnum);
+                else if(cost_function==RheologyBInitialguessMisfitEnum) iomodel->FetchDataToInput(inputs,elements,"md.materials.rheology_B",RheologyBInitialguessEnum);
                 else if(cost_function==SurfaceAbsVelMisfitEnum
                           || cost_function==SurfaceRelVelMisfitEnum
@@ -80 +80 @@
                           || cost_function==SurfaceLogVxVyMisfitEnum
                           || cost_function==SurfaceAverageVelMisfitEnum){
-                        iomodel->FetchDataToInput(inputs2,elements,"md.inversion.vx_obs",InversionVxObsEnum);
-                        if(domaintype!=Domain2DverticalEnum) iomodel->FetchDataToInput(inputs2,elements,"md.inversion.vy_obs",InversionVyObsEnum); 
+                        iomodel->FetchDataToInput(inputs,elements,"md.inversion.vx_obs",InversionVxObsEnum);
+                        if(domaintype!=Domain2DverticalEnum) iomodel->FetchDataToInput(inputs,elements,"md.inversion.vy_obs",InversionVyObsEnum); 
                 }
                 for(int j=0;j<elements->Size();j++){
                         Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(j));
-                        element->DatasetInputAdd(InversionCostFunctionsCoefficientsEnum,&weights[i*iomodel->numberofvertices],inputs2,iomodel,M,1,1,cost_function,7,cost_function);
+                        element->DatasetInputAdd(InversionCostFunctionsCoefficientsEnum,&weights[i*iomodel->numberofvertices],inputs,iomodel,M,1,1,cost_function,7,cost_function);
                 }
         }
@@ -162 +162 @@
                 for(int j=0;j<elements->Size();j++){
                         Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(j));
-                        element->ControlInputCreate(independent,&independents_min[offset],&independents_max[offset],inputs2,iomodel,M,N,scale,control,i+1);
+                        element->ControlInputCreate(independent,&independents_min[offset],&independents_max[offset],inputs,iomodel,M,N,scale,control,i+1);
                 }
                 xDelete<IssmDouble>(independent);
@@ -207 +207 @@
         xDelete<char*>(controls);
 }
-void UpdateElementsAndMaterialsControlAD(Elements* elements,Parameters* parameters,Inputs2* inputs2,Materials* materials, IoModel* iomodel){
+void UpdateElementsAndMaterialsControlAD(Elements* elements,Parameters* parameters,Inputs* inputs,Materials* materials, IoModel* iomodel){
 
         #if defined(_HAVE_AD_)
@@ -292 +292 @@
                         for(int j=0;j<elements->Size();j++){
                                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(j));
-                                element->ControlInputCreate(independent,independents_min,independents_max,inputs2,iomodel,M,N,1.,input_enum,i+1);
+                                element->ControlInputCreate(independent,independents_min,independents_max,inputs,iomodel,M,N,1.,input_enum,i+1);
                         }
                         xDelete<IssmDouble>(independent);