Changeset 10377 for issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp

Timestamp:

10/31/11 14:39:39 (13 years ago)

Author:

seroussi

Message:

removed shelf sync

File:

• issm/trunk/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (modified) (6 diffs)

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

@@ -13 +13 @@
 void GroundinglineMigrationx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){
 
-        int      i, migration_style;
+        int      i, migration_style,analysis_type;
         double*  vertices_potentially_ungrounding = NULL;
         double*  vertices_ungrounding             = NULL;
+        double*  old_floatingice                  = NULL;
         Element* element                          = NULL;
         
@@ -22 +23 @@
         /*retrieve parameters: */
         parameters->FindParam(&migration_style,GroundinglineMigrationEnum);
+        parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+
         if(migration_style==NoneEnum) return;
         if(migration_style!=AgressiveMigrationEnum && migration_style!=SoftMigrationEnum) _error_("%s not supported yet!",EnumToStringx(migration_style));
@@ -33 +36 @@
         }
 
+        /*Create vector with vertices initially floating*/
+        old_floatingice=CreateNodesOnIceShelf(nodes,analysis_type);
+
         /*Migrate grounding line : */
         for(i=0;i<elements->Size();i++){
                 element=(Element*)elements->GetObjectByOffset(i);
-                element->MigrateGroundingLine(vertices_ungrounding);
-        }
-
-        /*Synchronise mask: */
-        for(i=0;i<elements->Size();i++){
-                element=(Element*)elements->GetObjectByOffset(i);
-                element->ShelfSync();
+                element->MigrateGroundingLine(old_floatingice,vertices_ungrounding);
         }
 
@@ -48 +48 @@
         xfree((void**)&vertices_potentially_ungrounding);
         xfree((void**)&vertices_ungrounding);
+        xfree((void**)&old_floatingice);
 }
 /*FUNCTION PotentialSheetUngrounding {{{1*/
@@ -67 +68 @@
         }
 
-        /*Assemble vector: */
+        /*Assemble vector and serialize */
         VecAssemblyBegin(vec_vertices_potentially_ungrounding);
         VecAssemblyEnd(vec_vertices_potentially_ungrounding);
-
-        /*Serialize vector: */
         VecToMPISerial(&vertices_potentially_ungrounding,vec_vertices_potentially_ungrounding);
 
@@ -162 +161 @@
 }
 /*}}}*/
+/*FUNCTION CreateNodesOnIceShelf {{{1*/
+double* CreateNodesOnIceShelf(Nodes* nodes,int configuration_type){ 
+
+        int     i,numnods;
+        double* nodes_on_floatingice  = NULL;
+        Vec     vec_nodes_on_iceshelf = NULL;
+        Node*   node                  = NULL;
+
+        /*First, initialize nodes_on_iceshelf, which will track which nodes have changed status: */
+        numnods=nodes->NumberOfNodes(configuration_type);
+        vec_nodes_on_iceshelf=NewVec(numnods);
+
+        /*Loop through nodes, and fill vec_nodes_on_iceshelf: */
+        for(i=0;i<nodes->Size();i++){
+                node=(Node*)nodes->GetObjectByOffset(i);
+                if(node->InAnalysis(configuration_type)){
+                        if(node->IsFloating()){
+                                VecSetValue(vec_nodes_on_iceshelf,node->Sid(),1.0,INSERT_VALUES);
+                        }
+                }
+        }
+
+        /*Assemble vector: */
+        VecAssemblyBegin(vec_nodes_on_iceshelf);
+        VecAssemblyEnd(vec_nodes_on_iceshelf);
+        VecToMPISerial(&nodes_on_floatingice,vec_nodes_on_iceshelf);
+
+        /*Free ressources*/
+        VecFree(&vec_nodes_on_iceshelf);
+
+        return nodes_on_floatingice;
+}
+/*%}}}*/