Changeset 15978

Timestamp:

08/27/13 14:40:37 (12 years ago)

Author:

seroussi

Message:

CHG: IsFloating now based on groundedice_levelset

Location:

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

Files:

• Penta.cpp (modified) (1 diff)
• Tria.cpp (modified) (1 diff)

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

@@ -2744 +2744 @@
 bool   Penta::IsFloating(){
 
-        bool onshelf;
-        inputs->GetInputValue(&onshelf,MaskElementonfloatingiceEnum);
-        return onshelf;
+        bool shelf;
+        int  migration_style;
+        parameters->FindParam(&migration_style,GroundinglineMigrationEnum);
+
+        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==NoneEnum || migration_style==AgressiveMigrationEnum || migration_style==SoftMigrationEnum){ //Floating if all nodes are floating
+                if(this->inputs->Min(MaskGroundediceLevelsetEnum) > 0.) shelf=false;
+                else shelf=true;
+        }
+        else _error_("migration_style not implemented yet");
+
+        return shelf;
 }
 /*}}}*/

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

@@ -1958 +1958 @@
 
         bool shelf;
-        inputs->GetInputValue(&shelf,MaskElementonfloatingiceEnum);
+        int  migration_style;
+        parameters->FindParam(&migration_style,GroundinglineMigrationEnum);
+
+        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==NoneEnum || migration_style==AgressiveMigrationEnum || migration_style==SoftMigrationEnum){ //Floating if all nodes are floating
+                if(this->inputs->Min(MaskGroundediceLevelsetEnum) > 0.) shelf=false;
+                else shelf=true;
+        }
+        else _error_("migration_style not implemented yet");
+
         return shelf;
 }