Changeset 3090

Timestamp:

02/23/10 14:15:38 (15 years ago)

Author:

Mathieu Morlighem

Message:

Commented thickness evolution for now

File:

• issm/trunk/src/c/objects/Tria.cpp (modified) (1 diff)

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

@@ -4604 +4604 @@
 
         /*Update internal data if inputs holds new values: */
-        if(inputs->Recover("thickness",&new_h[0],1,dofs,3,(void**)nodes)){
-                /*density, needed later: */
-                double di=(this->matpar->GetRhoIce()/this->matpar->GetRhoWater());
-                /*Go through grids: */
-                for (i=0;i<3;i++){
-                        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];
-                }
-        }
+        if (id==1) printf("WARNING if QMU: no hydrostatic equilibrium is applied here (conflict with prognostic, which do not have matpar)\n");
+        //For now
+        inputs->Recover("thickness",&h[0],1,dofs,3,(void**)nodes);
+        //Later
+        /*
+                if(inputs->Recover("thickness",&new_h[0],1,dofs,3,(void**)nodes)){
+        //density, needed later:
+        double di=(this->matpar->GetRhoIce()/this->matpar->GetRhoWater());
+        //Go through grids:
+        for (i=0;i<3;i++){
+        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];
+        }
+        }
+        */
         inputs->Recover("surface",&s[0],1,dofs,3,(void**)nodes);
         inputs->Recover("bed",&b[0],1,dofs,3,(void**)nodes);