Changeset 14373

Timestamp:

02/22/13 18:25:06 (12 years ago)

Author:

seroussi

Message:

BUG: fixed subelement grounding line

File:

• issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/objects/Elements/Tria.cpp

@@ -2176 +2176 @@
                         if (bed_hydro>ba[i]){
                                 /*Unground only if the element is connected to the ice shelf*/
-                                if(migration_style==AgressiveMigrationEnum){
+                                if(migration_style==AgressiveMigrationEnum || migration_style==SubelementMigrationEnum){
                                         s[i]=(1-density)*h[i];
                                         b[i]=-density*h[i];
@@ -2187 +2187 @@
                                         nodes[i]->inputs->AddInput(new BoolInput(MaskVertexonfloatingiceEnum,true));
                                         nodes[i]->inputs->AddInput(new BoolInput(MaskVertexongroundediceEnum,false));
+                                }
+                                else{
+                                        if(migration_style!=SoftMigrationEnum) _error_("Error: migration should be Aggressive, Soft or Subelement");
                                 }
                         }