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

Timestamp:

11/24/13 11:01:18 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving stuff to Element.cpp

File:

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

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

@@ -990 +990 @@
 }
 /*}}}*/
-/*FUNCTION Penta::GetMaterialParameter{{{*/
-IssmDouble Penta::GetMaterialParameter(int enum_in){
-
-        _assert_(this->matpar);
-        switch(enum_in){ // FIXME: change this to material
-                case MaterialsRheologyNEnum:
-                        return this->material->GetN();
-                case MaterialsRheologyBEnum:
-                        return this->material->GetB();
-                default:
-                        return this->matpar->GetMaterialParameter(enum_in);
-        }
-}
-/*}}}*/
 /*FUNCTION Penta::GetGroundedPart{{{*/
 void Penta::GetGroundedPart(int* point1,IssmDouble* fraction1,IssmDouble* fraction2, bool* mainlyfloating){
@@ -2342 +2328 @@
         }
         else return false;
-}
-/*}}}*/
-/*FUNCTION Penta::IsFloating{{{*/
-bool   Penta::IsFloating(){
-
-        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;
 }
 /*}}}*/