Changeset 9012

Timestamp:

07/16/11 01:32:36 (14 years ago)

Author:

Eric.Larour

Message:

Fixed bugs in RheologyBbarx.

Location:

issm/trunk/src/c

Files:

• modules/RheologyBbarx/RheologyBbarx.cpp (modified) (3 diffs)
• objects/Elements/Element.h (modified) (1 diff)
• objects/Elements/Penta.cpp (modified) (1 diff)
• objects/Elements/Penta.h (modified) (1 diff)
• objects/Elements/Tria.cpp (modified) (1 diff)
• objects/Elements/Tria.h (modified) (1 diff)

issm/trunk/src/c/modules/RheologyBbarx/RheologyBbarx.cpp

@@ -21 +21 @@
         int index;
         double rheology_bbar;
-
+        Element* element=NULL;
 
         /*retrieve element we are interested in: */
@@ -28 +28 @@
         /*now, go through our elements, and retrieve the one with this id: index: */
         for(i=0;i<elements->Size();i++){
-                Element* element=(Element*)elements->GetObjectByOffset(i);
+                element=(Element*)elements->GetObjectByOffset(i);
                 if (element->Id()==index){
                         found=1;
@@ -40 +40 @@
         if(!sumfound)_error_("%s%i%s","could not find material with id",index," to compute RheologyBbar");
 
-
-        _error_("element->RheologyBbarx not implemented yet!");
-
         /*Ok, we found the material, compute Bbar: */
         if(my_rank==cpu_found){
-                //rheology_bbar=element->RheologyBbarx();
+                rheology_bbar=element->RheologyBbarx();
         }
 
         /*Broadcast and plug into response: */
+        MPI_Allreduce ( &cpu_found,&cpu_found,1,MPI_INT,MPI_MAX,MPI_COMM_WORLD);
         MPI_Bcast(&rheology_bbar,1,MPI_DOUBLE,cpu_found,MPI_COMM_WORLD); 
+
         *prheology_bbar=rheology_bbar;
 }

issm/trunk/src/c/objects/Elements/Element.h

@@ -94 +94 @@
                 virtual void   UpdateShelfFlags(double* new_shelf_nodes)=0;
                 virtual int    UpdatePotentialSheetUngrounding(double* potential_sheet_ungrounding,Vec vec_nodes_on_iceshelf,double* nodes_on_iceshelf)=0;
+                virtual double RheologyBbarx(void)=0;
 
                 /*Implementation: */

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

@@ -7032 +7032 @@
         /*Affect value to the reduced matrix */
         for(i=0;i<24;i++) *(Pe_reduced+i)=Pi[i]-Pright[i];
+}
+/*}}}*/
+/*FUNCTION Penta::RheologyBbarx{{{1*/
+double Penta::RheologyBbarx(void){
+
+        double Bbar;
+        Penta* base=NULL;
+        
+        /*We here compute the vertically averaged Bbar. To do so, we go to the 
+         * base element under this one, and call this->InputDepthAverageAtBase:*/
+                
+        base=this;
+
+        if(!base->IsOnBed()){
+
+                for(;;){
+                        base=base->verticalneighbors[0];
+                        if(base->IsOnBed())break;
+                }
+        }
+
+        /*We have found the base under this. Call InputDepthAverageAtBase on it: */
+        base->InputDepthAverageAtBase(RheologyBEnum,RheologyBbarEnum,MaterialsEnum);
+
+        /*Ok, base->matice now has the Bbar. Ask Bbar from this enum: */
+        Bbar=base->matice->GetBbar();
+
+        return Bbar;
 }
 /*}}}*/

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

@@ -142 +142 @@
                 double TimeAdapt();
                 int*   GetHorizontalNeighboorSids(void);
+                double RheologyBbarx(void);
                 /*}}}*/
                 /*Penta specific routines:{{{1*/

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

@@ -4628 +4628 @@
 }
 /*}}}*/
+/*FUNCTION Tria::RheologyBbarx{{{1*/
+double Tria::RheologyBbarx(void){
+
+        return this->matice->GetBbar();
+
+}
+/*}}}*/
 /*FUNCTION Tria::RheologyBbarAbsGradient{{{1*/
 double Tria::RheologyBbarAbsGradient(bool process_units,int weight_index){

issm/trunk/src/c/objects/Elements/Tria.h

@@ -146 +146 @@
                 double TimeAdapt();
                 int*   GetHorizontalNeighboorSids(void);
+                double RheologyBbarx(void);
                 /*}}}*/
                 /*Tria specific routines:{{{1*/