Changeset 18861

Timestamp:

11/25/14 14:30:24 (10 years ago)

Author:

hongjuy

Message:

Adding GroundingOnlyEnum for groundingline migration

Location:

issm/trunk-jpl/src

Files:

• c/classes/Elements/Element.cpp (modified) (3 diffs)
• c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp (modified) (2 diffs)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• m/classes/groundingline.m (modified) (1 diff)
• m/classes/groundingline.py (modified) (1 diff)

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

@@ -1098 +1098 @@
                 else shelf=true;
         }
-        else if(migration_style==NoneEnum || migration_style==AggressiveMigrationEnum || migration_style==SoftMigrationEnum){ //Floating if all nodes are floating
+        else if(migration_style==NoneEnum || migration_style==AggressiveMigrationEnum || migration_style==SoftMigrationEnum || migration_style==GroundingOnlyEnum){ //Floating if all nodes are floating
                 if(this->inputs->Min(MaskGroundediceLevelsetEnum) > 0.) shelf=false;
                 else shelf=true;
@@ -1233 +1233 @@
                         if(phi[i]>=0.) b[i]=r[i];
                 }
+                else if(migration_style == GroundingOnlyEnum && b[i]<r[i]) b[i]=r[i];
                 /*Ice shelf: if bed below bathymetry, impose it at the bathymetry and update surface, elso do nothing */
                 else if(phi[i]<=0.){
@@ -1255 +1256 @@
                                 }
                                 else{
-                                        if(migration_style!=SoftMigrationEnum) _error_("Error: migration should be Aggressive, Soft or Subelement");
+                                        if(migration_style!=SoftMigrationEnum && migration_style!=ContactEnum && migration_style!=GroundingOnlyEnum) _error_("Error: migration should be Aggressive, Soft, Subelement, Contact or GroundingOnly");
                                 }
                         }

issm/trunk-jpl/src/c/modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp

@@ -39 +39 @@
                 case SubelementMigrationEnum:
                 case SubelementMigration2Enum:
+                case GroundingOnlyEnum:
                         /*Nothing additional to do here, MigrateGroundingLine takes care of everything*/
                         break;
@@ -81 +82 @@
         serial_vertexgrounded=vertexgrounded->ToMPISerial();
         serial_vertexfloating=vertexfloating->ToMPISerial();
-
-        /*find vertices on GL */
         for(int i=0;i<numberofvertices;i++){
-                if(serial_vertexgrounded[i]==1. && serial_vertexfloating[i]==1.){
-                        phi[i]=0.;
-                }
-                else if(serial_vertexgrounded[i]==1.){
-                        phi[i]=1.;
-                }
-                else if(serial_vertexfloating[i]==1.){
-                        phi[i]=-1.;
-                }
-                else{
-                        phi[i]=9999.;
-                }
+                        if (serial_vertexgrounded[i]==1. && serial_vertexfloating[i]==1.) phi[i]=0.;
+                        else if (serial_vertexgrounded[i]==1) phi[i]=1;
+                        else if (serial_vertexfloating[i]==1) phi[i]=-1;
+                        else if (serial_vertexgrounded[i]>10) phi[i]=9999;
+                        else phi[i]=-9999;
         }
 

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -717 +717 @@
         SubelementMigration2Enum,
         ContactEnum,
+        GroundingOnlyEnum,
         MaskGroundediceLevelsetEnum,
         /*}}}*/

issm/trunk-jpl/src/m/classes/groundingline.m

@@ -40 +40 @@
                 function md = checkconsistency(obj,md,solution,analyses) % {{{
 
-                        md = checkfield(md,'fieldname','groundingline.migration','values',{'None' 'AggressiveMigration' 'SoftMigration' 'SubelementMigration' 'SubelementMigration2' 'Contact' 'None'});
+                        md = checkfield(md,'fieldname','groundingline.migration','values',{'None' 'AggressiveMigration' 'SoftMigration' 'SubelementMigration' 'SubelementMigration2' 'Contact' 'None' 'GroundingOnly'});
 
                         if ~strcmp(obj.migration,'None'),

issm/trunk-jpl/src/m/classes/groundingline.py

@@ -37 +37 @@
         def checkconsistency(self,md,solution,analyses):    # {{{
 
-                md = checkfield(md,'fieldname','groundingline.migration','values',['None','AggressiveMigration','SoftMigration','SubelementMigration','SubelementMigration2','Contact'])
+                md = checkfield(md,'fieldname','groundingline.migration','values',['None','AggressiveMigration','SoftMigration','SubelementMigration','SubelementMigration2','Contact','GroundingOnly'])
 
                 if not m.strcmp(self.migration,'None'):