Changeset 17636

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

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Element.cpp (modified) (1 diff)
• Tria.cpp (modified) (3 diffs)

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;

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

@@ -1345 +1345 @@
         if(!IsFloating()){ 
 
+                if(this->inputs->Max(MaskGroundediceLevelsetEnum)==0.){
+
                 this->StrainRateSSA(&epsilon[0],xyz_list,gauss,vx_input,vy_input);
                 this->ViscosityFS(&viscosity,2,xyz_list,gauss,vx_input,vy_input,NULL);
@@ -1370 +1372 @@
                 if (sigma_nn<water_pressure) grounded=true;
                 else                         grounded=false;
+                }
+                else{
+                        grounded=true;
+                }
         }
         else{
@@ -1707 +1713 @@
                         xz_plane[1]=sin(theta);       xz_plane[4]=0.;  
                         xz_plane[2]=0.;               xz_plane[5]=1.;          
-                        if(groundedice>0){
+                        if(groundedice>=0){
                                 this->nodes[i]->DofInSSet(1); //vy
                         }