Changeset 25252 for issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp

Timestamp:

07/10/20 10:50:37 (5 years ago)

Author:

jdquinn

Message:

BUG: Reverting recent changes until Basile can review

File:

• issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp

@@ -224 +224 @@
                 basalelement->NodalFunctions(basis,gauss);
 
-                epl_transmitivity = EplTransmitivity(basalelement,gauss,epl_thick_input);
-                epl_storing                             = EplStoring(basalelement,gauss,epl_thick_input);
+                epl_transmitivity = EplTransmitivity(basalelement,gauss,epl_thick_input,epl_head_input,base_input);
+                epl_storing                             = EplStoring(basalelement,gauss,epl_thick_input,epl_head_input,base_input);
 
                 /*Diffusivity*/
@@ -358 +358 @@
                 basalelement ->JacobianDeterminant(&Jdet,xyz_list,gauss);
                 basalelement ->NodalFunctions(basis,gauss);
-                epl_storing     = EplStoring(basalelement,gauss,epl_thick_input);
-                epl_transmitivity = EplTransmitivity(basalelement,gauss,epl_thick_input);
+                epl_storing     = EplStoring(basalelement,gauss,epl_thick_input,epl_head_input,base_input);
+                epl_transmitivity = EplTransmitivity(basalelement,gauss,epl_thick_input,epl_head_input,base_input);
 
                 /*Loading term*/
@@ -386 +386 @@
         for(int iv=0;iv<numvertices;iv++){
                 gauss->GaussVertex(iv);
-                epl_transmitivity = EplTransmitivity(basalelement,gauss,epl_thick_input);
+                epl_transmitivity = EplTransmitivity(basalelement,gauss,epl_thick_input,epl_head_input,base_input);
                 connectivity = IssmDouble(basalelement->VertexConnectivity(iv));
                 residual_input->GetInputValue(&residual,gauss);
@@ -453 +453 @@
 
 /*Intermediaries*/
-IssmDouble HydrologyDCEfficientAnalysis::EplStoring(Element* element,Gauss* gauss, Input2* epl_thick_input){/*{{{*/
+IssmDouble HydrologyDCEfficientAnalysis::EplStoring(Element* element,Gauss* gauss, Input2* epl_thick_input, Input2* epl_head_input, Input2* base_input){/*{{{*/
         IssmDouble epl_storing;
         IssmDouble water_sheet,storing;
@@ -484 +484 @@
         return storing;
 }/*}}}*/
-IssmDouble HydrologyDCEfficientAnalysis::EplTransmitivity(Element* element,Gauss* gauss, Input2* epl_thick_input){/*{{{*/
+IssmDouble HydrologyDCEfficientAnalysis::EplTransmitivity(Element* element,Gauss* gauss, Input2* epl_thick_input, Input2* epl_head_input, Input2* base_input){/*{{{*/
         IssmDouble epl_transmitivity;
         IssmDouble water_sheet;