Changeset 5916

Timestamp:

09/21/10 08:23:32 (14 years ago)

Author:

Mathieu Morlighem

Message:

split CreatePVectorPrognostic

Location:

issm/trunk/src/c/objects/Elements

Files:

• Tria.cpp (modified) (3 diffs)
• Tria.h (modified) (2 diffs)

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

@@ -763 +763 @@
                         break;
                 case PrognosticAnalysisEnum:
-                        if (GetElementType()==P1Enum)
-                         CreatePVectorPrognostic_CG( pg);
-                        else if (GetElementType()==P1DGEnum)
-                         CreatePVectorPrognostic_DG( pg);
-                        else
-                         ISSMERROR("Element type %s not supported yet",EnumToString(GetElementType()));
+                        CreatePVectorPrognostic(pg);
                         break;
                 case BalancedthicknessAnalysisEnum:
-                        if (GetElementType()==P1Enum)
-                         CreatePVectorBalancedthickness_CG( pg);
-                        else if (GetElementType()==P1DGEnum)
-                         CreatePVectorBalancedthickness_DG( pg);
-                        else
-                         ISSMERROR("Element type %s not supported yet",EnumToString(GetElementType()));
-                        break;
+                        CreatePVectorBalancedthickness(pg);
                 case AdjointBalancedthicknessAnalysisEnum:
                         CreatePVectorAdjointBalancedthickness(pg);
@@ -3452 +3441 @@
 }
 /*}}}*/
+/*FUNCTION Tria::CreatePVectorBalancedthickness{{{1*/
+void  Tria::CreatePVectorBalancedthickness(Vec pg){
+
+        switch(GetElementType()){
+                case P1Enum:
+                        CreatePVectorBalancedthickness_CG( pg);
+                        break;
+                case P1DGEnum:
+                        CreatePVectorBalancedthickness_DG( pg);
+                        break;
+                default:
+                        ISSMERROR("Element type %s not supported yet",EnumToString(GetElementType()));
+        }
+}
+/*}}}*/
 /*FUNCTION Tria::CreatePVectorBalancedthickness_CG{{{1*/
 void  Tria::CreatePVectorBalancedthickness_CG(Vec pg ){
@@ -4293 +4297 @@
 }
 /*}}}*/
+/*FUNCTION Tria::CreatePVectorPrognostic{{{1*/
+void  Tria::CreatePVectorPrognostic(Vec pg){
+
+        switch(GetElementType()){
+                case P1Enum:
+                        CreatePVectorPrognostic_CG( pg);
+                        break;
+                case P1DGEnum:
+                        CreatePVectorPrognostic_DG( pg);
+                        break;
+                default:
+                        ISSMERROR("Element type %s not supported yet",EnumToString(GetElementType()));
+        }
+}
+/*}}}*/
 /*FUNCTION Tria::CreatePVectorPrognostic_CG {{{1*/
 void  Tria::CreatePVectorPrognostic_CG(Vec pg){

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

@@ -138 +138 @@
                 ElementMatrix* CreateKMatrixSlope(void);
                 ElementMatrix* CreateKMatrixThermal(void);
+                void      CreatePVectorBalancedthickness(Vec pg);
                 void      CreatePVectorBalancedthickness_DG(Vec pg);
                 void      CreatePVectorBalancedthickness_CG(Vec pg);
@@ -147 +148 @@
                 void      CreatePVectorAdjointBalancedthickness(Vec pg);
                 void      CreatePVectorDiagnosticHutter(Vec pg);
+                void      CreatePVectorPrognostic(Vec pg);
                 void      CreatePVectorPrognostic_CG(Vec pg);
                 void      CreatePVectorPrognostic_DG(Vec pg);