Changeset 12654

Timestamp:

07/18/12 15:07:47 (13 years ago)

Author:

Mathieu Morlighem

Message:

Removed commented line and misleading comments

File:

• issm/trunk-jpl/src/c/objects/Elements/Tria.cpp (modified) (4 diffs)

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

@@ -5352 +5352 @@
                         switch(name){
                                 case ThicknessEnum:
-                                        /*Update thickness + surface: assume bed is constant. On ice shelves, takes hydrostatic equilibrium {{{*/
                                         IssmDouble  thickness[3];
                                         IssmDouble  thickness_init[3];
@@ -5365 +5364 @@
                                         GetInputListOnVertices(&surface[0],SurfaceEnum);
 
-                                        /*build new thickness: */
-//                                      for(j=0;j<3;j++)thickness[j]=values[j];
-
                                         /*build new bed and surface: */
                                         if (this->IsFloating()){
                                                 /*hydrostatic equilibrium: */
                                                 IssmDouble rho_ice,rho_water,di;
-                                                rho_ice=this->matpar->GetRhoIce();
-                                                rho_water=this->matpar->GetRhoWater();
-
-                                                di=rho_ice/rho_water;
+                                                rho_ice   = this->matpar->GetRhoIce();
+                                                rho_water = this->matpar->GetRhoWater();
+                                                di        = rho_ice/rho_water;
 
                                                 /*build new thickness: */
                                                 for (j=0; j<3; j++) {
-                                                /*  for observed/interpolated/hydrostatic thickness, remove scaling from any hydrostatic thickness  */
-                                                        if     (hydrostatic_ratio[j] >= 0.)
+                                                        /*  for observed/interpolated/hydrostatic thickness, remove scaling from any hydrostatic thickness  */
+                                                        if (hydrostatic_ratio[j] >= 0.)
                                                                 thickness[j]=values[j]-(values[j]/thickness_init[j]-1.)*hydrostatic_ratio[j]*surface[j]/(1.-di);
-                                                /*  for minimum thickness, don't scale  */
+                                                        /*  for minimum thickness, don't scale  */
                                                         else
                                                                 thickness[j]=thickness_init[j];
 
-                                                /*  check the computed thickness and update bed  */
-                                                        if (thickness[j] < 0.)
-                                                                thickness[j]=1./(1.-di);
+                                                        /*  check the computed thickness and update bed*/
+                                                        if (thickness[j] < 0.) thickness[j]=1./(1.-di);
                                                         bed[j]=surface[j]-thickness[j];
                                                 }
-
-//                                              for(j=0;j<3;j++){
-//                                                      surface[j]=(1-di)*thickness[j];
-//                                                      bed[j]=-di*thickness[j];
-//                                              }
                                         }
                                         else{
                                                 /*build new thickness: */
                                                 for (j=0; j<3; j++) {
-                                                /*  for observed thickness, use scaled value  */
+                                                        /*  for observed thickness, use scaled value  */
                                                         if (hydrostatic_ratio[j] >= 0.)
                                                                 thickness[j]=values[j];
-                                                /*  for minimum thickness, don't scale  */
+                                                        /*  for minimum thickness, don't scale  */
                                                         else
                                                                 thickness[j]=thickness_init[j];
@@ -5409 +5398 @@
 
                                                 /*update bed on grounded ice: */
-//                                              for(j=0;j<3;j++)surface[j]=bed[j]+thickness[j];
                                                 for(j=0;j<3;j++)bed[j]=surface[j]-thickness[j];
                                         }
@@ -5418 +5406 @@
                                         this->inputs->AddInput(new TriaP1Input(SurfaceEnum,surface));
 
-                                        /*}}}*/
                                         break;
                                 default: