Changeset 22952

Timestamp:

07/16/18 15:36:05 (7 years ago)

Author:

Eric.Larour

Message:

CHG: allow spefication of time.

Location:

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

Files:

• GetVectorFromInputsx.cpp (modified) (3 diffs)
• GetVectorFromInputsx.h (modified) (1 diff)

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

@@ -7 +7 @@
 #include "../../toolkits/toolkits.h"
 
-void GetVectorFromInputsx(Vector<IssmDouble>** pvector,FemModel* femmodel,int name,int type){/*{{{*/
+void GetVectorFromInputsx(Vector<IssmDouble>** pvector,FemModel* femmodel,int name,int type){ /*{{{*/
 
         int i;
@@ -35 +35 @@
         /*Assign output pointers:*/
         *pvector=vector;
+} /*}}}*/
+void GetVectorFromInputsx(Vector<IssmDouble>** pvector,FemModel* femmodel,int name,int type,IssmDouble time){/*{{{*/
+
+        int i;
+        Vector<IssmDouble>* vector=NULL;
+
+        switch(type){
+        case VertexPIdEnum: case VertexSIdEnum:
+                vector=new Vector<IssmDouble>(femmodel->vertices->NumberOfVertices());
+                break;
+        case NodesEnum:case NodeSIdEnum:
+                vector=new Vector<IssmDouble>(femmodel->nodes->NumberOfNodes());
+                break;
+        default:
+                        _error_("vector type: " << EnumToStringx(type) << " not supported yet!");
+        }
+        /*Look up in elements*/
+        for(i=0;i<femmodel->elements->Size();i++){
+                Element* element=xDynamicCast<Element*>(femmodel->elements->GetObjectByOffset(i));
+                element->GetVectorFromInputs(vector,name,type,time);
+        }
+
+        vector->Assemble();
+
+        /*Assign output pointers:*/
+        *pvector=vector;
 }/*}}}*/
 void GetVectorFromInputsx(IssmDouble** pvector,FemModel* femmodel,int name, int type){/*{{{*/
@@ -53 +79 @@
         *pvector=vector;
 }/*}}}*/
-void GetVectorFromInputsx(IssmDouble** pvector,int* pvector_size, FemModel* femmodel,int name){/*{{{*/
+void GetVectorFromInputsx(IssmDouble** pvector,int* pvector_size, FemModel* femmodel,int name){ /*{{{*/
 
         int interpolation_type;

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

@@ -11 +11 @@
 void    GetVectorFromInputsx( IssmDouble** pvector,FemModel* femmodel,int name,int type);
 void  GetVectorFromInputsx(IssmDouble** pvector,int* pvector_size, FemModel* femmodel,int name);
+void GetVectorFromInputsx(Vector<IssmDouble>** pvector,FemModel* femmodel,int name,int type,IssmDouble time);
 
 #endif  /* _GETVECTORFROMINPUTSXX_H */