Changeset 7287

Timestamp:

02/02/11 18:45:18 (14 years ago)

Author:

Eric.Larour

Message:

Temporary commit for grounding line migration

Location:

issm/trunk/src/c/modules/GroundingLineMigrationx

Files:

• CreateElementOnIceShelf.cpp (modified) (1 diff)
• CreateElementTouchingIceShelf.cpp (modified) (1 diff)
• GroundingLineMigrationx.cpp (modified) (1 diff)
• GroundingLineMigrationxLocal.h (modified) (1 diff)
• UpdateShelfStatus.cpp (added)

issm/trunk/src/c/modules/GroundingLineMigrationx/CreateElementOnIceShelf.cpp

@@ -22 +22 @@
         for(i=0;i<elements->Size();i++){
                 element=(Element*)elements->GetObjectByOffset(i);
+                printf("%i\n",i);
                 VecSetValue(vec_element_on_iceshelf,element->Sid(),(int)element->IsOnShelf(),INSERT_VALUES);
         }

issm/trunk/src/c/modules/GroundingLineMigrationx/CreateElementTouchingIceShelf.cpp

@@ -22 +22 @@
         for(i=0;i<elements->Size();i++){
                 element=(Element*)elements->GetObjectByOffset(i);
-                VecSetValue(vec_element_touching_iceshelf,element->Sid(),(int)element->IsNodeOnShelf(),INSERT_VALUES);
+                VecSetValue(vec_element_touching_iceshelf,element->Sid(),element->IsNodeOnShelf()?1.0:0.0,INSERT_VALUES);
         }
 

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

@@ -18 +18 @@
         _printf_(VerboseModule(),"   Migrating grounding line\n");
 
-        /*Create  vector holding  all the elements that touch the ice shelf: */
-        element_touching_iceshelf=CreateElementTouchingIceShelf(elements);
+        /*Loop until no more nodes and elements  change from grounded to floating: */
+        nflipped=1; //arbitrary, get things started
+        while(nflipped){
 
-        /*Carry out grounding line migration for those elements: */
-        for(i=0;i<elements->Size();i++){
-                if (element_touching_iceshelf[i]){
+                /*reset counter: */
+                nflipped=0;
+
+                /*Create  vector holding  all the elements that touch the ice shelf, by any node: */
+                element_touching_iceshelf=CreateElementTouchingIceShelf(elements);
+
+                /*Carry out grounding line migration for those elements: */
+                for(i=0;i<elements->Size();i++){
                         element=(Element*)elements->GetObjectByOffset(i);
-                        element->MigrateGroundingLine();
+                        if(element_touching_iceshelf[element->Sid()]) element->MigrateGroundingLine();
                 }
+
+                /*Now, update shelf flags in nodes and elements: */
+                nflipped=UpdateShelfStatus(elements,nodes,parameters,element_touching_iceshelf);
+                _printf_(VerboseModule(),"      number of migrated nodes: %i\n",nflipped);
+
+                /*avoid memory leaks: */
+                xfree((void**)&element_touching_iceshelf);
         }
-
-        /*Now, update shelf flags in nodes and elements. We could not do this before, 
-         *because we would end up with discontinuous bed and surface otherwise: */
-        for(i=0;i<elements->Size();i++){
-                element=(Element*)elements->GetObjectByOffset(i);
-                element->UpdateShelfStatus();
-        }
-
+                
+        
         /*free ressouces: */
         xfree((void**)&element_touching_iceshelf);

issm/trunk/src/c/modules/GroundingLineMigrationx/GroundingLineMigrationxLocal.h

@@ -12 +12 @@
 bool*   CreateElementOnGroundingLine(Elements* elements,double* element_on_iceshelf);
 double* CreateElementTouchingIceShelf(Elements* elements);
+int UpdateShelfStatus(Elements* elements,Nodes* nodes,Parameters* parameters);
+int UpdateShelfStatus(Elements* elements,Nodes* nodes,Parameters* parameters,double* element_touching_iceshelf);
 
 #endif  /* _GROUNDINGLINEMIGRATIONXLOCAL_H */