Changeset 20156 for issm/trunk-jpl/src/c/classes/Loads/Friction.cpp

Timestamp:

02/13/16 22:17:14 (9 years ago)

Author:

Eric.Larour

Message:

CHG: introduced sealevel in the friction (Neff), the neumann boundary conditions (StressbalanceAnalysis), the grouding
line dynamics (MigrateGroundingLIne of Element.cpp) and in the update of free surfaces (MasstransportAnalysis).

File:

• issm/trunk-jpl/src/c/classes/Loads/Friction.cpp (modified) (15 diffs)

issm/trunk-jpl/src/c/classes/Loads/Friction.cpp ¶

@@ -67 +67 @@
         IssmDouble  Neff;
         IssmDouble  drag_coefficient;
-        IssmDouble  bed,thickness;
+        IssmDouble  bed,thickness,sealevel;
         IssmDouble  alpha_complement;
 
@@ -75 +75 @@
         element->GetInputValue(&thickness, gauss,ThicknessEnum);
         element->GetInputValue(&bed, gauss,BaseEnum);
+        element->GetInputValue(&sealevel, gauss,SealevelEnum);
         element->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum);
         IssmDouble rho_water   = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
@@ -85 +86 @@
 
         //From bed and thickness, compute effective pressure when drag is viscous:
-        Neff=gravity*(rho_ice*thickness+rho_water*bed);
+        Neff=gravity*(rho_ice*thickness+rho_water*(bed-sealevel));
         if(Neff<0)Neff=0;
 
@@ -231 +232 @@
         IssmDouble  drag_p, drag_q;
         IssmDouble  Neff;
-        IssmDouble  thickness,base,bed,floatation_thickness;
+        IssmDouble  thickness,base,bed,floatation_thickness,sealevel;
         IssmDouble  vx,vy,vz,vmag;
         IssmDouble  drag_coefficient,drag_coefficient_coulomb;
@@ -241 +242 @@
         element->GetInputValue(&thickness, gauss,ThicknessEnum);
         element->GetInputValue(&base, gauss,BaseEnum);
+        element->GetInputValue(&sealevel, gauss,SealevelEnum);
         element->GetInputValue(&bed, gauss,BedEnum);
         element->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum);
@@ -253 +255 @@
 
         //From base and thickness, compute effective pressure when drag is viscous:
-        Neff=gravity*(rho_ice*thickness+rho_water*base);
+        Neff=gravity*(rho_ice*thickness+rho_water*(base-sealevel));
         if(Neff<0)Neff=0;
 
@@ -407 +409 @@
         IssmDouble  drag_p, drag_q;
         IssmDouble  Neff;
-        IssmDouble  thickness,bed;
+        IssmDouble  thickness,base,sealevel;
         IssmDouble  vx,vy,vz,vmag;
         IssmDouble  drag_coefficient;
@@ -416 +418 @@
         element->GetInputValue(&drag_q,FrictionQEnum);
         element->GetInputValue(&thickness, gauss,ThicknessEnum);
-        element->GetInputValue(&bed, gauss,BaseEnum);
+        element->GetInputValue(&base, gauss,BaseEnum);
+        element->GetInputValue(&sealevel, gauss,SealevelEnum);
         element->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum);
         IssmDouble rho_water   = element->GetMaterialParameter(MaterialsRhoSeawaterEnum);
@@ -426 +429 @@
         s=1./drag_p;
 
-        //From bed and thickness, compute effective pressure when drag is viscous:
-        Neff=gravity*(rho_ice*thickness+rho_water*bed);
+        //From base and thickness, compute effective pressure when drag is viscous:
+        Neff=gravity*(rho_ice*thickness+rho_water*(base-sealevel));
         if(Neff<0)Neff=0;
 
@@ -467 +470 @@
         IssmDouble  drag_p, drag_q;
         IssmDouble  Neff,F;
-        IssmDouble  thickness,bed;
+        IssmDouble  thickness,bed,sealevel;
         IssmDouble  vx,vy,vz,vmag;
         IssmDouble  drag_coefficient,water_layer;
@@ -478 +481 @@
         element->GetInputValue(&thickness, gauss,ThicknessEnum);
         element->GetInputValue(&bed, gauss,BaseEnum);
+        element->GetInputValue(&sealevel, gauss,SealevelEnum);
         element->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum);
         element->GetInputValue(&water_layer, gauss,FrictionWaterLayerEnum);
@@ -490 +494 @@
         //From bed and thickness, compute effective pressure when drag is viscous:
         if(bed>0) bed=0;
-        if(water_layer==0) Neff=gravity*rho_ice*thickness+gravity*rho_water*bed;
+        if(water_layer==0) Neff=gravity*rho_ice*thickness+gravity*rho_water*(bed-sealevel);
         else if(water_layer>0) Neff=gravity*rho_ice*thickness*F;
         else _error_("negative water layer thickness");
@@ -599 +603 @@
         IssmDouble  Neff;
         IssmDouble  drag_coefficient;
-        IssmDouble  bed,thickness,head;
+        IssmDouble  bed,thickness,head,sealevel;
         IssmDouble  alpha2;
 
@@ -606 +610 @@
         element->GetInputValue(&bed, gauss,BaseEnum);
         element->GetInputValue(&head, gauss,HydrologyHeadEnum);
+        element->GetInputValue(&sealevel, gauss,SealevelEnum);
         element->GetInputValue(&drag_coefficient, gauss,FrictionCoefficientEnum);
         IssmDouble rho_water   = element->GetMaterialParameter(MaterialsRhoFreshwaterEnum);
@@ -613 +618 @@
         //From bed and thickness, compute effective pressure when drag is viscous:
         pressure_ice   = rho_ice*gravity*thickness;
-        pressure_water = rho_water*gravity*(head-bed);
+        pressure_water = rho_water*gravity*(head-bed+sealevel);
         Neff=pressure_ice-pressure_water;
         if(Neff<0.) Neff=0.;