Changeset 18849

Timestamp:

11/25/14 10:29:14 (10 years ago)

Author:

hongjuy

Message:

CHG: for contact criterion, make sure that grounded elements may have min(levelset)==0

File:

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

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

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