Changeset 3049

Timestamp:

02/16/10 18:26:40 (15 years ago)

Author:

Eric.Larour

Message:

Fixed update bug for thicknesses.

File:

• issm/trunk/src/c/objects/Tria.cpp (modified) (2 diffs)

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

@@ -4590 +4590 @@
 void  Tria::UpdateFromInputs(void* vinputs){
 
+        int     i;
         int     dofs[1]={0};
         double  temperature_list[3];
@@ -4605 +4606 @@
         if(inputs->Recover("thickness",&new_h[0],1,dofs,3,(void**)nodes)){
                 /*density, needed later: */
-                double di=(this->matpar->rho_ice/this->matpar->rho_water);
+                double di=(this->matpar->GetRhoIce()/this->matpar->GetRhoWater());
                 /*Go through grids: */
                 for (i=0;i<3;i++){
-                        if(this->nodes[i]->onshelf){
+                        if(this->nodes[i]->IsOnShelf()){
                                 this->b[i]=this->b[i]-di*(new_h[i]-h[i]); //hydrostatic equilibrium;
                         }
                         this->s[i]=this->b[i]+new_h[i];
+                        this->h[i]=new_h[i];
                 }
         }