Changeset 24334

Timestamp:

11/15/19 15:49:23 (5 years ago)

Author:

Mathieu Morlighem

Message:

BUG: linear transition between lower and upperelevation did not account for uppermelt

File:

• issm/trunk-jpl/src/c/classes/Elements/Element.cpp (modified) (1 diff)

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

@@ -2280 +2280 @@
                 }
                 else{
-                        values[i]=deepwatermelt*(base[i]-upperwaterel)/(deepwaterel-upperwaterel);
+                        IssmDouble alpha = (base[i]-upperwaterel)/(deepwaterel-upperwaterel);
+                        values[i]=deepwatermelt*alpha+(1.-alpha)*upperwatermelt;
                 }
         }