Changeset 3613

Timestamp:

04/23/10 13:08:53 (15 years ago)

Author:

Mathieu Morlighem

Message:

readded Balanced... for 3d meshes

Location:

issm/trunk/src/c/objects

Files:

• Penta.cpp (modified) (4 diffs)
• Penta.h (modified) (1 diff)

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

@@ -529 +529 @@
                 CreateKMatrixPrognostic( Kgg,inputs,analysis_type,sub_analysis_type);
         }
+        else if (analysis_type==BalancedthicknessAnalysisEnum){
+
+                CreateKMatrixBalancedthickness( Kgg,inputs,analysis_type,sub_analysis_type);
+        }
+        else if (analysis_type==BalancedvelocitiesAnalysisEnum){
+
+                CreateKMatrixBalancedvelocities( Kgg,inputs,analysis_type,sub_analysis_type);
+        }
         else if (analysis_type==ThermalAnalysisEnum){
 
@@ -540 +548 @@
                 ISSMERROR("%s%i%s\n","analysis: ",analysis_type," not supported yet");
         }
+
+}
+/*}}}*/
+/*FUNCTION CreateKMatrixBalancedthickness {{{1*/
+
+void  Penta::CreateKMatrixBalancedthickness(Mat Kgg,void* inputs,int analysis_type,int sub_analysis_type){
+
+        /*Collapsed formulation: */
+        Tria*  tria=NULL;
+
+        /*If on water, skip: */
+        if(this->properties.onwater)return;
+
+        /*Is this element on the bed? :*/
+        if(!this->properties.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,sub_analysis_type);
+        delete tria;
+        return;
+
+}
+/*}}}*/
+/*FUNCTION CreateKMatrixBalancedvelocities {{{1*/
+
+void  Penta::CreateKMatrixBalancedvelocities(Mat Kgg,void* inputs,int analysis_type,int sub_analysis_type){
+
+        /*Collapsed formulation: */
+        Tria*  tria=NULL;
+
+        /*If on water, skip: */
+        if(this->properties.onwater)return;
+
+        /*Is this element on the bed? :*/
+        if(!this->properties.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,sub_analysis_type);
+        delete tria;
+        return;
 
 }
@@ -1567 +1617 @@
                 CreatePVectorPrognostic( pg,inputs,analysis_type,sub_analysis_type);
         }
+        else if (analysis_type==BalancedthicknessAnalysisEnum){
+
+                CreatePVectorPrognostic( pg,inputs,analysis_type,sub_analysis_type);
+        }
+        else if (analysis_type==BalancedvelocitiesAnalysisEnum){
+
+                CreatePVectorPrognostic( pg,inputs,analysis_type,sub_analysis_type);
+        }
         else if (analysis_type==ThermalAnalysisEnum){
 
@@ -1579 +1637 @@
         }       
 
+}
+/*}}}*/
+/*FUNCTION CreatePVectorBalancedthickness {{{1*/
+
+void Penta::CreatePVectorBalancedthickness( Vec pg, void* inputs, int analysis_type,int sub_analysis_type){
+
+        /*Collapsed formulation: */
+        Tria*  tria=NULL;
+
+        /*If on water, skip: */
+        if(this->properties.onwater)return;
+
+        /*Is this element on the bed? :*/
+        if(!this->properties.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,sub_analysis_type);
+        delete tria;
+        return;
+}
+/*}}}*/
+/*FUNCTION CreatePVectorBalancedvelocities {{{1*/
+
+void Penta::CreatePVectorBalancedvelocities( Vec pg, void* inputs, int analysis_type,int sub_analysis_type){
+
+        /*Collapsed formulation: */
+        Tria*  tria=NULL;
+
+        /*If on water, skip: */
+        if(this->properties.onwater)return;
+
+        /*Is this element on the bed? :*/
+        if(!this->properties.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,sub_analysis_type);
+        delete tria;
+        return;
 }
 /*}}}*/

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

@@ -107 +107 @@
                 void  CreateKMatrixPrognostic(Mat Kgg,int analysis_type,int sub_analysis_type);
                 void  CreatePVectorPrognostic( Vec pg,  int analysis_type,int sub_analysis_type);
+                void  CreateKMatrixBalancedthickness(Mat Kgg,void* vinputs,int analysis_type,int sub_analysis_type);
+                void  CreatePVectorBalancedthickness( Vec pg, void* vinputs, int analysis_type,int sub_analysis_type);
+                void  CreateKMatrixBalancedvelocities(Mat Kgg,void* vinputs,int analysis_type,int sub_analysis_type);
+                void  CreatePVectorBalancedvelocities( Vec pg, void* vinputs, int analysis_type,int sub_analysis_type);
 
                 void  CreateKMatrixDiagnosticStokes( Mat Kgg,  int analysis_type,int sub_analysis_type);