Index: /issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp
===================================================================
--- /issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp	(revision 14686)
+++ /issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp	(revision 14687)
@@ -22,5 +22,5 @@
 
 	/*copy options into toolkitoptions:*/
-	_assert_(tokenlist);
+	_assert_(options);
 	toolkitoptions= xNew<char>(strlen(options)+1); 
 	sprintf(toolkitoptions,   "%s",options);
Index: /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp	(revision 14686)
+++ /issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp	(revision 14687)
@@ -13,10 +13,10 @@
 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,5 +27,13 @@
 
 	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,5 +50,5 @@
 
 	/*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);