Changeset 4995 for issm/trunk/src/c/objects/Elements/Penta.cpp

Timestamp:

08/05/10 08:19:48 (15 years ago)

Author:

Mathieu Morlighem

Message:

CM B2d now working for Pattyn

File:

• issm/trunk/src/c/objects/Elements/Penta.cpp (modified) (5 diffs)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -712 +712 @@
         else{
 
-                /*Depth Average B*/
-                this->InputDepthAverageAtBase(RheologyBEnum,RheologyB2dEnum,MaterialsEnum);
+                /*Depth Average B and put it in inputs*/
+                Penta* penta=GetBasalElement();
+                penta->InputDepthAverageAtBase(RheologyBEnum,RheologyB2dEnum,MaterialsEnum);
+                Input* B_input=penta->matice->inputs->GetInput(RheologyB2dEnum);
+                Input* B_copy=(Input*)B_input->copy();
+                this->matice->inputs->AddInput((Input*)B_copy);
 
                 tria=(Tria*)SpawnTria(3,4,5); //grids 3, 4 and 5 make the new tria (upper face).
@@ -721 +725 @@
                 /*delete B average*/
                 this->matice->inputs->DeleteInput(RheologyB2dEnum);
+                penta->matice->inputs->DeleteInput(RheologyB2dEnum);
 
                 return J;
@@ -4661 +4666 @@
 }
 /*}}}*/
+/*FUNCTION Penta::GetBasalElement{{{1*/
+Penta* Penta::GetBasalElement(void){
+
+        /*Output*/
+        Penta* penta=NULL;
+
+        /*Go through all elements till the bed is reached*/
+        penta=this;
+        for(;;){
+
+                /*Stop if we have reached the surface, else, take lower penta*/
+                if (penta->IsOnBed()) break;
+
+                /* get lower Penta*/
+                penta=penta->GetLowerElement();
+                ISSMASSERT(penta->Id()!=this->id);
+        }
+
+        /*return output*/
+        return penta;
+}
+/*}}}*/
+/*FUNCTION Penta::GetLowerElement{{{1*/
+Penta* Penta::GetLowerElement(void){
+
+        Penta* upper_penta=NULL;
+        upper_penta=(Penta*)neighbors[0]; //first one (0) under, second one (1) above
+        return upper_penta;
+
+}
+/*}}}*/
 /*FUNCTION Penta::GetUpperElement{{{1*/
 Penta* Penta::GetUpperElement(void){
@@ -4708 +4744 @@
         }
         else{
+                /*Gradient is computed on bed only (B2d)*/
+                if (!onbed) return;
+
                 /*Depth Average B*/
                 this->InputDepthAverageAtBase(RheologyBEnum,RheologyB2dEnum,MaterialsEnum);
@@ -5471 +5510 @@
 }
 /*}}}*/
+/*FUNCTION Penta::IsOnBed{{{1*/
+bool Penta::IsOnBed(void){
+
+        bool onbed;
+        inputs->GetParameterValue(&onbed,ElementOnBedEnum);
+        return onbed;
+
+}
+/*}}}*/
 /*FUNCTION Penta::ReduceMatrixStokes {{{1*/
 void Penta::ReduceMatrixStokes(double* Ke_reduced, double* Ke_temp){