Changeset 21506

Timestamp:

02/01/17 13:55:03 (8 years ago)

Author:

aleahsommers

Message:

CHG: changed basal water flux to be properly calculated over elements

File:

• issm/trunk-jpl/src/c/analyses/HydrologySommersAnalysis.cpp (modified) (4 diffs)

issm/trunk-jpl/src/c/analyses/HydrologySommersAnalysis.cpp ¶

@@ -392 +392 @@
         element->AddInput(HydrologyReynoldsEnum,&reynolds,P0Enum);
 
-        /*Calculate basal flux for output*/
-        IssmDouble q = conductivity*sqrt(dh[0]*dh[0]+dh[1]*dh[1]);
-        element->AddInput(HydrologyBasalFluxEnum,&q,P1Enum);
-
         /*Free resources:*/
         xDelete<IssmDouble>(values);
@@ -454 +450 @@
         IssmDouble* xyz_list = NULL;
    IssmDouble  dpressure_water[2],dbed[2],PMPheat;
+        IssmDouble q = 0.;
 
         /*Retrieve all inputs and parameters*/
@@ -540 +537 @@
                                         ));
                 totalweights +=gauss->weight*Jdet;
+
+                /* Compute basal water flux */
+      q += gauss->weight*Jdet*(conductivity*sqrt(dh[0]*dh[0]+dh[1]*dh[1]));
         }
 
@@ -550 +550 @@
         if(newgap>thickness)
          newgap = thickness;
-        
          
         /*Add new gap as an input*/
         element->AddInput(HydrologyGapHeightEnum,&newgap,P0Enum);
+ 
+        /*Divide by connectivity, add basal flux as an input*/
+        q = q/totalweights;
+        element->AddInput(HydrologyBasalFluxEnum,&q,P0Enum);
 
         /*Clean up and return*/