Changeset 5876 for issm/trunk

Timestamp:

09/17/10 17:03:09 (15 years ago)

Author:

Mathieu Morlighem

Message:

Cleaner CreateKMatrixDiagnosticHoriz

Location:

issm/trunk/src/c/objects/Elements

Files:

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

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

@@ -699 +699 @@
         switch(analysis_type){
                 case DiagnosticHorizAnalysisEnum: case AdjointHorizAnalysisEnum:
-                        CreateKMatrixDiagnosticHoriz(Kgg);
+                        Ke=CreateKMatrixDiagnosticHoriz();
+                        if(Ke) Ke->AddToGlobal(Kgg,NULL,NULL);
+                        delete Ke;
                         break;
                 case DiagnosticHutterAnalysisEnum:
@@ -2166 +2168 @@
 /*}}}*/
 /*FUNCTION Penta::CreateKMatrixDiagnosticHoriz {{{1*/
-void  Penta::CreateKMatrixDiagnosticHoriz(Mat Kgg){
+ElementMatrix* Penta::CreateKMatrixDiagnosticHoriz(void){
 
         int approximation;
-        ElementMatrix* Ke=NULL;
-
         inputs->GetParameterValue(&approximation,ApproximationEnum);
 
         switch(approximation){
                 case MacAyealApproximationEnum:
-                        Ke=CreateKMatrixDiagnosticMacAyeal2d();
-                        if(Ke) Ke->AddToGlobal(Kgg,NULL,NULL);
-                        delete Ke;
-                        break;
+                        return CreateKMatrixDiagnosticMacAyeal2d();
                 case PattynApproximationEnum:
-                        Ke=CreateKMatrixDiagnosticPattyn();
-                        if(Ke) Ke->AddToGlobal(Kgg,NULL,NULL);
-                        delete Ke;
-                        break;
+                        return CreateKMatrixDiagnosticPattyn();
                 case StokesApproximationEnum:
-                        Ke=CreateKMatrixDiagnosticStokes();
-                        if(Ke) Ke->AddToGlobal(Kgg,NULL,NULL);
-                        delete Ke;
-                        break;
+                        return CreateKMatrixDiagnosticStokes();
                 case HutterApproximationEnum:
-                        break;
+                        return NULL;
                 case NoneApproximationEnum:
-                        break;
+                        return NULL;
                 case MacAyealPattynApproximationEnum:
-                        Ke=CreateKMatrixDiagnosticMacAyealPattyn();
-                        if(Ke) Ke->AddToGlobal(Kgg,NULL,NULL);
-                        delete Ke;
-                        break;
+                        return CreateKMatrixDiagnosticMacAyealPattyn();
                 case PattynStokesApproximationEnum:
-                        Ke=CreateKMatrixDiagnosticPattynStokes();
-                        if(Ke) Ke->AddToGlobal(Kgg,NULL,NULL);
-                        delete Ke;
-                        break;
+                        return CreateKMatrixDiagnosticPattynStokes();
                 default:
                         ISSMERROR("Approximation %s not supported yet",EnumToString(approximation));

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

@@ -127 +127 @@
                 ElementMatrix* CreateKMatrixCouplingMacAyealPattynFriction(void);
                 ElementMatrix* CreateKMatrixCouplingPattynStokes(void);
-                void      CreateKMatrixDiagnosticHoriz( Mat Kgg);
+                ElementMatrix* CreateKMatrixDiagnosticHoriz(void);
                 ElementMatrix* CreateKMatrixDiagnosticHutter(void);
                 ElementMatrix* CreateKMatrixDiagnosticMacAyeal2d(void);