Changeset 14687

Timestamp:

04/22/13 08:57:46 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: set toolkit to default in GroundinglineMigrationx

Location:

issm/trunk-jpl/src/c

Files:

• classes/ToolkitOptions.cpp (modified) (1 diff)
• modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp

@@ -22 +22 @@
 
         /*copy options into toolkitoptions:*/
-        _assert_(tokenlist);
+        _assert_(options);
         toolkitoptions= xNew<char>(strlen(options)+1); 
         sprintf(toolkitoptions,   "%s",options);

issm/trunk-jpl/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,analysis_type;
-        IssmDouble*  vertices_potentially_ungrounding = NULL;
-        IssmDouble*  vertices_ungrounding             = NULL;
-        IssmDouble*  old_floatingice                  = NULL;
-        Vector<IssmDouble>*      vec_old_floatingice              = NULL;
-        Element* element                          = NULL;
+        int                 migration_style,analysis_type;
+        IssmDouble         *vertices_potentially_ungrounding = NULL;
+        IssmDouble         *vertices_ungrounding             = NULL;
+        IssmDouble         *old_floatingice                  = NULL;
+        Vector<IssmDouble> *vec_old_floatingice              = NULL;
+        Element            *element                          = NULL;
 
         if(VerboseModule()) _pprintLine_("   Migrating grounding line");
@@ -27 +27 @@
 
         if(migration_style==NoneEnum) return;
-        if(migration_style!=AgressiveMigrationEnum && migration_style!=SoftMigrationEnum && migration_style!=SubelementMigrationEnum && migration_style!=SubelementMigration2Enum) _error_(EnumToStringx(migration_style) << " not supported yet!");
+
+        if(migration_style!=AgressiveMigrationEnum  &&
+                migration_style!=SoftMigrationEnum       &&
+                migration_style!=SubelementMigrationEnum &&
+                migration_style!=SubelementMigration2Enum)
+         _error_("Grounding line migration "<<EnumToStringx(migration_style) << " not supported yet!");
+
+        /*Set toolkit to default*/
+        ToolkitsOptionsFromAnalysis(parameters,NoneAnalysisEnum);
 
         if(migration_style==SoftMigrationEnum){
@@ -42 +50 @@
 
         /*Migrate grounding line : */
-        for(i=0;i<elements->Size();i++){
+        for(int i=0;i<elements->Size();i++){
                 element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
                 element->MigrateGroundingLine(old_floatingice,vertices_ungrounding);