Changeset 14372

Timestamp:

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

Author:

Mathieu Morlighem

Message:

CHG: fixing GL dynamics

File:

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

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

@@ -2192 +2192 @@
         }
 
-        /*If at least one vertex is now floating, the element is now floating*/
-        for(i=0;i<NUMVERTICES;i++){
-                if(migration_style==SubelementMigrationEnum){
+        /*SubelementMigrationEnum: if one grounded, all grounded*/
+        if(migration_style==SubelementMigrationEnum){
+                for(i=0;i<NUMVERTICES;i++){
                         if(nodes[i]->IsGrounded()){
                                 elementonsheet=true;
                                 break;
                         }
-                        phi[i]=h[i]+ba[i]/density;
-                        elementonshelf=!elementonsheet;
                 }
-                else{
+                elementonshelf=!elementonsheet;
+        }
+        else{
+                /*Otherwise: if one floating, all floating*/
+                for(i=0;i<NUMVERTICES;i++){
                         if(nodes[i]->IsFloating()){
                                 elementonshelf=true;
@@ -2220 +2222 @@
         this->inputs->AddInput(new TriaP1Input(SurfaceEnum,&s[0]));
         this->inputs->AddInput(new TriaP1Input(BedEnum,&b[0]));
-        if(migration_style==SubelementMigrationEnum) this->inputs->AddInput(new TriaP1Input(GLlevelsetEnum,&phi[0]));
+
+        /*Recalculate phi*/
+        if(migration_style==SubelementMigrationEnum){
+                for(i=0;i<NUMVERTICES;i++) phi[i]=h[i]+ba[i]/density;
+                this->inputs->AddInput(new TriaP1Input(GLlevelsetEnum,&phi[0]));
+        }
 }
 /*}}}*/