Changeset 352

Timestamp:

05/12/09 11:07:01 (16 years ago)

Author:

seroussi

Message:

KMatrixBaseVert not needed

Location:

issm/trunk/src/c/objects

Files:

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

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

@@ -2054 +2054 @@
 
 #undef __FUNCT__ 
-#define __FUNCT__ "Tria::CreateKMatrixDiagnosticBaseVert"
-void  Tria::CreateKMatrixDiagnosticBaseVert(Mat Kgg,void* vinputs,int analysis_type){
-
-        int i,j;
-
-        /* node data: */
-        const int    numgrids=3;
-        const int    NDOF1=1;
-        const int    numdofs=NDOF1*numgrids;
-        double       xyz_list[numgrids][3];
-        int          doflist[numdofs];
-        int          numberofdofspernode;
-        
-        /* gaussian points: */
-        int     num_gauss,ig;
-        double* first_gauss_area_coord  =  NULL;
-        double* second_gauss_area_coord =  NULL;
-        double* third_gauss_area_coord  =  NULL;
-        double* gauss_weights           =  NULL;
-        double  gauss_weight;
-        double  gauss_l1l2l3[3];
-
-
-        /* matrices: */
-        double L[1][3];
-        double DL_scalar;
-
-        double Ke_gg[3][3]; //stiffness matrix 
-        double Ke_gg_gaussian[3][3]; //stiffness matrix evaluated at the gaussian point.
-        double Jdet;
-
-        ParameterInputs* inputs=NULL;
-
-        /*recover pointers: */
-        inputs=(ParameterInputs*)vinputs;
-
-        /* Get node coordinates and dof list: */
-        GetElementNodeData( &xyz_list[0][0], nodes, numgrids);
-        GetDofList(&doflist[0],&numberofdofspernode);
-
-        /* Set Ke_gg to 0: */
-        for(i=0;i<numdofs;i++) for(j=0;j<numdofs;j++) Ke_gg[i][j]=0.0;
-
-        /* Get gaussian points and weights (make this a statically initialized list of points? fstd): */
-        GaussTria( &num_gauss, &first_gauss_area_coord, &second_gauss_area_coord, &third_gauss_area_coord, &gauss_weights, 2);
-
-        /* Start  looping on the number of gaussian points: */
-        for (ig=0; ig<num_gauss; ig++){
-                /*Pick up the gaussian point: */
-                gauss_weight=*(gauss_weights+ig);
-                gauss_l1l2l3[0]=*(first_gauss_area_coord+ig); 
-                gauss_l1l2l3[1]=*(second_gauss_area_coord+ig);
-                gauss_l1l2l3[2]=*(third_gauss_area_coord+ig);
-
-                /* Get Jacobian determinant: */
-                GetJacobianDeterminant(&Jdet, &xyz_list[0][0],gauss_l1l2l3);
-        
-                //Get L matrix if viscous basal drag present:
-                GetL(&L[0][0], &xyz_list[0][0], gauss_l1l2l3,NDOF1);
-
-                DL_scalar=gauss_weight*Jdet;
-                
-                /*  Do the triple producte tL*D*L: */
-                TripleMultiply( &L[0][0],1,3,1,
-                                        &DL_scalar,1,1,0,
-                                        &L[0][0],1,3,0,
-                                        &Ke_gg_gaussian[0][0],0);
-
-                
-                /* Add the Ke_gg_gaussian, and optionally Ke_gg_drag_gaussian onto Ke_gg: */
-                for( i=0; i<numdofs; i++) for(j=0;j<numdofs;j++) Ke_gg[i][j]+=Ke_gg_gaussian[i][j];
-        } //for (ig=0; ig<num_gauss; ig++
-
-        /*Add Ke_gg to global matrix Kgg: */
-        MatSetValues(Kgg,numdofs,doflist,numdofs,doflist,(const double*)Ke_gg,ADD_VALUES);
-                
-        cleanup_and_return: 
-        xfree((void**)&first_gauss_area_coord);
-        xfree((void**)&second_gauss_area_coord);
-        xfree((void**)&third_gauss_area_coord);
-        xfree((void**)&gauss_weights);
-}
-
-#undef __FUNCT__ 
 #define __FUNCT__ "Tria::CreateKMatrixDiagnosticSurfaceVert"
 void  Tria::CreateKMatrixDiagnosticSurfaceVert(Mat Kgg,void* vinputs,int analysis_type){

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

@@ -72 +72 @@
                 void  CreateKMatrixDiagnosticHoriz(Mat Kgg,void* inputs,int analysis_type);
                 void  CreateKMatrixDiagnosticHorizFriction(Mat Kgg,void* inputs,int analysis_type);
-                void  CreateKMatrixDiagnosticBaseVert(Mat Kgg,void* inputs,int analysis_type);
                 void  CreateKMatrixDiagnosticSurfaceVert(Mat Kgg,void* inputs,int analysis_type);
                 void  GetParameterValue(double* pp, double* plist, double* gauss_l1l2l3);