Changeset 15849 for issm/trunk-jpl/src/c/modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp

Timestamp:

08/20/13 14:50:44 (12 years ago)

Author:

seroussi

Message:

CHG: moved some modules back to src/modules and simplified some prototypes

File:

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

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

@@ -7 +7 @@
 #include "../../toolkits/toolkits.h"
 
-void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,Vector<IssmDouble>* vector, int name, int type){
+void InputUpdateFromVectorDakotax(FemModel* femmodel,Vector<IssmDouble>* vector, int name, int type){
 
-        double* serial_vector=NULL;
-
-        serial_vector=vector->ToMPISerial();
-
-        InputUpdateFromVectorDakotax( elements,nodes, vertices, loads, materials, parameters,serial_vector,name, type);
+        IssmDouble* serial_vector=vector->ToMPISerial();
+        InputUpdateFromVectorDakotax(femmodel,serial_vector,name, type);
 
         /*Free ressources:*/
@@ -19 +16 @@
 }
 
-void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,double* vector, int name, int type){
+void InputUpdateFromVectorDakotax(FemModel* femmodel,IssmDouble* vector, int name, int type){
 
         int i;
 
         /*Update elements, nodes, loads and materials from inputs: */
-        for(i=0;i<elements->Size();i++){
-                Element* element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
+        for(i=0;i<femmodel->elements->Size();i++){
+                Element* element=dynamic_cast<Element*>(femmodel->elements->GetObjectByOffset(i));
                 element->InputUpdateFromVectorDakota(vector,name,type);
         }
-        for(i=0;i<nodes->Size();i++){
-                Node* node=(Node*)nodes->GetObjectByOffset(i);
+        for(i=0;i<femmodel->nodes->Size();i++){
+                Node* node=(Node*)femmodel->nodes->GetObjectByOffset(i);
                 node->InputUpdateFromVectorDakota(vector,name,type);
         }
-        for(i=0;i<loads->Size();i++){
-                Load* load=(Load*)loads->GetObjectByOffset(i);
+        for(i=0;i<femmodel->loads->Size();i++){
+                Load* load=(Load*)femmodel->loads->GetObjectByOffset(i);
                 load->InputUpdateFromVectorDakota(vector,name,type);
         }
-        for(i=0;i<materials->Size();i++){
-                Material* material=(Material*)materials->GetObjectByOffset(i);
+        for(i=0;i<femmodel->materials->Size();i++){
+                Material* material=(Material*)femmodel->materials->GetObjectByOffset(i);
                 material->InputUpdateFromVectorDakota(vector,name,type);
         }
 }
 
-void InputUpdateFromVectorDakotax( Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int* vector, int name, int type){
+void InputUpdateFromVectorDakotax(FemModel* femmodel,int* vector, int name, int type){
 
         int i;
 
         /*Update elements, nodes, loads and materials from inputs: */
-        for(i=0;i<elements->Size();i++){
-                Element* element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
+        for(i=0;i<femmodel->elements->Size();i++){
+                Element* element=dynamic_cast<Element*>(femmodel->elements->GetObjectByOffset(i));
                 element->InputUpdateFromVectorDakota(vector,name,type);
         }
-        for(i=0;i<nodes->Size();i++){
-                Node* node=(Node*)nodes->GetObjectByOffset(i);
+        for(i=0;i<femmodel->nodes->Size();i++){
+                Node* node=(Node*)femmodel->nodes->GetObjectByOffset(i);
                 node->InputUpdateFromVectorDakota(vector,name,type);
         }
-        for(i=0;i<loads->Size();i++){
-                Load* load=(Load*)loads->GetObjectByOffset(i);
+        for(i=0;i<femmodel->loads->Size();i++){
+                Load* load=(Load*)femmodel->loads->GetObjectByOffset(i);
                 load->InputUpdateFromVectorDakota(vector,name,type);
         }
-        for(i=0;i<materials->Size();i++){
-                Material* material=(Material*)materials->GetObjectByOffset(i);
+        for(i=0;i<femmodel->materials->Size();i++){
+                Material* material=(Material*)femmodel->materials->GetObjectByOffset(i);
                 material->InputUpdateFromVectorDakota(vector,name,type);
         }
@@ -70 +67 @@
 
         /*Update elements, nodes, loads and materials from inputs: */
-        for(i=0;i<elements->Size();i++){
-                Element* element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
+        for(i=0;i<femmodel->elements->Size();i++){
+                Element* element=dynamic_cast<Element*>(femmodel->elements->GetObjectByOffset(i));
                 element->InputUpdateFromVectorDakota(vector,name,type);
         }
-        for(i=0;i<nodes->Size();i++){
-                Node* node=(Node*)nodes->GetObjectByOffset(i);
+        for(i=0;i<femmodel->nodes->Size();i++){
+                Node* node=(Node*)femmodel->nodes->GetObjectByOffset(i);
                 node->InputUpdateFromVectorDakota(vector,name,type);
         }
-        for(i=0;i<loads->Size();i++){
-                Load* load=(Load*)loads->GetObjectByOffset(i);
+        for(i=0;i<femmodel->loads->Size();i++){
+                Load* load=(Load*)femmodel->loads->GetObjectByOffset(i);
                 load->InputUpdateFromVectorDakota(vector,name,type);
         }
-        for(i=0;i<materials->Size();i++){
-                Material* material=(Material*)materials->GetObjectByOffset(i);
+        for(i=0;i<femmodel->materials->Size();i++){
+                Material* material=(Material*)femmodel->materials->GetObjectByOffset(i);
                 material->InputUpdateFromVectorDakota(vector,name,type);
         }