Changeset 16360

Timestamp:

10/10/13 07:29:57 (11 years ago)

Author:

jbondzio

Message:

CHG: exclude buggy drainage of water for now. Update archives.

Location:

issm/trunk-jpl

Files:

• src/c/modules/PostprocessingEnthalpyx/PostprocessingEnthalpyx.cpp (modified) (1 diff)
• src/c/shared/Elements/DrainageFunctionWaterfraction.cpp (modified) (1 diff)
• test/Archives/Archive121.nc (modified) ( previous)
• test/Archives/Archive122.nc (modified) ( previous)
• test/Archives/Archive326.nc (modified) ( previous)
• test/Archives/Archive327.nc (modified) ( previous)
• test/Archives/Archive431.nc (modified) ( previous)
• test/Archives/Archive432.nc (modified) ( previous)

issm/trunk-jpl/src/c/modules/PostprocessingEnthalpyx/PostprocessingEnthalpyx.cpp

@@ -19 +19 @@
 
         /*drain excess water fraction: */
-        for (i=0;i<femmodel->elements->Size();i++){
+        /*for (i=0;i<femmodel->elements->Size();i++){
                 element=dynamic_cast<Element*>(femmodel->elements->GetObjectByOffset(i));
                 element->DrainWaterfraction();
         }
+        */
 
         /*Update basal dirichlet BCs for enthalpy: */

issm/trunk-jpl/src/c/shared/Elements/DrainageFunctionWaterfraction.cpp

@@ -9 +9 @@
 /*FUNCTION IssmDouble DrainageFunctionWaterfraction()*/
 IssmDouble DrainageFunctionWaterfraction(IssmDouble waterfraction, IssmDouble dt=0.){
-    /* DrainageFunctionWaterfraction returns how much of the waterfraction is drained per year */
-    _assert_(waterfraction>=0.);
-    _assert_(dt>=0.);
+        /* DrainageFunctionWaterfraction returns how much of the waterfraction is drained per year */
+        _assert_(waterfraction>=0.);
+        _assert_(dt>=0.);
 
-    IssmDouble w0=0.01, w1=0.02, w2=0.03;
-    IssmDouble Dret, D0=0, D1=0.005, D2=0.05;
-                IssmDouble yts=365*24*60*60;
-                dt/=yts;
+        IssmDouble w0=0.01, w1=0.02, w2=0.03;
+        IssmDouble Dret, D0=0, D1=0.005, D2=0.05;
+        IssmDouble yts=365*24*60*60;
+        dt/=yts;
 
-    /*get drainage function value*/
-    if((w0==w1)||(w1==w2)||(w0==w2))
-        _error_("Error: equal ordinates in DrainageFunctionWaterfraction -> division by zero. Abort");
-    if(waterfraction<=w0)
-        Dret=D0;
-    if((waterfraction>w0) && (waterfraction<=w1))
-        Dret=(D1-D0)/(w1-w0)*(waterfraction-w0)+D0;
-    if((waterfraction>w1) && (waterfraction<=w2))
-        Dret=(D2-D1)/(w2-w1)*(waterfraction-w1)+D1;
-    else 
-        Dret=D2;
+        /*get drainage function value*/
+        if((w0==w1)||(w1==w2)||(w0==w2))
+                _error_("Error: equal ordinates in DrainageFunctionWaterfraction -> division by zero. Abort");
+        if(waterfraction<=w0)
+                Dret=D0;
+        if((waterfraction>w0) && (waterfraction<=w1))
+                Dret=(D1-D0)/(w1-w0)*(waterfraction-w0)+D0;
+        if((waterfraction>w1) && (waterfraction<=w2))
+                Dret=(D2-D1)/(w2-w1)*(waterfraction-w1)+D1;
+        else 
+                Dret=D2;
 
-    /*check if dt*Dret>waterfraction. If so, drain whole waterfraction*/
-    if(dt==0.){
-      if(Dret>waterfraction)
-        return waterfraction;
-      else
-        return Dret;
-    }
-    else{
-      if(dt*Dret>waterfraction)
-        return waterfraction;
-      else
-        return dt*Dret;
-    }
+        /*check if dt*Dret>waterfraction. If so, drain whole waterfraction*/
+        if(dt==0.){
+                if(Dret>waterfraction)
+                        return waterfraction;
+                else
+                        return Dret;
+        }
+        else{
+                if(dt*Dret>waterfraction)
+                        return waterfraction;
+                else
+                        return dt*Dret;
+        }
 }