Changeset 21433

Timestamp:

12/05/16 10:39:12 (8 years ago)

Author:

bdef

Message:

BUG: fixing cleaning bug

Location:

issm/trunk-jpl/src/c/analyses

Files:

• HydrologyDCEfficientAnalysis.cpp (modified) (3 diffs)
• HydrologyDCInefficientAnalysis.cpp (modified) (3 diffs)

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

@@ -106 +106 @@
 
 void HydrologyDCEfficientAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
-        /*Nothing for now*/
 
         /*Do we really want DC?*/
@@ -152 +151 @@
 
         int*     eplzigzag_counter=NULL;
+        Element* element=NULL;
         femmodel->parameters->FindParam(&eplzigzag_counter,NULL,EplZigZagCounterEnum);
         for(int i=0;i<femmodel->nodes->Size();i++){
@@ -377 +377 @@
         for(int iv=0;iv<numvertices;iv++){
                 gauss->GaussVertex(iv);
-
                 connectivity = IssmDouble(basalelement->VertexConnectivity(iv));
                 residual_input->GetInputValue(&residual,gauss);
                 pe->values[iv]+=residual/connectivity;
-
         }
 

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

@@ -303 +303 @@
         IssmDouble *xyz_list             = NULL;
         Input*      active_element_input = NULL;
+        Input*      old_wh_input = NULL;
 
         /*Fetch number of nodes and dof for this finite element*/
@@ -321 +322 @@
         Input* base_input                 = basalelement->GetInput(BaseEnum);
         Input* water_input        = basalelement->GetInput(BasalforcingsGroundediceMeltingRateEnum); _assert_(water_input);
-
+        if(dt!= 0.){old_wh_input = basalelement->GetInput(SedimentHeadOldEnum);                  _assert_(old_wh_input);}
         /*Transfer related Inputs*/
         if(isefficientlayer){
@@ -358 +359 @@
                 /*Transient and transfer terms*/
                 if(dt!=0.){
+                        old_wh_input->GetInputValue(&water_head,gauss);
                         sediment_storing = SedimentStoring(basalelement,gauss,sed_head_input,base_input);
                         if(isefficientlayer){