Changeset 15535 for issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

Timestamp:

07/22/13 11:18:34 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: minor cosmetics

File:

• issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (modified) (8 diffs)

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -1555 +1555 @@
 
         /*Step1: Get and Extrude original input: */
-        if (object_type==ElementEnum){
+        if(object_type==ElementEnum){
                 num_inputs=1;
                 base_inputs=xNew<Input*>(num_inputs);
                 base_inputs[0]=(Input*)this->inputs->GetInput(enum_type);
         }
-        else if (object_type==MaterialsEnum){
+        else if(object_type==MaterialsEnum){
                 num_inputs=1;
                 base_inputs=xNew<Input*>(num_inputs);
@@ -9645 +9645 @@
 void  Penta::MigrateGroundingLine(IssmDouble* old_floating_ice,IssmDouble* sheet_ungrounding){
 
-        int     i,migration_style;
-        bool    floatingelement = false;
-        bool    groundedelement = false;
-        IssmDouble  bed_hydro,yts,gl_melting_rate;
-        IssmDouble  rho_water,rho_ice,density;
-        IssmDouble  melting[NUMVERTICES],phi[NUMVERTICES];
-        IssmDouble  h[NUMVERTICES],s[NUMVERTICES],b[NUMVERTICES],ba[NUMVERTICES];
+        int        i,migration_style;
+        bool       floatingelement = false;
+        bool       groundedelement = false;
+        IssmDouble bed_hydro,yts,gl_melting_rate;
+        IssmDouble rho_water,rho_ice,density;
+        IssmDouble h[NUMVERTICES],s[NUMVERTICES],b[NUMVERTICES],r[NUMVERTICES];
+        IssmDouble melting[NUMVERTICES],phi[NUMVERTICES];
+        bool       grounded[NUMVERTICES],floating[NUMVERTICES];
 
         if(!IsOnBed()) return;
@@ -9662 +9663 @@
         GetInputListOnVertices(&s[0],SurfaceEnum);
         GetInputListOnVertices(&b[0],BedEnum);
-        GetInputListOnVertices(&ba[0],BathymetryEnum);
+        GetInputListOnVertices(&r[0],BathymetryEnum);
         if(migration_style==SubelementMigrationEnum) GetInputListOnVertices(&phi[0],GLlevelsetEnum);
-        rho_water=matpar->GetRhoWater();
-        rho_ice=matpar->GetRhoIce();
-        density=rho_ice/rho_water;
+        rho_water = matpar->GetRhoWater();
+        rho_ice   = matpar->GetRhoIce();
+        density   = rho_ice/rho_water;
 
         /*go through vertices, and update inputs, considering them to be PentaVertex type: */
@@ -9672 +9673 @@
                 /*Ice shelf: if bed below bathymetry, impose it at the bathymetry and update surface, elso do nothing */
                 if(reCast<bool,IssmDouble>(old_floating_ice[nodes[i]->Sid()])){
-                        if(b[i]<=ba[i]){ 
-                                b[i]=ba[i];
-                                s[i]=b[i]+h[i];
+                        if(b[i]<=r[i]){ 
+                                b[i]        = r[i];
+                                s[i]        = b[i]+h[i];
+                                floating[i] = false;
+                                grounded[i] = true;
                                 nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,false));
                                 nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,true));
@@ -9683 +9686 @@
                 else{
                         bed_hydro=-density*h[i];
-                        if (bed_hydro>ba[i]){
+                        if(bed_hydro>r[i]){
                                 /*Unground only if the element is connected to the ice shelf*/
                                 if(migration_style==AgressiveMigrationEnum || migration_style==SubelementMigrationEnum){
-                                        s[i]=(1-density)*h[i];
-                                        b[i]=-density*h[i];
+                                        s[i]        = (1-density)*h[i];
+                                        b[i]        = -density*h[i];
+                                        floating[i] = true;
+                                        grounded[i] = false;
                                         nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,true));
                                         nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,false));
                                 }
                                 else if(migration_style==SoftMigrationEnum && reCast<int,IssmDouble>(sheet_ungrounding[nodes[i]->Sid()])){
-                                        s[i]=(1-density)*h[i];
-                                        b[i]=-density*h[i];
+                                        s[i]        = (1-density)*h[i];
+                                        b[i]        = -density*h[i];
+                                        floating[i] = true;
+                                        grounded[i] = false;
                                         nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,true));
                                         nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,false));
@@ -9736 +9743 @@
         /*Recalculate phi*/
         if(migration_style==SubelementMigrationEnum){
-                for(i=0;i<NUMVERTICES;i++) phi[i]=h[i]+ba[i]/density;
+                for(i=0;i<NUMVERTICES;i++) phi[i]=h[i]+r[i]/density;
                 this->inputs->AddInput(new PentaInput(GLlevelsetEnum,&phi[0],P1Enum));
                 this->InputExtrude(GLlevelsetEnum,ElementEnum);
@@ -9752 +9759 @@
 void  Penta::PotentialUngrounding(Vector<IssmDouble>* potential_ungrounding){
 
-        int     i;
-        IssmDouble  h[NUMVERTICES],ba[NUMVERTICES];
+        IssmDouble  h[NUMVERTICES],r[NUMVERTICES];
         IssmDouble  bed_hydro;
         IssmDouble  rho_water,rho_ice,density;
@@ -9762 +9768 @@
         density=rho_ice/rho_water;
         GetInputListOnVertices(&h[0],ThicknessEnum);
-        GetInputListOnVertices(&ba[0],BathymetryEnum);
+        GetInputListOnVertices(&r[0],BathymetryEnum);
 
         /*go through vertices, and figure out which ones are on the ice sheet, and want to unground: */
-        for(i=0;i<NUMVERTICES;i++){
+        for(int i=0;i<NUMVERTICES;i++){
                 /*Find if grounded vertices want to start floating*/
                 if (!nodes[i]->IsFloating()){
                         bed_hydro=-density*h[i];
-                        if (bed_hydro>ba[i]){
+                        if(bed_hydro>r[i]){
                                 /*Vertex that could potentially unground, flag it*/
                                 potential_ungrounding->SetValue(nodes[i]->Sid(),1,INS_VAL);