Changeset 17636 for issm/trunk-jpl/src/c/classes/Elements/Element.cpp

Timestamp:

04/03/14 16:00:44 (11 years ago)

Author:

hongjuy

Message:

CHG: (1) add constraint on vy if levelset == 0 (2) GL migration only allowed for the first grounded element that touches the GL

File:

• issm/trunk-jpl/src/c/classes/Elements/Element.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Element.cpp

@@ -666 +666 @@
         parameters->FindParam(&migration_style,GroundinglineMigrationEnum);
 
-        if(migration_style==SubelementMigrationEnum || migration_style==SubelementMigration2Enum){ //Floating if all nodes are floating
+        if(migration_style==SubelementMigrationEnum || migration_style==SubelementMigration2Enum || migration_style==ContactEnum){ //Floating if all nodes are floating
                 if(this->inputs->Max(MaskGroundediceLevelsetEnum) <= 0.) shelf=true;
                 else shelf=false;
         }
-        else if(migration_style==NoneEnum || migration_style==AgressiveMigrationEnum || migration_style==SoftMigrationEnum || migration_style==ContactEnum){ //Floating if all nodes are floating
+        else if(migration_style==NoneEnum || migration_style==AgressiveMigrationEnum || migration_style==SoftMigrationEnum){ //Floating if all nodes are floating
                 if(this->inputs->Min(MaskGroundediceLevelsetEnum) > 0.) shelf=false;
                 else shelf=true;