Changeset 10366

Timestamp:

10/31/11 10:33:17 (13 years ago)

Author:

seroussi

Message:

useless routines

Location:

issm/trunk/src/c/modules/GroundinglineMigrationx

Files:

• GroundinglineMigrationxLocal.h (modified) (1 diff)
• GroundinglineMigrationxUtils.cpp (modified) (2 diffs)

issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationxLocal.h ¶

@@ -12 +12 @@
 
 /* local prototypes: */
-bool*      CreateElementOnGroundingline(Elements* elements,double* element_on_iceshelf);
-double*    CreateElementOnIceShelf(Elements* elements);
 double*    CreateElementTouchingIceShelf(Elements* elements,double* nodes_on_iceshelf);
 Vec        CreateNodesOnIceShelf(Nodes* nodes,Vertices* vertices,int analysis_type);
 double*    PotentialSheetUngrounding(Elements* elements,Vertices* vertices,Parameters* parameters);
 double*    PropagateShelfIntoConnexIceSheet(Elements* elements,Nodes* nodes,Vertices* vertices,Parameters* parameters,double* vertices_potentially_ungrounding);
-
-int        UpdateShelfStatus(Elements* elements,Nodes* nodes,Parameters* parameters,double* element_touching_iceshelf);
 #endif  /* _GROUNDINGLINEMIGRATIONXLOCAL_H */

issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationxUtils.cpp ¶

@@ -11 +11 @@
 #include "../../EnumDefinitions/EnumDefinitions.h"
 
-/*FUNCTION CreateElementOnGroundingline {{{1*/
-bool*      CreateElementOnGroundingline(Elements* elements,double* element_on_iceshelf){ 
-
-        bool    *element_on_gl = NULL;
-        bool     ongl=false;
-        int      i,j,sid,shelf;
-        int     *neighboorsids = NULL;
-        Element *element       = NULL;
-
-        /*Go through elements, and look for elements that can possibly have a grounding line migration. These 
-         * are  elements that touch the grounding line: */
-        element_on_gl=(bool*)xmalloc(elements->Size()*sizeof(bool));
-
-        for(i=0;i<elements->Size();i++){
-                element=(Element*)elements->GetObjectByOffset(i);
-                
-                sid=element->Sid();
-                neighboorsids=element->GetHorizontalNeighboorSids();
-
-                shelf=(int)element_on_iceshelf[sid];
-                ongl=false;
-                for(j=0;j<3;j++){
-                        if (neighboorsids[j]<0)continue; //this neighboor does not exist
-                        if ((shelf==1) & (element_on_iceshelf[neighboorsids[j]]==1))continue;  //both this element and this neighboor are on th ice shelf
-                        if ((shelf==0) & (element_on_iceshelf[neighboorsids[j]]==0))continue;  //both this element and this neighboor are on the ice sheet
-                        ongl=true; //neighboor j is on a different location than us, ie we are touching the grounding line.
-                }
-                element_on_gl[i]=ongl;
-        }
-
-        return element_on_gl;
-}
-/*}}}*/
-/*FUNCTION CreateElementOnIceShelf {{{1*/
-double*    CreateElementOnIceShelf(Elements* elements){ 
-
-        int      i;
-        double  *element_on_iceshelf     = NULL;
-        Element *element                 = NULL;
-        Vec      vec_element_on_iceshelf = NULL;
-
-        /*Create  vector holding  all the elements IsFloating flags: */
-        vec_element_on_iceshelf=NewVec(elements->NumberOfElements(),true);
-
-        /*Loop through elements, and fill vec_element_on_iceshelf: */
-        for(i=0;i<elements->Size();i++){
-                element=(Element*)elements->GetObjectByOffset(i);
-                VecSetValue(vec_element_on_iceshelf,element->Sid(),(int)element->IsFloating(),INSERT_VALUES);
-        }
-
-        /*Assemble vector: */
-        VecAssemblyBegin(vec_element_on_iceshelf);
-        VecAssemblyEnd(vec_element_on_iceshelf);
-
-        /*Serialize vector: */
-        VecToMPISerial(&element_on_iceshelf,vec_element_on_iceshelf);
-
-        /*free ressouces: */
-        VecFree(&vec_element_on_iceshelf);
-
-        return element_on_iceshelf;
-}
-/*}}}*/
 /*FUNCTION CreateElementTouchingIceShelf {{{1*/
 double*    CreateElementTouchingIceShelf(Elements* elements,double* nodes_on_iceshelf){ 
@@ -214 +151 @@
 }
 /*}}}*/
-
-/*FUNCTION UpdateShelfStatus {{{1*/
-int UpdateShelfStatus(Elements* elements,Nodes* nodes,Parameters* parameters,double* element_touching_iceshelf){
-
-        int      i,numnods,configuration_type;
-        int      nflipped=0;
-        int      local_nflipped=0;
-        Vec      vec_new_shelf_nodes = NULL;
-        double*  new_shelf_nodes     = NULL;
-        Element* element             = NULL;
-
-        /*recover parameters: */
-        parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
-
-        /*First, initialize vec_new_shelf_nodes, which will track which nodes have changed status: */
-        numnods=nodes->NumberOfNodes(configuration_type);
-        vec_new_shelf_nodes=NewVec(numnods);
-
-        /*Ok, now go through  the elements that have gone through grounding line migration, 
-         * and update their flags: */
-        for(i=0;i<elements->Size();i++){
-                element=(Element*)elements->GetObjectByOffset(i);
-                if(element_touching_iceshelf[element->Sid()]){
-                        local_nflipped+=element->UpdateShelfStatus(vec_new_shelf_nodes);
-                }
-        }
-        MPI_Allreduce(&local_nflipped,&nflipped,1,MPI_INT,MPI_SUM,MPI_COMM_WORLD);
-
-        /*Serialize vec_new_shelf_nodes: */
-        VecToMPISerial(&new_shelf_nodes,vec_new_shelf_nodes);
-
-        /*Now, go through ALL elements, and update the status of the nodes, to propagate what happened at the grounding line: */
-        /*Carry out grounding line migration for those elements: */
-        for(i=0;i<elements->Size();i++){
-                element=(Element*)elements->GetObjectByOffset(i);
-                element->UpdateShelfFlags(new_shelf_nodes);
-        }
-
-        /*Free ressources: */
-        VecFree(&vec_new_shelf_nodes);
-        xfree((void**)&new_shelf_nodes);
-
-        return nflipped;
-}
-/*}}}*/