Changeset 983

Timestamp:

06/13/09 19:31:00 (16 years ago)

Author:

seroussi

Message:

Bbar was a bad idea

Location:

issm/trunk/src/c/objects

Files:

• Matice.cpp (modified) (10 diffs)
• Matice.h (modified) (4 diffs)
• Node.cpp (modified) (2 diffs)
• Penta.cpp (modified) (2 diffs)
• Tria.cpp (modified) (1 diff)

issm/trunk/src/c/objects/Matice.cpp

@@ -20 +20 @@
         return;
 }
-Matice::Matice(int matice_mid,double matice_B,double matice_Bbar,double matice_n){
+Matice::Matice(int matice_mid,double matice_B,double matice_n){
         mid=matice_mid;
         B=matice_B;
-        Bbar=matice_Bbar;
         n=matice_n;
         return;
@@ -36 +35 @@
         printf("   mid: %i\n",mid);
         printf("   B: %g\n",B);
-        printf("   Bbar: %g\n",Bbar);
         printf("   n: %g\n",n);
         return;
@@ -45 +43 @@
         printf("   mid: %i\n",mid);
         printf("   B: %g\n",B);
-        printf("   Bbar: %g\n",Bbar);
         printf("   n: %g\n",n);
         return;
@@ -66 +63 @@
         memcpy(marshalled_dataset,&mid,sizeof(mid));marshalled_dataset+=sizeof(mid);
         memcpy(marshalled_dataset,&B,sizeof(B));marshalled_dataset+=sizeof(B);
-        memcpy(marshalled_dataset,&Bbar,sizeof(Bbar));marshalled_dataset+=sizeof(Bbar);
         memcpy(marshalled_dataset,&n,sizeof(n));marshalled_dataset+=sizeof(n);
 
@@ -75 +71 @@
 int   Matice::MarshallSize(){
 
-        return sizeof(mid)+sizeof(B)+sizeof(Bbar)+sizeof(n)+sizeof(int); //sizeof(int) for enum type
+        return sizeof(mid)+sizeof(B)+sizeof(n)+sizeof(int); //sizeof(int) for enum type
 }
 
@@ -95 +91 @@
         memcpy(&mid,marshalled_dataset,sizeof(mid));marshalled_dataset+=sizeof(mid);
         memcpy(&B,marshalled_dataset,sizeof(B));marshalled_dataset+=sizeof(B);
-        memcpy(&Bbar,marshalled_dataset,sizeof(Bbar));marshalled_dataset+=sizeof(Bbar);
         memcpy(&n,marshalled_dataset,sizeof(n));marshalled_dataset+=sizeof(n);
 
@@ -129 +124 @@
 void  Matice::SetB(double B_param){
         B=B_param;
-}
-                
-
-#undef __FUNCT__ 
-#define __FUNCT__ "Matice::SetBbar"
-void  Matice::SetBbar(double Bbar_param){
-        Bbar=Bbar_param;
 }
                 
@@ -169 +157 @@
         if (n==1){
                 /*Viscous behaviour! viscosity=B: */
-                viscosity=Bbar;
+                viscosity=B;
         }
         else{
@@ -189 +177 @@
                         else{
                                 e=(n-1)/2/n;
-                                viscosity=2*Bbar/(2*pow(A,e));
+                                viscosity=2*B/(2*pow(A,e));
                         }
                 }
@@ -398 +386 @@
 }
 
-double Matice::GetBbar(){
-        return Bbar;
-}
-
 double Matice::GetN(){
         return n;

issm/trunk/src/c/objects/Matice.h

@@ -13 +13 @@
                 int        mid;
                 double B;
-                double Bbar;
                 double n;
 
@@ -19 +18 @@
 
                 Matice();
-                Matice(int mid,double B,double Bbar,double n);
+                Matice(int mid,double B,double n);
                 ~Matice();
 
@@ -34 +33 @@
                 void  UpdateFromInputs(void* inputs);
                 void  SetB(double B_param);
-                void  SetBbar(double Bbar_param);
                 void  GetViscosity2d(double* pviscosity, double* pepsilon);
                 void  GetViscosity2(double* pviscosity2, double* pepsilon);
@@ -41 +39 @@
                 Object* copy();
                 double GetB();
-                double GetBbar();
                 double GetN();
 

issm/trunk/src/c/objects/Node.cpp

@@ -281 +281 @@
         if(clone){
                 /*This node is a clone, don't update the dofs!: */
-                return;
+        return;
         }
 
@@ -777 +777 @@
                 /*do nothing, we only update grids belonging to the exterior layers: */
         }
-}
+        if (dof==6){
+                printf("new z = %g\n",this->x[2]);
+                printf("bed = %g\n",bed[dof]);
+                printf("thick = %g\n",thickness[dof]);
+                printf("onsurface = %i\n",onsurface);
+                printf("onbed = %i\n",onbed);
+        }
+}

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

@@ -1113 +1113 @@
                         temperature_average=(temperature_list[0]+temperature_list[1]+temperature_list[2]+temperature_list[3]+temperature_list[4]+temperature_list[5])/6.0;
                         B_average=Paterson(temperature_average);
-                        matice->SetBbar(B_average);
+                        matice->SetB(B_average);
                 }
         }
@@ -3756 +3756 @@
         }
 
+                        if(id==1){
+                                        printf( "z1 %10.10lf \n",xyz_list[0][2]);
+                                        printf( "z2 %10.10lf \n",xyz_list[1][2]);
+                                        printf( "z3 %10.10lf \n",xyz_list[2][2]);
+                                        printf( "z4 %10.10lf \n",xyz_list[3][2]);
+                                        printf( "z5 %10.10lf \n",xyz_list[4][2]);
+                                        printf( "z6 %10.10lf \n",xyz_list[5][2]);
+                                        printf( "Jdet%10.10lf \n",Jdet);
+                        }
         /*Add pe_g to global vector pg: */
         VecSetValues(pg,numdof,doflist,(const double*)P_terms,ADD_VALUES);

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

@@ -1450 +1450 @@
                 temperature_average=(temperature_list[0]+temperature_list[1]+temperature_list[2])/3.0;
                 B_average=Paterson(temperature_average);
-                matice->SetBbar(B_average);
+                matice->SetB(B_average);
         }
         
         if(inputs->Recover("B",&B_list[0],1,dofs,3,(void**)nodes)){
                 B_average=(B_list[0]+B_list[1]+B_list[2])/3.0;
-                matice->SetBbar(B_average);
+                matice->SetB(B_average);
         }