Changeset 7312

Timestamp:

02/03/11 16:20:43 (14 years ago)

Author:

Eric.Larour

Message:

Reshuflled GroundingLineMigrationx module. Too many routines. Piled in GroundingLineMigrationxUtils

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (3 diffs)
• modules/GroundingLineMigrationx/GroundingLineMigrationx.cpp (modified) (1 diff)
• modules/GroundingLineMigrationx/GroundingLineMigrationxLocal.h (modified) (1 diff)
• modules/GroundingLineMigrationx/GroundingLineMigrationxUtils.cpp (added)

issm/trunk/src/c/Makefile.am

@@ -356 +356 @@
                                         ./modules/GroundingLineMigrationx/GroundingLineMigrationx.h\
                                         ./modules/GroundingLineMigrationx/GroundingLineMigrationxLocal.h\
-                                        ./modules/GroundingLineMigrationx/CreateElementOnIceShelf.cpp\
-                                        ./modules/GroundingLineMigrationx/CreateElementTouchingIceShelf.cpp\
-                                        ./modules/GroundingLineMigrationx/CreateElementOnGroundingLine.cpp\
-                                        ./modules/GroundingLineMigrationx/UpdateShelfStatus.cpp\
+                                        ./modules/GroundingLineMigrationx/GroundingLineMigrationxUtils.cpp\
                                         ./modules/ModelProcessorx/ModelProcessorx.h\
                                         ./modules/ModelProcessorx/ModelProcessorx.cpp\
@@ -935 +932 @@
                                         ./modules/GroundingLineMigrationx/GroundingLineMigrationx.h\
                                         ./modules/GroundingLineMigrationx/GroundingLineMigrationxLocal.h\
-                                        ./modules/GroundingLineMigrationx/CreateElementOnIceShelf.cpp\
-                                        ./modules/GroundingLineMigrationx/CreateElementTouchingIceShelf.cpp\
-                                        ./modules/GroundingLineMigrationx/CreateElementOnGroundingLine.cpp\
-                                        ./modules/GroundingLineMigrationx/UpdateShelfStatus.cpp\
+                                        ./modules/GroundingLineMigrationx/GroundingLineMigrationxUtils.cpp\
                                         ./modules/ModelProcessorx/ModelProcessorx.h\
                                         ./modules/ModelProcessorx/ModelProcessorx.cpp\
@@ -1180 +1174 @@
                                         ./solutions/transient2d_core.cpp\
                                         ./solutions/transient3d_core.cpp\
+                                        ./solutions/groundinglinemigration2d_core.cpp\
                                         ./solutions/steadystate_core.cpp\
                                         ./solutions/steadystateconvergence.cpp\

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

@@ -5 +5 @@
 #include "./GroundingLineMigrationx.h"
 #include "./GroundingLineMigrationxLocal.h"
+
 #include "../../shared/shared.h"
 #include "../../include/include.h"
 #include "../../toolkits/toolkits.h"
 #include "../../EnumDefinitions/EnumDefinitions.h"
+#include "../../Container/Container.h"
 
 void GroundingLineMigrationx(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters){
 
-        int i,j;
-        Element* element=NULL;
-        double*  element_touching_iceshelf=NULL;
-        int      nflipped;
 
+        int migration_style;
+        
         _printf_(VerboseModule(),"   Migrating grounding line\n");
+        
+        /*retrieve parameters: */
+        parameters->FindParam(&migration_style,GroundingLineMigrationEnum);
+        
+        /*call different migration modules, according to user wishes: */
+        if(migration_style==AgressiveMigrationEnum) AgressiveMigration(elements,nodes, vertices,loads,materials, parameters);
+        else if(migration_style==SoftMigrationEnum) AgressiveMigration(elements,nodes, vertices,loads,materials, parameters);
+        else if(migration_style==NoneEnum)_printf_("%s\n","NoneEnum supplied for migration style, doing nothing!");
+        else _error_("%s not supported yet!",EnumToString(migration_style));
 
-        /*Loop until no more nodes and elements  change from grounded to floating: */
-        nflipped=1; //arbitrary, get things started
-
-        while(nflipped){
-
-                /*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);
-                        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);
-        }
-                
-        
-        /*free ressouces: */
-        xfree((void**)&element_touching_iceshelf);
 }

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

@@ -11 +11 @@
 
 /* local prototypes: */
+
+void AgressiveMigration(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters);
+void SoftMigration(Elements* elements,Nodes* nodes, Vertices* vertices,Loads* loads,Materials* materials, Parameters* parameters);
+
 double* CreateElementOnIceShelf(Elements* elements);
 bool*   CreateElementOnGroundingLine(Elements* elements,double* element_on_iceshelf);
 double* CreateElementTouchingIceShelf(Elements* elements);
-int UpdateShelfStatus(Elements* elements,Nodes* nodes,Parameters* parameters,double* element_touching_iceshelf);
+int     UpdateShelfStatus(Elements* elements,Nodes* nodes,Parameters* parameters,double* element_touching_iceshelf);
 
 #endif  /* _GROUNDINGLINEMIGRATIONXLOCAL_H */