Changeset 18805

Timestamp:

11/18/14 13:43:40 (10 years ago)

Author:

seroussi

Message:

CHG: improved water_layer friction law

Location:

issm/trunk-jpl

Files:

• src/c/classes/Loads/Friction.cpp (modified) (1 diff)
• test/Archives/Archive438.nc (modified) ( previous)
• test/Archives/Archive439.nc (modified) ( previous)

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

@@ -290 +290 @@
 
         //From bed and thickness, compute effective pressure when drag is viscous:
-        Neff=gravity*(rho_ice*thickness+rho_water*(bed+water_layer));
-        if(Neff<0)Neff=0;
+        if(bed>0) bed=0;
+        Neff=gravity*(rho_ice*thickness+rho_water*(bed-water_layer));
+        if(Neff<0) Neff=0;
 
         switch(dim){