Changeset 8649

Timestamp:

06/16/11 14:44:35 (14 years ago)

Author:

Mathieu Morlighem

Message:

deleted RegularizeInversion

Location:

issm/trunk/src/c

Files:

• modules/CostFunctionx/CostFunctionx.cpp (modified) (2 diffs)
• objects/Elements/Penta.cpp (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (2 diffs)
• objects/Elements/Tria.h (modified) (1 diff)

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

@@ -22 +22 @@
         /*output: */
         double J,Jplus;
-
         
         /*Recover parameters*/
@@ -35 +34 @@
         }
 
-        /*REST TO BE DELETED*/
-
-        /*Add Regularization terms: */
-        double Jreg=0;
-        double Jreg_sum;
-        for (i=0;i<elements->Size();i++){
-                element=(Element*)elements->GetObjectByOffset(i);
-                Jreg+=element->RegularizeInversion();
-        }
-
-        /*Sum all J from all cpus of the cluster:*/
-        MPI_Reduce (&Jreg,&Jreg_sum,1,MPI_DOUBLE,MPI_SUM,0,MPI_COMM_WORLD );
-        MPI_Bcast(&Jreg_sum,1,MPI_DOUBLE,0,MPI_COMM_WORLD); 
-        J=J+Jreg_sum;
-
         /*Assign output pointers: */
         xfree((void**)&responses);

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -3991 +3991 @@
                         if (!IsOnBed()) return;
                         tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria.
-                        tira->GradjBGradient(gradient,resp);
+                        tria->GradjBGradient(gradient,resp);
                         delete tria->matice; delete tria;
                         break;

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -2951 +2951 @@
 
         /*Retrieve all inputs we will be needing: */
-        if(IsOnShelf())return;
         GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
         GetDofList1(&doflist1[0]);
@@ -2971 +2970 @@
 
                 /*Build gradje_g_gaussian vector (actually -dJ/ddrag): */
-                for (i=0;i<NUMVERTICES;i++){ grade_g[i]+=-weight*Jdet*gauss->weight*(dh1dh3[0][i]*dk[0]+dh1dh3[1][i]*dk[1]);
+                for (i=0;i<NUMVERTICES;i++) grade_g[i]+=-weight*Jdet*gauss->weight*(dh1dh3[0][i]*dk[0]+dh1dh3[1][i]*dk[1]);
         }
         VecSetValues(gradient,NUMVERTICES,doflist1,(const double*)grade_g,ADD_VALUES);

issm/trunk/src/c/objects/Elements/Tria.h

@@ -89 +89 @@
                 void   GetVectorFromInputs(Vec vector,int NameEnum);
                 void   Gradj(Vec gradient,int control_type);
+                void   GradjBGradient(Vec gradient,int weight_index);
                 void   GradjBMacAyeal(Vec gradient);
                 void   GradjDragMacAyeal(Vec gradient);