Changeset 5669

Timestamp:

09/03/10 10:47:10 (15 years ago)

Author:

Mathieu Morlighem

Message:

Some more cleaning

Location:

issm/trunk/src/c/objects/Elements

Files:

• Tria.cpp (modified) (2 diffs)
• Tria.h (modified) (1 diff)

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

@@ -1108 +1108 @@
 void  Tria::GradjDhDt(Vec gradient){
 
-        int i;
-
-        /* node data: */
-        int          doflist1[NUMVERTICES];
-
-        /*Gauss*/
-        double  gauss[NUMVERTICES][NUMVERTICES]={{1,0,0},{0,1,0},{0,0,1}};
-
-        /* grid data: */
-        double lambda;
-
-        /*element vector at the gaussian points: */
-        double  gradient_g[NUMVERTICES];
-
-        /*Inputs*/
-        Input* adjoint_input=NULL;
+        /*Intermediaries*/
+        int    doflist1[NUMVERTICES];
+        double lambda[NUMVERTICES];
+        double gradient_g[NUMVERTICES];
 
         /*Retrieve dof list*/
         GetDofList1(&doflist1[0]);
 
-        /*Retrieve all inputs we will be needing: */
-        adjoint_input=(Input*)inputs->GetInput(AdjointEnum);
-
-        /* Start  looping on the vertices: */
-        for(i=0; i<NUMVERTICES;i++){
-                adjoint_input->GetParameterValue(&lambda,&gauss[i][0]);
-                gradient_g[i]=-lambda;
-        }
+        /*Compute Gradient*/
+        GetParameterListOnVertices(&lambda[0],AdjointEnum);
+        for(int i=0;i<NUMVERTICES;i++) gradient_g[i]=-lambda[i];
 
         /*Add grade_g to global vector gradient: */
@@ -5793 +5776 @@
 }
 /*}}}*/
-/*FUNCTION Tria::GetStrainRate2d(double* epsilon,double* xyz_list, double* gauss, Input* vx_input, Input* vy_input){{{1*/
-void Tria::GetStrainRate2d(double* epsilon,double* xyz_list, double* gauss, Input* vx_input, Input* vy_input){
-        /*Compute the 2d Strain Rate (3 components):
-         *
-         * epsilon=[exx eyy exy]
-         */
-
-        int i;
-
-        double epsilonvx[3];
-        double epsilonvy[3];
-
-        /*Check that both inputs have been found*/
-        if (!vx_input || !vy_input){
-                ISSMERROR("Input missing. Here are the input pointers we have for vx: %p, vy: %p\n",vx_input,vy_input);
-        }
-
-        /*Get strain rate assuming that epsilon has been allocated*/
-        vx_input->GetVxStrainRate2d(epsilonvx,xyz_list,gauss);
-        vy_input->GetVyStrainRate2d(epsilonvy,xyz_list,gauss);
-
-        /*Sum all contributions*/
-        for(i=0;i<3;i++) epsilon[i]=epsilonvx[i]+epsilonvy[i];
-
-}
-/*}}}*/
 /*FUNCTION Tria::GetStrainRate2d(double* epsilon,double* xyz_list, GaussTria* gauss, Input* vx_input, Input* vy_input){{{1*/
 void Tria::GetStrainRate2d(double* epsilon,double* xyz_list, GaussTria* gauss, Input* vx_input, Input* vy_input){

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

@@ -158 +158 @@
                 void      GetSolutionFromInputsDiagnosticHoriz(Vec solution);
                 void      GetSolutionFromInputsDiagnosticHutter(Vec solution);
-                void    GetStrainRate2d(double* epsilon,double* xyz_list, double* gauss, Input* vx_input, Input* vy_input);
                 void    GetStrainRate2d(double* epsilon,double* xyz_list, GaussTria* gauss, Input* vx_input, Input* vy_input);
                 void      GradjDragStokes(Vec gradient);