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

Timestamp:

05/28/14 16:26:33 (11 years ago)

Author:

seroussi

Message:

NEW: reorganizing basal melting

File:

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

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

@@ -2990 +2990 @@
 
         int        i,migration_style;
-        bool       oldfloating;
-        bool       floatingelement = false;
         bool       groundedelement = false;
-        IssmDouble bed_hydro,yts,gl_melting_rate;
+        IssmDouble bed_hydro,yts;
         IssmDouble rho_water,rho_ice,density;
         IssmDouble melting[NUMVERTICES],phi[NUMVERTICES];;
@@ -3000 +2998 @@
         /*Recover info at the vertices: */
         parameters->FindParam(&migration_style,GroundinglineMigrationEnum);
-        parameters->FindParam(&gl_melting_rate,GroundinglineMeltingRateEnum);
         parameters->FindParam(&yts,ConstantsYtsEnum);
         GetInputListOnVertices(&h[0],ThicknessEnum);
@@ -3010 +3007 @@
         rho_ice     = matpar->GetRhoIce();
         density     = rho_ice/rho_water;
-        oldfloating = this->IsFloating(); //figure out if element is floating before we start to change everything
 
         if(migration_style == ContactEnum){
@@ -3023 +3019 @@
                         }
                 }
-
-                /*Add basal melting rate if element just ungrounded*/
-                for(i=0;i<NUMVERTICES;i++){
-                        if(phi[i]<0.){
-                                floatingelement=true;
-                                break;
-                        }
-                }
-                if(!oldfloating && floatingelement==true){
-                        for(i=0;i<NUMVERTICES;i++) melting[i]=gl_melting_rate/yts;
-                        this->inputs->AddInput(new TriaInput(BasalforcingsMeltingRateEnum,&melting[0],P1Enum));
-                } 
 
                 /*Update inputs*/
@@ -3085 +3069 @@
         this->inputs->AddInput(new TriaInput(MaskGroundediceLevelsetEnum,&phi[0],P1Enum));
 
-        /*SubelementMigrationEnum: if one grounded, all grounded*/
-        if(migration_style==SubelementMigrationEnum || migration_style==SubelementMigration2Enum){
-                for(i=0;i<NUMVERTICES;i++){
-                        if(phi[i]>0.){
-                                groundedelement=true;
-                                break;
-                        }
-                }
-                floatingelement=!groundedelement;
-        }
-        else{
-                /*Otherwise: if one floating, all floating*/
-                for(i=0;i<NUMVERTICES;i++){
-                        if(phi[i]<=0.){
-                                floatingelement=true;
-                                break;
-                        }
-                }
-        }
-
-        /*Add basal melting rate if element just ungrounded*/
-        if(!oldfloating && floatingelement==true){
-                for(i=0;i<NUMVERTICES;i++)melting[i]=gl_melting_rate/yts;
-                this->inputs->AddInput(new TriaInput(BasalforcingsMeltingRateEnum,&melting[0],P1Enum));
-        } 
-
         /*Update inputs*/
         this->inputs->AddInput(new TriaInput(SurfaceEnum,&s[0],P1Enum));