Changeset 358 for issm/trunk/src/c/objects/Penta.cpp

Timestamp:

05/12/09 14:01:34 (16 years ago)

Author:

Eric.Larour

Message:

New slope extrude module. New slope computation in Penta and Tria

File:

• issm/trunk/src/c/objects/Penta.cpp (modified) (5 diffs)

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

@@ -292 +292 @@
 
         }
+        else if (
+                        (analysis_type==SurfaceSlopeComputeXAnalysisEnum()) || 
+                        (analysis_type==SurfaceSlopeComputeYAnalysisEnum()) || 
+                        (analysis_type==BedSlopeComputeXAnalysisEnum()) || 
+                        (analysis_type==BedSlopeComputeYAnalysisEnum()) 
+                        ){
+                
+                CreateKMatrixSlopeCompute( Kgg,inputs,analysis_type);
+        }
         else{
                 throw ErrorException(__FUNCT__,exprintf("%s%i%s\n","analysis: ",analysis_type," not supported yet"));
@@ -703 +712 @@
                 CreatePVectorDiagnosticVert( pg,inputs,analysis_type);
         }
+        else if (
+                        (analysis_type==SurfaceSlopeComputeXAnalysisEnum()) || 
+                        (analysis_type==SurfaceSlopeComputeYAnalysisEnum()) || 
+                        (analysis_type==BedSlopeComputeXAnalysisEnum()) || 
+                        (analysis_type==BedSlopeComputeYAnalysisEnum()) 
+                        ){
+                
+                CreatePVectorSlopeCompute( pg,inputs,analysis_type);
+        }
         else{
                 throw ErrorException(__FUNCT__,exprintf("%s%i%s\n","analysis: ",analysis_type," not supported yet"));
@@ -1575 +1593 @@
 
 #undef __FUNCT__ 
+#define __FUNCT__ "Penta::SlopeExtrude"
+void  Penta::SlopeExtrude(Vec sg,double* sg_serial){
+
+        /* node data: */
+        const int    numgrids=6;
+        const int    NDOF1=1;
+        const int    numdofs=NDOF1*numgrids;
+        int          doflist[numdofs];
+        int          nodedof;
+        int          numberofdofspernode;
+        
+        Node* node=NULL;
+        int   i;
+        double slope;
+                
+
+        if(onbed==1){
+                        
+                GetDofList(&doflist[0],&numberofdofspernode);
+
+                if(numberofdofspernode!=1)throw ErrorException(__FUNCT__," slope can only be extruded on 1 dof per node");
+
+                /*For each node on the base of this penta,  we grab the slope. Once we know the slope, we follow the upper nodes, 
+                 * inserting the same slope value into sg, until we reach the surface: */
+                
+                for(i=0;i<3;i++){
+        
+                        node=nodes[i]; //base nodes
+        
+                        /*get velocity for this base node: */
+                        slope=sg_serial[doflist[i]];
+
+                        //go throsgn all nodes which sit on top of this node, until we reach the surface, 
+                        //and plsg  slope in sg
+                        for(;;){
+
+                                node->GetDofList(&nodedof,&numberofdofspernode);
+                                VecSetValues(sg,1,&nodedof,&slope,INSERT_VALUES);
+
+                                if (node->IsOnSurface())break;
+                                /*get next node: */
+                                node=node->GetUpperNode();
+                        }
+                }
+
+        }
+
+}
+
+
+#undef __FUNCT__ 
 #define __FUNCT__ "Penta:GetB_vert"
 void Penta::GetB_vert(double* B, double* xyz_list, double* gauss_l1l2l3l4){
@@ -1770 +1839 @@
         double pressure[numgrids];
         double rho_ice,g;
-        double xyz_list[numgrids][3];
+        double       xyz_list[numgrids][3];
                 
         /*Get node data: */
@@ -1792 +1861 @@
 
 }
+
+
+#undef __FUNCT__ 
+#define __FUNCT__ "Penta::CreateKMatrixSlopeCompute"
+
+void  Penta::CreateKMatrixSlopeCompute(Mat Kgg,void* inputs,int analysis_type){
+
+        /*Collapsed formulation: */
+        Tria*  tria=NULL;
+        
+        /*Is this element on the bed? :*/
+        if(!onbed)return;
+
+        /*Spawn Tria element from the base of the Penta: */
+        tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria.
+        tria->CreateKMatrix(Kgg,inputs, analysis_type);
+        delete tria;
+        return;
+
+}
+
+#undef __FUNCT__ 
+#define __FUNCT__ "Penta::CreatePVectorSlopeCompute"
+
+void Penta::CreatePVectorSlopeCompute( Vec pg, void* inputs, int analysis_type){
+        
+        /*Collapsed formulation: */
+        Tria*  tria=NULL;
+        
+        /*Is this element on the bed? :*/
+        if(!onbed)return;
+
+        /*Spawn Tria element from the base of the Penta: */
+        tria=(Tria*)SpawnTria(0,1,2); //grids 0, 1 and 2 make the new tria.
+        tria->CreatePVector(pg,inputs, analysis_type);
+        delete tria;
+        return;
+}
+