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

Timestamp:

08/27/13 13:23:25 (12 years ago)

Author:

seroussi

Message:

CHG: removing node->IsGrounded, node->IsFloating

File:

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

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

@@ -2368 +2368 @@
         IssmDouble oldsurface[NUMVERTICES];
         IssmDouble oldthickness[NUMVERTICES];
+        IssmDouble phi[NUMVERTICES];
         Penta  *penta   = NULL;
 
@@ -2390 +2391 @@
         GetInputListOnVertices(&oldsurface[0],SurfaceEnum);
         GetInputListOnVertices(&oldthickness[0],ThicknessEnum);
+        GetInputListOnVertices(&phi[0],MaskGroundediceLevelsetEnum);
 
         /*Fing MasstransportHydrostaticAdjustment to figure out how to update the geometry:*/
@@ -2400 +2402 @@
         for(i=0;i<numdof;i++) {
                 /*If shelf: hydrostatic equilibrium*/
-                if (this->nodes[i]->IsGrounded()){
+                if (phi[i]>0.){
                         newsurface[i]=oldbed[i]+newthickness[i]; //surface = oldbed + newthickness
                         newbed[i]=oldbed[i];               //same bed: do nothing
@@ -2755 +2757 @@
         inputs->GetInputValue(&onshelf,MaskElementonfloatingiceEnum);
         return onshelf;
-}
-/*}}}*/
-/*FUNCTION Penta::IsNodeOnShelf {{{*/
-bool   Penta::IsNodeOnShelf(){
-
-        int  i;
-        bool shelf=false;
-
-        for(i=0;i<6;i++){
-                if (nodes[i]->IsFloating()){
-                        shelf=true;
-                        break;
-                }
-        }
-        return shelf;
 }
 /*}}}*/
@@ -11235 +11222 @@
                                 floating[i] = false;
                                 grounded[i] = true;
-                                nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,false));
-                                nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,true));
                         }
                 }
@@ -11250 +11235 @@
                                         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 && phi_ungrounding[vertices[i]->Pid()]<0.){
@@ -11258 +11241 @@
                                         floating[i] = true;
                                         grounded[i] = false;
-                                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,true));
-                                        nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,false));
                                 }
                                 else{
@@ -11267 +11248 @@
                 }
         }
-
-        /*SubelementMigrationEnum: if one grounded, all grounded*/
-        if(migration_style==SubelementMigrationEnum){
-                for(i=0;i<NUMVERTICES;i++){
-                        if(nodes[i]->IsGrounded()){
-                                groundedelement=true;
-                                break;
-                        }
-                }
-                floatingelement=!groundedelement;
-        }
-        else{
-                for(i=0;i<NUMVERTICES;i++){
-                        if(nodes[i]->IsFloating()){
-                                floatingelement=true;
-                                break;
-                        }
-                }
-        }
-
-   /*Add basal melting rate if element just ungrounded*/
-        if(!this->IsFloating() && floatingelement==true){
-                for(i=0;i<NUMVERTICES;i++)melting[i]=gl_melting_rate/yts;
-                this->inputs->AddInput(new PentaInput(BasalforcingsMeltingRateEnum,&melting[0],P1Enum));
-        } 
-
-        /*Update inputs*/
-        this->inputs->AddInput(new PentaInput(SurfaceEnum,&s[0],P1Enum));
-        this->inputs->AddInput(new PentaInput(BedEnum,&b[0],P1Enum));
-   this->inputs->AddInput(new BoolInput(MaskElementonfloatingiceEnum,floatingelement));
 
         /*Recalculate phi*/
@@ -11311 +11262 @@
         this->InputExtrude(MaskGroundediceLevelsetEnum,ElementEnum);
 
+        /*SubelementMigrationEnum: if one grounded, all grounded*/
+        if(migration_style==SubelementMigrationEnum){
+                for(i=0;i<NUMVERTICES;i++){
+                        if(phi[i]>0.){
+                                groundedelement=true;
+                                break;
+                        }
+                }
+                floatingelement=!groundedelement;
+        }
+        else{
+                for(i=0;i<NUMVERTICES;i++){
+                        if(phi[i]<=0.){
+                                floatingelement=true;
+                                break;
+                        }
+                }
+        }
+
+   /*Add basal melting rate if element just ungrounded*/
+        if(!this->IsFloating() && floatingelement==true){
+                for(i=0;i<NUMVERTICES;i++)melting[i]=gl_melting_rate/yts;
+                this->inputs->AddInput(new PentaInput(BasalforcingsMeltingRateEnum,&melting[0],P1Enum));
+        } 
+
+        /*Update inputs*/
+        this->inputs->AddInput(new PentaInput(SurfaceEnum,&s[0],P1Enum));
+        this->inputs->AddInput(new PentaInput(BedEnum,&b[0],P1Enum));
+   this->inputs->AddInput(new BoolInput(MaskElementonfloatingiceEnum,floatingelement));
+
         /*Extrude inputs*/
         this->InputExtrude(SurfaceEnum,ElementEnum);
         this->InputExtrude(BedEnum,ElementEnum);
         this->InputExtrude(MaskElementonfloatingiceEnum,ElementEnum);
-        this->InputExtrude(MaskVertexonfloatingiceEnum,NodeEnum);
-        this->InputExtrude(MaskVertexongroundediceEnum,NodeEnum);
 }
 /*}}}*/