Changeset 4652

Timestamp:

07/19/10 11:28:44 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added GetSolutionFromInputHutter in Penta

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

@@ -928 +928 @@
         if (analysis_type==DiagnosticHorizAnalysisEnum){
                 GetSolutionFromInputsDiagnosticHoriz(solution);
+        }
+        else if(analysis_type==DiagnosticHutterAnalysisEnum){
+                GetSolutionFromInputsDiagnosticHutter(solution);
         }
         else if(analysis_type==DiagnosticVertAnalysisEnum){
@@ -2673 +2676 @@
 /*FUNCTION Penta::GetSolutionFromInputsDiagnosticHoriz{{{1*/
 void  Penta::GetSolutionFromInputsDiagnosticHoriz(Vec solution){
+
+        int i;
+
+        const int    numvertices=6;
+        const int    numdofpervertex=2;
+        const int    numdof=numdofpervertex*numvertices;
+        double       gauss[numvertices][4]={{1,0,0,-1},{0,1,0,-1},{0,0,1,-1},{1,0,0,1},{0,1,0,1},{0,0,1,1}};
+
+        int          doflist[numdof];
+        double       values[numdof];
+        double       vx;
+        double       vy;
+
+        int          dummy;
+
+        /*Get dof list: */
+        GetDofList(&doflist[0],&dummy);
+
+        /*Ok, we have vx and vy in values, fill in vx and vy arrays: */
+        /*P1 element only for now*/
+        for(i=0;i<numvertices;i++){
+
+                /*Recover vx and vy*/
+                inputs->GetParameterValue(&vx,&gauss[i][0],VxEnum);
+                inputs->GetParameterValue(&vy,&gauss[i][0],VyEnum);
+                values[i*numdofpervertex+0]=vx;
+                values[i*numdofpervertex+1]=vy;
+        }
+
+        /*Add value to global vector*/
+        VecSetValues(solution,numdof,doflist,(const double*)values,INSERT_VALUES);
+
+}
+/*}}}*/
+/*FUNCTION Penta::GetSolutionFromInputsDiagnosticHutter{{{1*/
+void  Penta::GetSolutionFromInputsDiagnosticHutter(Vec solution){
 
         int i;

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

@@ -163 +163 @@
                 void      GetPhi(double* phi, double*  epsilon, double viscosity);
                 void      GetSolutionFromInputsDiagnosticHoriz(Vec solutiong);
+                void      GetSolutionFromInputsDiagnosticHutter(Vec solutiong);
                 void      GetSolutionFromInputsDiagnosticStokes(Vec solutiong);
                 void      GetSolutionFromInputsDiagnosticVert(Vec solutiong);