Changeset 18870

Timestamp:

11/28/14 09:36:32 (10 years ago)

Author:

Eric.Larour

Message:

CHG: need this module to allow getting the vectors from control inputs on sid vertices, not pid vertices. Usefull for
updating the tape on ad control runs.

Location:

issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx

Files:

• GetVectorFromControlInputsx.cpp (modified) (4 diffs)
• GetVectorFromControlInputsx.h (modified) (1 diff)

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

@@ -7 +7 @@
 #include "../../toolkits/toolkits.h"
 
-void GetVectorFromControlInputsx(Vector<IssmDouble>** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,const char* data){
+void GetVectorFromControlInputsx(Vector<IssmDouble>** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,const char* data,bool onsid){
 
         int  num_controls;
@@ -23 +23 @@
                 for(int j=0;j<elements->Size();j++){
                         Element* element=(Element*)elements->GetObjectByOffset(j);
-                        element->GetVectorFromControlInputs(vector,control_type[i],i,data);
+                        element->GetVectorFromControlInputs(vector,control_type[i],i,data,onsid);
                 }
         }
@@ -34 +34 @@
 }
 
-void GetVectorFromControlInputsx( IssmDouble** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, const char* data){
+void GetVectorFromControlInputsx( IssmDouble** pvector, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, const char* data,bool onsid){
 
         /*output: */
@@ -42 +42 @@
         Vector<IssmDouble>* vec_vector=NULL;
 
-        GetVectorFromControlInputsx( &vec_vector, elements,nodes, vertices, loads, materials, parameters,data);
+        GetVectorFromControlInputsx( &vec_vector, elements,nodes, vertices, loads, materials, parameters,data,onsid);
         vector=vec_vector->ToMPISerial();
 

issm/trunk-jpl/src/c/modules/GetVectorFromControlInputsx/GetVectorFromControlInputsx.h

@@ -8 +8 @@
 
 /* local prototypes: */
-void    GetVectorFromControlInputsx( Vector<IssmDouble>** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,const char* data="value");
-void    GetVectorFromControlInputsx( IssmDouble** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,const char* data="value");
+void    GetVectorFromControlInputsx( Vector<IssmDouble>** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,const char* data="value",bool onsid=false);
+void    GetVectorFromControlInputsx( IssmDouble** pvector, Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads, Materials* materials,  Parameters* parameters,const char* data="value",bool onsid=false);
 
 #endif  /* _GETVECTORFROMCONTROLINPUTSXX_H */