Changeset 18128 for issm/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp

Timestamp:

06/10/14 10:18:16 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: working on BrentSearch interface to make it tao like

File:

• issm/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/modules/SetControlInputsFromVectorx/SetControlInputsFromVectorx.cpp

@@ -7 +7 @@
 #include "../../toolkits/toolkits.h"
 
-void SetControlInputsFromVectorx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,IssmDouble* vector){
+void SetControlInputsFromVectorx(FemModel* femmodel,IssmDouble* vector){
 
         int  num_controls;
@@ -13 +13 @@
 
         /*Retrieve some parameters*/
-        parameters->FindParam(&num_controls,InversionNumControlParametersEnum);
-        parameters->FindParam(&control_type,NULL,InversionControlParametersEnum);
+        femmodel->parameters->FindParam(&num_controls,InversionNumControlParametersEnum);
+        femmodel->parameters->FindParam(&control_type,NULL,InversionControlParametersEnum);
 
         for(int i=0;i<num_controls;i++){
-                for(int j=0;j<elements->Size();j++){
-                        Element* element=(Element*)elements->GetObjectByOffset(j);
+                for(int j=0;j<femmodel->elements->Size();j++){
+                        Element* element=(Element*)femmodel->elements->GetObjectByOffset(j);
                         element->SetControlInputsFromVector(vector,control_type[i],i);
                 }
@@ -26 +26 @@
 }
 
-void SetControlInputsFromVectorx(Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vector<IssmDouble>* vector){
+void SetControlInputsFromVectorx(FemModel* femmodel,Vector<IssmDouble>* vector){
 
-        IssmDouble* serial_vector=NULL;
-
-        serial_vector=vector->ToMPISerial();
-
-        SetControlInputsFromVectorx(elements,nodes, vertices, loads, materials, parameters,serial_vector);
-
-        /*Free ressources:*/
+        IssmDouble* serial_vector=vector->ToMPISerial();
+        SetControlInputsFromVectorx(femmodel,serial_vector);
         xDelete<IssmDouble>(serial_vector);
 }