Changeset 5547

Timestamp:

08/24/10 14:33:26 (15 years ago)

Author:

seroussi

Message:

start to change icefront

Location:

issm/trunk/src/c

Files:

• modules/ModelProcessorx/DistributeNumDofs.cpp (modified) (1 diff)
• objects/Elements/Penta.cpp (modified) (2 diffs)
• objects/Loads/Icefront.cpp (modified) (2 diffs)
• objects/Loads/Icefront.h (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/DistributeNumDofs.cpp

@@ -26 +26 @@
                 else if (vertices_type[0]==HutterApproximationEnum){
                         numdofs=2;
+                }
+                else if (vertices_type[0]==StokesApproximationEnum){
+                        numdofs=4;
                 }
                 else if (vertices_type[0]==MacAyealPattynApproximationEnum){

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

@@ -774 +774 @@
                         CreateKMatrixDiagnosticPattyn( Kgg);
                 }
+                else if(approximation==StokesApproximationEnum){
+                        CreateKMatrixDiagnosticStokes( Kgg);
+                }
                 else if(approximation==HutterApproximationEnum){
                         return;
@@ -854 +857 @@
                 else if(approximation==HutterApproximationEnum){
                         return;
+                }
+                else if(approximation==StokesApproximationEnum){
+                        CreatePVectorDiagnosticStokes( pg);
                 }
                 else if(approximation==MacAyealPattynApproximationEnum){

issm/trunk/src/c/objects/Loads/Icefront.cpp

@@ -385 +385 @@
         /*Branck on the type of icefront: */
         if (type==SegmentIcefrontEnum){
-                CreatePVectorDiagnosticHorizSegment(pg);
+                CreatePVectorDiagnosticMacAyeal(pg);
         }
         else if (type==QuadIceFrontEnum){
-                CreatePVectorDiagnosticHorizQuad(pg);
+                CreatePVectorDiagnosticPattyn(pg);
         }
         else ISSMERROR("type %i not supported",type);
 }       
 /*}}}*/
-/*FUNCTION Icefront::CreatePVectorDiagnosticHorizSegment{{{1*/
-void Icefront::CreatePVectorDiagnosticHorizSegment( Vec pg){
+/*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal{{{1*/
+void Icefront::CreatePVectorDiagnosticMacAyeal( Vec pg){
 
         int       i;
@@ -520 +520 @@
 }
 /*}}}*/
-/*FUNCTION Icefront::CreatePVectorDiagnosticHorizQuad {{{1*/
-void Icefront::CreatePVectorDiagnosticHorizQuad( Vec pg){
+/*FUNCTION Icefront::CreatePVectorDiagnosticPattyn{{{1*/
+void Icefront::CreatePVectorDiagnosticPattyn( Vec pg){
 
         int i,j;

issm/trunk/src/c/objects/Loads/Icefront.h

@@ -72 +72 @@
                 /*Load management: {{{1*/
                 void  CreatePVectorDiagnosticHoriz( Vec pg);
-                void  CreatePVectorDiagnosticHorizSegment( Vec pg);
-                void  CreatePVectorDiagnosticHorizQuad( Vec pg);
+                void  CreatePVectorDiagnosticMacAyeal( Vec pg);
+                void  CreatePVectorDiagnosticPattyn( Vec pg);
                 void  CreatePVectorDiagnosticStokes( Vec pg);
                 void  GetDofList(int** pdoflist,int approximation_enum=0);