Index: sm/trunk/src/c/modules/GroundingLineMigrationx/CreateElementOnGroundingLine.cpp =================================================================== --- /issm/trunk/src/c/modules/GroundingLineMigrationx/CreateElementOnGroundingLine.cpp (revision 7320) +++ (revision ) @@ -1,44 +1,0 @@ -/*!\file CreateElementOnGroundingLine - * \brief: create element on grounding line - */ - -#include "./GroundingLineMigrationxLocal.h" -#include "../../shared/shared.h" -#include "../../include/include.h" -#include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" - -bool* CreateElementOnGroundingLine(Elements* elements,double* element_on_iceshelf){ - - int i; - int j; - Element *element = NULL; - bool *element_on_gl = NULL; - bool ongl=false; - int *neighboorsids = NULL; - int sid; - int shelf; - - /*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;iSize();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; -} Index: sm/trunk/src/c/modules/GroundingLineMigrationx/CreateElementOnIceShelf.cpp =================================================================== --- /issm/trunk/src/c/modules/GroundingLineMigrationx/CreateElementOnIceShelf.cpp (revision 7320) +++ (revision ) @@ -1,39 +1,0 @@ -/*!\file CreateElementOnIceShelf - * \brief: create element on ice shelf, double* vector, from elements, serialized on all cpus. - */ - -#include "./GroundingLineMigrationxLocal.h" -#include "../../shared/shared.h" -#include "../../include/include.h" -#include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" - -double* CreateElementOnIceShelf(Elements* elements){ - - int i; - Element* element=NULL; - Vec vec_element_on_iceshelf=NULL; - double* element_on_iceshelf=NULL; - - /*Create vector holding all the elements IsOnShelf flags: */ - vec_element_on_iceshelf=NewVec(elements->NumberOfElements(),true); - - /*Loop through elements, and fill vec_element_on_iceshelf: */ - for(i=0;iSize();i++){ - element=(Element*)elements->GetObjectByOffset(i); - printf("%i\n",i); - VecSetValue(vec_element_on_iceshelf,element->Sid(),(int)element->IsOnShelf(),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; -} Index: sm/trunk/src/c/modules/GroundingLineMigrationx/CreateElementTouchingIceShelf.cpp =================================================================== --- /issm/trunk/src/c/modules/GroundingLineMigrationx/CreateElementTouchingIceShelf.cpp (revision 7320) +++ (revision ) @@ -1,38 +1,0 @@ -/*!\file CreateElementTouchingIceShelf - * \brief: create element on ice shelf, double* vector, from elements, serialized on all cpus. - */ - -#include "./GroundingLineMigrationxLocal.h" -#include "../../shared/shared.h" -#include "../../include/include.h" -#include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" - -double* CreateElementTouchingIceShelf(Elements* elements){ - - int i; - Element* element=NULL; - Vec vec_element_touching_iceshelf=NULL; - double* element_touching_iceshelf=NULL; - - /*Create vector holding all the elements IsOnShelf flags: */ - vec_element_touching_iceshelf=NewVec(elements->NumberOfElements(),true); - - /*Loop through elements, and fill vec_element_touching_iceshelf: */ - for(i=0;iSize();i++){ - element=(Element*)elements->GetObjectByOffset(i); - VecSetValue(vec_element_touching_iceshelf,element->Sid(),element->IsNodeOnShelf()?1.0:0.0,INSERT_VALUES); - } - - /*Assemble vector: */ - VecAssemblyBegin(vec_element_touching_iceshelf); - VecAssemblyEnd(vec_element_touching_iceshelf); - - /*Serialize vector: */ - VecToMPISerial(&element_touching_iceshelf,vec_element_touching_iceshelf); - - /*free ressouces: */ - VecFree(&vec_element_touching_iceshelf); - - return element_touching_iceshelf; -} Index: sm/trunk/src/c/modules/GroundingLineMigrationx/UpdateShelfStatus.cpp =================================================================== --- /issm/trunk/src/c/modules/GroundingLineMigrationx/UpdateShelfStatus.cpp (revision 7320) +++ (revision ) @@ -1,56 +1,0 @@ -/*!\file UpdateShelfStatus - * \brief: update elements and nodes shelf status. Plus return how many nodes have changed status. - */ - -#include "./GroundingLineMigrationxLocal.h" -#include "../../shared/shared.h" -#include "../../include/include.h" -#include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" - -int UpdateShelfStatus(Elements* elements,Nodes* nodes,Parameters* parameters,double* element_touching_iceshelf){ - - int i; - Element* element=NULL; - int analysis_type; - int numnods; - Vec vec_new_shelf_nodes=NULL; - double* new_shelf_nodes=NULL; - - /*output: */ - int local_nflipped=0; - int nflipped=0; - - /*recover parameters: */ - parameters->FindParam(&analysis_type,AnalysisTypeEnum); - - /*First, initialize vec_new_shelf_nodes, which will track which nodes have changed status: */ - numnods=nodes->NumberOfNodes(analysis_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;iSize();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;iSize();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; -}