Changeset 10373

Timestamp:

10/31/11 11:26:22 (13 years ago)

Author:

seroussi

Message:

also useless

Location:

issm/trunk/src/c/objects/Elements

Files:

• Element.h (modified) (1 diff)
• Penta.cpp (modified) (1 diff)
• Penta.h (modified) (1 diff)
• Tria.cpp (modified) (1 diff)
• Tria.h (modified) (1 diff)

issm/trunk/src/c/objects/Elements/Element.h

@@ -68 +68 @@
                 virtual void   ShelfSync()=0;
                 virtual void   PotentialSheetUngrounding(Vec potential_sheet_ungrounding)=0;
-                virtual void   MigrateGroundingline()=0;
                 virtual int    UpdatePotentialSheetUngrounding(double* potential_sheet_ungrounding,Vec vec_nodes_on_iceshelf,double* nodes_on_iceshelf)=0;
 

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -2046 +2046 @@
 
 }/*}}}*/
-/*FUNCTION Penta::MigrateGroundingline{{{1*/
-void  Penta::MigrateGroundingline(void){
-        _error_("not supported yet!");
-}
-/*}}}*/
 /*FUNCTION Penta::MinEdgeLength{{{1*/
 double Penta::MinEdgeLength(double xyz_list[6][3]){

issm/trunk/src/c/objects/Elements/Penta.h

@@ -108 +108 @@
                 void   RequestedOutput(int output_enum,int step,double time);
                 void   ListResultsEnums(int** results_enums,int* num_results);
-                void   MigrateGroundingline();
                 void   PatchFill(int* pcount, Patch* patch);
                 void   PatchSize(int* pnumrows, int* pnumvertices,int* pnumnodes);

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

@@ -1971 +1971 @@
         this->inputs->AddInput(new TriaVertexInput(SurfaceEnum,&s[0]));
         this->inputs->AddInput(new TriaVertexInput(BedEnum,&b[0]));
-}
-/*}}}*/
-/*FUNCTION Tria::MigrateGroundingline{{{1*/
-void  Tria::MigrateGroundingline(void){
-
-        double *values         = NULL;
-        double  h[3],s[3],b[3],ba[3];
-        double  bed_hydro;
-        double  rho_water,rho_ice,density;
-        int     isonshelf[3];
-        int     i;
-        bool    elementonshelf = false;
-
-        /*Recover info at the vertices: */
-        GetInputListOnVertices(&h[0],ThicknessEnum);
-        GetInputListOnVertices(&s[0],SurfaceEnum);
-        GetInputListOnVertices(&b[0],BedEnum);
-        GetInputListOnVertices(&ba[0],BathymetryEnum);
-        for(i=0;i<3;i++){
-                isonshelf[i]=nodes[i]->IsFloating();
-                if((nodes[i]->Sid()+1)==36)printf("MigrateGroundingline: El %i Node %i shelf status %i\n",this->Id(),nodes[i]->Sid()+1,isonshelf[i]);
-        }
-
-        /*material parameters: */
-        rho_water=matpar->GetRhoWater();
-        rho_ice=matpar->GetRhoIce();
-        density=rho_ice/rho_water;
-
-        /*go through vertices, and update inputs, considering them to be TriaVertex type: */
-        for(i=0;i<3;i++){
-                if (isonshelf[i]){
-                        /*This node is on the shelf. See if its bed is going under the bathymetry: */
-                        if(b[i]<=ba[i]){ //<= because Neff being 0 when b=ba, drag will be 0 anyway.
-                                /*The ice shelf is getting grounded, the thickness is the same, so just update the bed to stick to the bathymetry and elevate the surface accordingly: */
-                                b[i]=ba[i];
-                                s[i]=b[i]+h[i];
-                        }
-                        else{
-                                /*do nothing, we are still floating.*/
-                        }
-                }
-                else{
-                        /*This node is on the sheet, near the grounding line. See if wants to unground. To 
-                         * do so, we compute the hydrostatic bed, and if it is > bathymetry, then we unground: */
-                        bed_hydro=-density*h[i];
-                        if (bed_hydro>ba[i]){
-                                /*We are now floating, bed and surface are determined from hydrostatic equilibrium: */
-                                s[i]=(1-density)*h[i];
-                                b[i]=-density*h[i];
-                        }
-                        else{
-                                /*do nothing, we are still grounded.*/
-                        }
-                }
-        }
-
-        /*Surface and bed are updated. Update inputs:*/
-        this->inputs->AddInput(new TriaVertexInput(SurfaceEnum,&s[0]));
-        this->inputs->AddInput(new TriaVertexInput(BedEnum,&b[0]));
-        
-        for(i=0;i<3;i++) isonshelf[i]=nodes[i]->IsFloating();
 }
 /*}}}*/

issm/trunk/src/c/objects/Elements/Tria.h

@@ -105 +105 @@
                 void   ShelfSync();
                 void   PotentialSheetUngrounding(Vec potential_sheet_ungrounding);
-                void   MigrateGroundingline();
                 void   RequestedOutput(int output_enum,int step,double time);
                 void   ListResultsEnums(int** results_enums,int* num_results);