Changeset 11527 for issm/trunk/src/c/modules/ControlInputGetGradientx/ControlInputGetGradientx.cpp

Timestamp:

02/24/12 08:12:47 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 11526

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/modules/ControlInputGetGradientx/ControlInputGetGradientx.cpp (modified) (2 diffs)

issm/trunk/src/c

@@ -3 +3 @@
 .ignore.txt
 *.o
+*.obj
 *.exe
 appscan.*

@@ -3 +3 @@
 .ignore.txt
 *.o
+*.obj
 *.exe
 appscan.*

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

@@ -9 +9 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void ControlInputGetGradientx( Vec* pgradient, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters, int name){
+void ControlInputGetGradientx( Vec* pgradient, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters){
 
-        Vec gradient=NULL;
-        gradient=NewVec(vertices->NumberOfVertices());
+        /*Intermediaries*/
+        int  num_controls;
+        int *control_type = NULL;
+        Vec  gradient=NULL;
 
-        for(int i=0;i<elements->Size();i++){
-                Element* element=(Element*)elements->GetObjectByOffset(i);
-                element->ControlInputGetGradient(gradient,name);
+        /*Retrieve some parameters*/
+        parameters->FindParam(&num_controls,InversionNumControlParametersEnum);
+        parameters->FindParam(&control_type,NULL,InversionControlParametersEnum);
+
+        /*Allocate and populate gradient*/
+        gradient=NewVec(num_controls*vertices->NumberOfVertices());
+
+        for(int i=0;i<num_controls;i++){
+                for(int j=0;j<elements->Size();j++){
+                        Element* element=(Element*)elements->GetObjectByOffset(j);
+                        element->ControlInputGetGradient(gradient,control_type[i],i);
+                }
         }
 
@@ -22 +33 @@
         VecAssemblyEnd(gradient);
 
-        /*Assign output pointers:*/
+        /*Clean up and return*/
+        xfree((void**)&control_type);
         *pgradient=gradient;
 }

@@ -3 +3 @@
 .ignore.txt
 *.o
+*.obj
 *.exe
 appscan.*