Index: ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp =================================================================== --- ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 21488) +++ ../trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 21489) @@ -673,7 +673,7 @@ vec_mask->SetValue(basalelement->nodes[i]->Sid(),0.,INS_VAL); recurence->SetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL); } - /* If epl head gets under base elevation, close the layer */ + /* //If epl head gets under base elevation, close the layer */ /* else if(eplhead[i]<(base[i]-1.0e-8)){ */ /* vec_mask->SetValue(basalelement->nodes[i]->Sid(),0.,INS_VAL); */ /* recurence->SetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL); */ @@ -682,12 +682,12 @@ /*If node is now closed bring its thickness back to initial*/ if (old_active[i]==0.){ epl_thickness[i]=init_thick; - } - /*Activate if we have a residual from sediment*/ - if(residual[i]>0.){ - vec_mask->SetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL); - if(old_active[i]==0.){ - recurence->SetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL); + /*Activate if we have a residual from sediment*/ + if(residual[i]>0.){ + vec_mask->SetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL); + if(old_active[i]==0.){ + recurence->SetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL); + } } } /*Increase of the efficient system is needed if the epl head reach the maximum value (sediment max value for now)*/ @@ -702,7 +702,6 @@ } } } - } basalelement->AddInput(HydrologydcEplThicknessEnum,epl_thickness,basalelement->GetElementType()); @@ -744,8 +743,8 @@ /* else{ */ /* epl_storing=storing; */ /* } */ + /* return epl_storing; */ return storing; - //return epl_storing; }/*}}}*/ IssmDouble HydrologyDCEfficientAnalysis::EplTransmitivity(Element* element,Gauss* gauss, Input* epl_thick_input, Input* epl_head_input, Input* base_input){/*{{{*/ @@ -760,7 +759,7 @@ water_sheet=max(0.0,(prestep_head-base_elev)); epl_transmitivity=epl_conductivity*epl_thickness; - /* epl_transmitivity=max(1.0e-6,(epl_conductivity*min(water_sheet,epl_thickness))); */ + //epl_transmitivity=max(1.0e-6,(epl_conductivity*min(water_sheet,epl_thickness))); return epl_transmitivity; }/*}}}*/