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

Timestamp:

05/24/16 22:43:30 (9 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added BAFL (Budd Anisotropic Flow Law) flow law

File:

• issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (modified) (2 diffs)

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

@@ -2245 +2245 @@
         _assert_(this->IsOnBase());
 
-        this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum);
-        if(this->material->IsDamage())this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum);
+        switch(this->material->ObjectEnum()){
+                case MaticeEnum:
+                        this->InputDepthAverageAtBase(MaterialsRheologyBEnum,MaterialsRheologyBbarEnum);
+                        if(this->material->IsDamage())this->InputDepthAverageAtBase(DamageDEnum,DamageDbarEnum);
+                        break;
+                case MatbaflEnum:
+                        break;
+                default:
+                        _error_("not supported yet");
+        }
         if(this->inputs->GetInput(VxEnum)) this->InputDepthAverageAtBase(VxEnum,VxAverageEnum);
         if(this->inputs->GetInput(VyEnum)) this->InputDepthAverageAtBase(VyEnum,VyAverageEnum);
@@ -2252 +2260 @@
         if(this->inputs->GetInput(CalvingrateyEnum)) this->InputDepthAverageAtBase(CalvingrateyEnum,CalvingrateyAverageEnum);
         Tria* tria=(Tria*)SpawnTria(0,1,2);
-        this->inputs->DeleteInput(MaterialsRheologyBbarEnum);
-        this->inputs->DeleteInput(DamageDbarEnum);
+        switch(this->material->ObjectEnum()){
+                case MaticeEnum:
+                        this->inputs->DeleteInput(MaterialsRheologyBbarEnum);
+                        this->inputs->DeleteInput(DamageDbarEnum);
+                        break;
+                case MatbaflEnum:
+                        break;
+                default:
+                        _error_("not supported yet");
+        }
         this->inputs->DeleteInput(VxAverageEnum);
         this->inputs->DeleteInput(VyAverageEnum);