Changeset 16754

Timestamp:

11/14/13 08:52:42 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: extending new InputUpdateFromSolution to FS 2d

Location:

issm/trunk-jpl/src/c

Files:

• analyses/DamageEvolutionAnalysis.cpp (modified) (1 diff)
• analyses/ExtrudeFromBaseAnalysis.cpp (modified) (1 diff)
• analyses/L2ProjectionBaseAnalysis.cpp (modified) (1 diff)
• classes/Elements/Penta.cpp (modified) (2 diffs)
• classes/Elements/Tria.cpp (modified) (2 diffs)
• classes/Elements/Tria.h (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp

@@ -99 +99 @@
 }/*}}}*/
 void DamageEvolutionAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/
-        _error_("not implemented yet");
+
+        IssmDouble  max_damage;
+        int                     *doflist = NULL;
+
+        /*Fetch number of nodes and dof for this finite element*/
+        int numnodes = element->GetNumberOfNodes();
+
+        /*Fetch dof list and allocate solution vector*/
+        element->GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
+        IssmDouble* values    = xNew<IssmDouble>(numnodes);
+
+        /*Get user-supplied max_damage: */
+        element->FindParam(&max_damage,DamageMaxDamageEnum);
+
+        /*Use the dof list to index into the solution vector: */
+        for(int i=0;i<numnodes;i++){
+                values[i]=solution[doflist[i]];
+                /*Check solution*/
+                if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in solution vector");
+                /*Enforce D < max_damage and D > 0 */
+                if(values[i]>max_damage) values[i]=max_damage;
+                else if(values[i]<0.)    values[i]=0.;
+        }
+
+        /*Get all inputs and parameters*/
+        element->AddMaterialInput(DamageDbarEnum,values,P1Enum);
+
+        /*Free ressources:*/
+        xDelete<IssmDouble>(values);
+        xDelete<int>(doflist);
 }/*}}}*/

issm/trunk-jpl/src/c/analyses/ExtrudeFromBaseAnalysis.cpp

@@ -41 +41 @@
 }/*}}}*/
 void ExtrudeFromBaseAnalysis::InputUpdateFromSolution(IssmDouble* solution,Element* element){/*{{{*/
-        _error_("not implemented yet");
+
+        int inputenum;
+        element->FindParam(&inputenum,InputToExtrudeEnum);
+        element->InputUpdateFromSolutionOneDof(solution,inputenum);
 }/*}}}*/

issm/trunk-jpl/src/c/analyses/L2ProjectionBaseAnalysis.cpp

@@ -68 +68 @@
                         element->InputUpdateFromSolutionOneDof(solution,inputenum);
                         break;
+                case Mesh2DverticalEnum:
+                        element->InputUpdateFromSolutionOneDof(solution,inputenum);
+                        break;
                 case Mesh3DEnum:
                         element->InputUpdateFromSolutionOneDofCollapsed(solution,inputenum);

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -2547 +2547 @@
 void  Penta::InputUpdateFromSolutionOneDof(IssmDouble* solution,int enum_type){
 
-        const int numdof = NDOF1*NUMVERTICES;
-
-        IssmDouble values[numdof];
-        int*   doflist=NULL;
-
-        /*Get dof list: */
+        /*Intermediary*/
+        int* doflist = NULL;
+
+        /*Fetch number of nodes for this finite element*/
+        int numnodes = this->NumberofNodes();
+
+        /*Fetch dof list and allocate solution vector*/
         GetDofList(&doflist,NoneApproximationEnum,GsetEnum);
+        IssmDouble* values    = xNew<IssmDouble>(numnodes);
 
         /*Use the dof list to index into the solution vector: */
-        for(int i=0;i<numdof;i++){
+        for(int i=0;i<numnodes;i++){
                 values[i]=solution[doflist[i]];
                 if(xIsNan<IssmDouble>(values[i])) _error_("NaN found in solution vector");
@@ -2565 +2567 @@
 
         /*Free ressources:*/
+        xDelete<IssmDouble>(values);
         xDelete<int>(doflist);
 }

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

@@ -1367 +1367 @@
 int Tria::GetNumberOfNodes(void){
         return this->NumberofNodes();
+}
+/*}}}*/
+/*FUNCTION Tria::GetNumberOfNodesPressure;{{{*/
+int Tria::GetNumberOfNodesPressure(void){
+        return this->NumberofNodesPressure();
+}
+/*}}}*/
+/*FUNCTION Tria::GetNumberOfNodesVelocity;{{{*/
+int Tria::GetNumberOfNodesVelocity(void){
+        return this->NumberofNodesVelocity();
 }
 /*}}}*/
@@ -6781 +6791 @@
 }
 /*}}}*/
-
 /*FUNCTION Tria::CreatEPLDomainMassMatrix {{{*/
 ElementMatrix* Tria::CreateEPLDomainMassMatrix(void){

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

@@ -90 +90 @@
                 void        GetNodesLidList(int* lidlist);
                 int         GetNumberOfNodes(void);
-                int         GetNumberOfNodesPressure(void){_error_("not implemented yet");};
-                int         GetNumberOfNodesVelocity(void){_error_("not implemented yet");};
+                int         GetNumberOfNodesPressure(void);
+                int         GetNumberOfNodesVelocity(void);
                 int         GetNumberOfVertices(void);
                 int         Sid();