Changeset 8387

Timestamp:

05/21/11 12:13:15 (14 years ago)

Author:

Mathieu Morlighem

Message:

trunk: more flexible GetVectorFromInput (input could be in material)

File:

• issm/trunk/src/c/modules/GetVectorFromInputsx/GetVectorFromInputsx.cpp (modified) (1 diff)

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

@@ -17 +17 @@
         if(type==VertexEnum){
 
+                /*Allocate vector*/
                 vector=NewVec(vertices->NumberOfVertices());
+
+                /*Look up in elements*/
                 for(i=0;i<elements->Size();i++){
                         Element* element=(Element*)elements->GetObjectByOffset(i);
                         element->GetVectorFromInputs(vector,name);
                 }
+
+                /*Look up in materials*/
+                for(i=0;i<materials->Size();i++){
+                        Material* material=(Material*)materials->GetObjectByOffset(i);
+                        material->GetVectorFromInputs(vector,name);
+                }
         }
-        else _error_("%s%s%s"," vector type: ",EnumToStringx(type)," not supported yet!");
+        else{
+                _error_("%s%s%s"," vector type: ",EnumToStringx(type)," not supported yet!");
+        }
 
         VecAssemblyBegin(vector);