Changeset 11310 for issm/trunk-jpl/src/c/modules

Timestamp:

02/02/12 13:59:41 (13 years ago)

Author:

Mathieu Morlighem

Message:

Simplifying gradient call in CM

Location:

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

Files:

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

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

@@ -10 +10 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-void Gradjx( Vec* pgradient, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int control_type){
+void Gradjx( Vec* pgradient,double* pnorm_grad, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials, Parameters* parameters,int control_index){
 
-        int  i;
-        int  dim;
-        int  numberofvertices;
-        Vec  gradient = NULL;
+        int    i;
+        int    numberofvertices;
+        double norm_grad;
+        int   *control_type   = NULL;
+        Vec    gradient = NULL;
         
         /*retrieve some parameters: */
-        parameters->FindParam(&dim,MeshDimensionEnum);
+        parameters->FindParam(&control_type,NULL,InversionControlParametersEnum);
         numberofvertices=vertices->NumberOfVertices();
 
@@ -27 +28 @@
         for (i=0;i<elements->Size();i++){
                 Element* element=(Element*)elements->GetObjectByOffset(i);
-                element->Gradj(gradient,control_type);
+                element->Gradj(gradient,control_type[control_index]);
         }
 
@@ -34 +35 @@
         VecAssemblyEnd(gradient);
 
-        /*Assign output pointers: */
+        /*Clean up and return*/
+        xfree((void**)&control_type);
+        if(pnorm_grad){
+                VecNorm(gradient,NORM_INFINITY,&norm_grad);
+                *pnorm_grad=norm_grad;
+        }
         *pgradient=gradient;
 }

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

@@ -10 +10 @@
 
 /* local prototypes: */
-void Gradjx(Vec* pgrad_g, Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,  Parameters* parameters, int control_type);
+void Gradjx(Vec* pgrad_g,double* pgrad_norm,Elements* elements,Nodes* nodes, Vertices* vertices, Loads* loads, Materials* materials,  Parameters* parameters, int control_type);
 
 #endif  /* _GRADJX_H */