Changeset 18033

Timestamp:

05/20/14 15:34:22 (11 years ago)

Author:

cborstad

Message:

CHG: working on P2 implementation for DamageEvolution

File:

• issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp (modified) (6 diffs)

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

@@ -23 +23 @@
         parameters->AddObject(iomodel->CopyConstantObject(DamageMaxiterEnum));
         parameters->AddObject(iomodel->CopyConstantObject(DamageMaxDamageEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(DamageElementinterpEnum));
 
         /*Requested outputs*/
@@ -47 +48 @@
 void DamageEvolutionAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
 
-        int finiteelement = P1Enum;
+        int finiteelement;
+
+        iomodel->Constant(&finiteelement,DamageElementinterpEnum);
 
         /*Update elements: */
@@ -75 +78 @@
 void DamageEvolutionAnalysis::CreateNodes(Nodes* nodes,IoModel* iomodel){/*{{{*/
 
-        int finiteelement = P1Enum;
+        int finiteelement;
+
+        iomodel->Constant(&finiteelement,DamageElementinterpEnum);
 
         if(iomodel->domaintype!=Domain2DhorizontalEnum) iomodel->FetchData(1,MeshVertexonbaseEnum);
@@ -84 +89 @@
 
         int stabilization;
-        int finiteelement = P1Enum;
+        int finiteelement;
         iomodel->Constant(&stabilization,DamageStabilizationEnum);
+        iomodel->Constant(&finiteelement,DamageElementinterpEnum);
 
         IoModelToConstraintsx(constraints,iomodel,DamageSpcdamageEnum,DamageEvolutionAnalysisEnum,finiteelement);
@@ -469 +475 @@
                 damage_input = element->GetInput(DamageDEnum);   _assert_(damage_input);
         }
-
-
 
         /*retrieve the desired type of equivalent stress*/
@@ -509 +513 @@
 
         /*Add input*/
-        element->AddInput(DamageFEnum,f,P1Enum);
+        element->AddInput(DamageFEnum,f,element->GetElementType());
         
         /*Clean up and return*/