Changeset 13092

Timestamp:

08/20/12 10:51:05 (13 years ago)

Author:

Mathieu Morlighem

Message:

CHG: renaming CreateKMatrixSlope CreateMassMatrix, since this is a standrard L2 projection

Location:

issm/trunk-jpl/src/c/classes/objects/Elements

Files:

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

issm/trunk-jpl/src/c/classes/objects/Elements/Penta.cpp

@@ -442 +442 @@
                 #endif
                 case BedSlopeXAnalysisEnum: case SurfaceSlopeXAnalysisEnum: case BedSlopeYAnalysisEnum: case SurfaceSlopeYAnalysisEnum:
-                        Ke=CreateKMatrixSlope();
+                        Ke=CreateBasalMassMatrix();
                         break;
                 case PrognosticAnalysisEnum:
@@ -500 +500 @@
 }
 /*}}}*/
-/*FUNCTION Penta::CreateKMatrixSlope {{{*/
-ElementMatrix* Penta::CreateKMatrixSlope(void){
+/*FUNCTION Penta::CreateBasalMassMatrix{{{*/
+ElementMatrix* Penta::CreateBasalMassMatrix(void){
 
         if (!IsOnBed()) return NULL;
 
         Tria* tria=(Tria*)SpawnTria(0,1,2); //nodes 0, 1 and 2 make the new tria.
-        ElementMatrix* Ke=tria->CreateKMatrixSlope();
+        ElementMatrix* Ke=tria->CreateMassMatrix();
         delete tria->matice; delete tria;
 

issm/trunk-jpl/src/c/classes/objects/Elements/Penta.h

@@ -169 +169 @@
                 /*Penta specific routines:{{{*/
                 void      BedNormal(IssmDouble* bed_normal, IssmDouble xyz_list[3][3]);
+                ElementMatrix* CreateBasalMassMatrix(void);
                 ElementMatrix* CreateKMatrixPrognostic(void);
-                ElementMatrix* CreateKMatrixSlope(void);
                 ElementVector* CreatePVectorPrognostic(void);
                 ElementVector* CreatePVectorSlope(void);

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp

@@ -193 +193 @@
                  #endif
                 case BedSlopeXAnalysisEnum: case SurfaceSlopeXAnalysisEnum: case BedSlopeYAnalysisEnum: case SurfaceSlopeYAnalysisEnum:
-                        Ke=CreateKMatrixSlope();
+                        Ke=CreateMassMatrix();
                         break;
                 case PrognosticAnalysisEnum:
@@ -477 +477 @@
 }
 /*}}}*/
-/*FUNCTION Tria::CreateKMatrixSlope {{{*/
-ElementMatrix* Tria::CreateKMatrixSlope(void){
+/*FUNCTION Tria::CreateMassMatrix {{{*/
+ElementMatrix* Tria::CreateMassMatrix(void){
 
         /*constants: */
@@ -484 +484 @@
 
         /* Intermediaries */
-        int        i,j,ig;
-        IssmDouble     DL_scalar,Jdet;
-        IssmDouble     xyz_list[NUMVERTICES][3];
-        IssmDouble     L[1][3];
-        GaussTria *gauss = NULL;
+        IssmDouble  D,Jdet;
+        IssmDouble  xyz_list[NUMVERTICES][3];
+        IssmDouble  L[1][3];
+        GaussTria  *gauss = NULL;
 
         /*Initialize Element matrix*/
         ElementMatrix* Ke=new ElementMatrix(nodes,NUMVERTICES,this->parameters,NoneApproximationEnum);
-
         GetVerticesCoordinates(&xyz_list[0][0],nodes,NUMVERTICES);
 
         /* Start looping on the number of gaussian points: */
         gauss=new GaussTria(2);
-        for (ig=gauss->begin();ig<gauss->end();ig++){
+        for(int ig=gauss->begin();ig<gauss->end();ig++){
 
                 gauss->GaussPoint(ig);
                 
                 GetJacobianDeterminant2d(&Jdet, &xyz_list[0][0],gauss);
-                DL_scalar=gauss->weight*Jdet;
+                D=gauss->weight*Jdet;
 
                 GetL(&L[0][0], &xyz_list[0][0], gauss,NDOF1);
 
                 TripleMultiply(&L[0][0],1,3,1,
-                                        &DL_scalar,1,1,0,
+                                        &D,1,1,0,
                                         &L[0][0],1,3,0,
                                         &Ke->values[0],1);

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.h

@@ -177 +177 @@
                 ElementMatrix* CreateKMatrixPrognostic_CG(void);
                 ElementMatrix* CreateKMatrixPrognostic_DG(void);
-                ElementMatrix* CreateKMatrixSlope(void);
+                ElementMatrix* CreateMassMatrix(void);
                 ElementVector* CreatePVectorBalancethickness(void);
                 ElementVector* CreatePVectorBalancethickness_DG(void);