Changeset 14987

Timestamp:

05/09/13 11:05:17 (12 years ago)

Author:

adhikari

Message:

CHG: removed InputUpdateFromSolutionGia and modified InputUpdateFromVector

Location:

issm/trunk-jpl/src/c/classes/objects/Elements

Files:

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

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp

@@ -1762 +1762 @@
                         break;
                 #endif
-                #ifdef _HAVE_GIA_
-                case GiaAnalysisEnum:
-                        InputUpdateFromSolutionGia(solution);
-                        break;
-                #endif
                 case BedSlopeXAnalysisEnum:
                         InputUpdateFromSolutionOneDof(solution,BedSlopeXEnum);
@@ -1889 +1884 @@
 
         switch(type){
-        #ifdef _HAVE_GIA_
-        case GiaAnalysisEnum:
-                InputUpdateFromVectorGia(vector);
-                break;
-        #endif
-        case VertexEnum: 
+        case VertexPIdEnum: 
                 /*Get values on the 3 vertices*/
                 for (int i=0;i<3;i++){
                         values[i]=vector[this->nodes[i]->GetVertexPid()];
+                }
+                /*update input*/
+                if (name==MaterialsRheologyBbarEnum || name==MaterialsRheologyBEnum || name==MaterialsRheologyZEnum || name==MaterialsRheologyZbarEnum){
+                        material->inputs->AddInput(new TriaP1Input(name,values));
+                }
+                else{
+                        this->inputs->AddInput(new TriaP1Input(name,values));
+                }
+                return; 
+
+        case VertexSIdEnum: 
+                /*Get values on the 3 vertices*/
+                for (int i=0;i<3;i++){
+                        values[i]=vector[this->nodes[i]->GetVertexSid()];
                 }
                 /*update input*/
@@ -2072 +2076 @@
                                 name==GradientEnum ||
                                 name==OldGradientEnum ||
-        name==ConvergedEnum ||
+                 name==ConvergedEnum ||
                                 name==BasisIntegralEnum ||
                                 name==QmuVxEnum ||
@@ -3221 +3225 @@
 
         return;
-}
-/*}}}*/
-/*FUNCTION Tria::InputUpdateFromSolutionGia{{{*/
-void  Tria::InputUpdateFromSolutionGia(IssmDouble* solution){
-
-        int vertexsidlist[NUMVERTICES];
-        IssmDouble    values[NUMVERTICES];
-
-        /*Get sid list: */
-        this->GetVertexSidList(&vertexsidlist[0]);
-
-        /*Use the dof list to index into the solution vector: */
-        for(int i=0;i<NUMVERTICES;i++){
-                values[i]=solution[vertexsidlist[i]];
-                if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in solution vector");
-        }
-
-        /*Add input to the element: */
-        this->inputs->AddInput(new TriaP1Input(GiaWEnum,values));
-
-}
-/*}}}*/
-/*FUNCTION Tria::InputUpdateFromVectorGia{{{*/
-void  Tria::InputUpdateFromVectorGia(IssmDouble* vector){
-
-        int vertexsidlist[NUMVERTICES];
-        IssmDouble    values[NUMVERTICES];
-
-        /*Get sid list: */
-        this->GetVertexSidList(&vertexsidlist[0]);
-
-        /*Use the dof list to index into the solution vector: */
-        for(int i=0;i<NUMVERTICES;i++){
-                values[i]=vector[vertexsidlist[i]];
-                if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in solution vector");
-        }
-
-        /*Add input to the element: */
-        this->inputs->AddInput(new TriaP1Input(GiadWdtEnum,values));
-
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.h

@@ -142 +142 @@
                 #ifdef _HAVE_GIA_
                 void   GiaDeflection(Vector<IssmDouble>* wg,Vector<IssmDouble>* dwgdt,IssmDouble* x,IssmDouble* y);
-                void   InputUpdateFromSolutionGia(IssmDouble* solution); 
-                void   InputUpdateFromVectorGia(IssmDouble* vector); 
                 #endif