Changeset 12278

Timestamp:

05/23/12 16:11:23 (13 years ago)

Author:

cborstad

Message:

fixed InputToResult function to account for damage enum

File:

• issm/branches/trunk-jpl-damage/src/c/objects/Elements/Penta.cpp (modified) (4 diffs)

issm/branches/trunk-jpl-damage/src/c/objects/Elements/Penta.cpp

@@ -1478 +1478 @@
 
         /*Go through all the input objects, and find the one corresponding to enum_type, if it exists: */
-        if (enum_type==MaterialsRheologyBbarEnum || enum_type==MaterialsRheologyZbarEnum) input=this->matice->inputs->GetInput(enum_type);
+        if (enum_type==MaterialsRheologyBbarEnum) input=this->matice->inputs->GetInput(MaterialsRheologyBEnum);
+        else if (enum_type==MaterialsRheologyZbarEnum) input=this->matice->inputs->GetInput(MaterialsRheologyZEnum);
         else input=this->inputs->GetInput(enum_type);
         //if (!input) _error_("Input %s not found in penta->inputs",EnumToStringx(enum_type)); why error out? if the requested input does not exist, we should still 
@@ -5096 +5097 @@
         this->matice->inputs->DeleteInput(MaterialsRheologyBbarEnum);
 
+        /*delete Average Z*/
+        this->matice->inputs->DeleteInput(MaterialsRheologyZbarEnum);
+
 } /*}}}*/
 /*FUNCTION Penta::GradjBbarPattyn {{{1*/
@@ -5116 +5120 @@
         /*delete Average B*/
         this->matice->inputs->DeleteInput(MaterialsRheologyBbarEnum);
+
+        /*delete Average Z*/
+        this->matice->inputs->DeleteInput(MaterialsRheologyZbarEnum);
 } /*}}}*/
 /*FUNCTION Penta::GradjBbarStokes {{{1*/
@@ -5136 +5143 @@
         /*delete Average B*/
         this->matice->inputs->DeleteInput(MaterialsRheologyBbarEnum);
+
+        /*delete Average Z*/
+        this->matice->inputs->DeleteInput(MaterialsRheologyZbarEnum);
 } /*}}}*/
 /*FUNCTION Penta::InputControlUpdate{{{1*/