Changeset 17759

Timestamp:

04/17/14 16:07:55 (11 years ago)

Author:

cborstad

Message:

CHG: added IsDamage function to Material class to check for damage in elements

Location:

issm/trunk-jpl/src/c/classes

Files:

• Elements/Penta.cpp (modified) (4 diffs)
• Elements/Tria.cpp (modified) (1 diff)
• Materials/Material.h (modified) (1 diff)
• Materials/Matice.cpp (modified) (7 diffs)
• Materials/Matice.h (modified) (2 diffs)
• Materials/Matpar.h (modified) (1 diff)

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

@@ -2133 +2133 @@
 
         this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum);
-        this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum);
+        if(this->material->IsDamage())this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum);
         if(this->inputs->GetInput(VxEnum)) this->InputDepthAverageAtBase(VxEnum,VxAverageEnum);
         if(this->inputs->GetInput(VyEnum)) this->InputDepthAverageAtBase(VyEnum,VyAverageEnum);
@@ -3425 +3425 @@
         /*Depth Average B*/
         this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum);
-        this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum);
+        if(this->material->IsDamage())this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum);
 
         /*Collapse element to the base*/
@@ -3445 +3445 @@
         /*Depth Average B and D*/
         this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum);
-        this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum);
+        if(this->material->IsDamage())this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum);
 
         /*Collapse element to the base*/
@@ -3464 +3464 @@
         /*Depth Average B and D*/
         this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum);
-        this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum);
+        if(this->material->IsDamage())this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum);
 
         /*Collapse element to the base*/

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

@@ -3114 +3114 @@
         Input* adjointx_input=inputs->GetInput(AdjointxEnum);                       _assert_(adjointx_input);
         Input* adjointy_input=inputs->GetInput(AdjointyEnum);                       _assert_(adjointy_input);
-        Input* rheologyd_input=inputs->GetInput(DamageDbarEnum); _assert_(rheologyd_input);
+        if(this->material->IsDamage()){
+                Input* rheologyd_input=inputs->GetInput(DamageDbarEnum); _assert_(rheologyd_input);
+        }
 
         /* Start  looping on the number of gaussian points: */

issm/trunk-jpl/src/c/classes/Materials/Material.h

@@ -39 +39 @@
                 virtual IssmDouble GetD()=0;
                 virtual IssmDouble GetDbar()=0;
+                virtual bool       IsDamage()=0;
 
 };

issm/trunk-jpl/src/c/classes/Materials/Matice.cpp

@@ -31 +31 @@
         this->helement=NULL;
         this->element=NULL;
+        this->isdamaged=NULL;
         return;
 }
@@ -51 +52 @@
    int    materialtype;
    iomodel->Constant(&materialtype,MaterialsEnum);
-   if(materialtype==MatdamageiceEnum) this->isdamage = true;
-   else if(materialtype==MaticeEnum) this->isdamage = false;
+   if(materialtype==MatdamageiceEnum) this->isdamaged = true;
+   else if(materialtype==MaticeEnum) this->isdamaged = false;
    else _error_("Material type not recognized");
 
@@ -206 +207 @@
 IssmDouble Matice::GetD(){
 
-        _assert_(this->isdamage);
+        _assert_(this->isdamaged);
         /*Output*/
         IssmDouble D;
-        element->inputs->GetInputAverage(&D,DamageDEnum);
+        if(this->isdamaged)element->inputs->GetInputAverage(&D,DamageDEnum);
         return D;
 }
@@ -216 +217 @@
 IssmDouble Matice::GetDbar(){
 
-        _assert_(this->isdamage);
+        _assert_(this->isdamaged);
         /*Output*/
         IssmDouble Dbar;
-        element->inputs->GetInputAverage(&Dbar,DamageDbarEnum);
+        if(this->isdamaged)element->inputs->GetInputAverage(&Dbar,DamageDbarEnum);
         return Dbar;
+}
+/*}}}*/
+/*FUNCTION Matice::IsDamage() {{{*/
+bool Matice::IsDamage(){
+
+        return this->isdamaged;
 }
 /*}}}*/
@@ -246 +253 @@
         B=GetB(); _assert_(B>0.);
         n=GetN(); _assert_(n>0.);
-        if(this->isdamage){
+        if(this->isdamaged){
                 D=GetD();
                 _assert_(D>=0. && D<1.);
@@ -299 +306 @@
         B=GetBbar(); _assert_(B>0.);
         n=GetN();    _assert_(n>0.);
-        if(this->isdamage){
+        if(this->isdamaged){
                 D=GetDbar();
                 _assert_(D>=0. && D<1.);
@@ -351 +358 @@
 
         /*Get D and n*/
-        if(this->isdamage){
+        if(this->isdamaged){
                 D=GetDbar(); /* GetD()? */
                 _assert_(D>=0. && D<1.);

issm/trunk-jpl/src/c/classes/Materials/Matice.h

@@ -24 +24 @@
         private: 
                 int      mid;
-                bool     isdamage;
+                bool     isdamaged;
                 Hook    *helement;
                 Element *element;
@@ -68 +68 @@
                 IssmDouble GetDbar();
                 IssmDouble GetN();
+                bool       IsDamage();
                 /*}}}*/
 };

issm/trunk-jpl/src/c/classes/Materials/Matpar.h

@@ -96 +96 @@
                 IssmDouble GetD(){_error_("not supported");};
                 IssmDouble GetDbar(){_error_("not supported");};
+                bool       IsDamage(){_error_("not supported");};
                 /*}}}*/
                 /*Numerics: {{{*/