Changeset 21489

Timestamp:

01/13/17 04:35:51 (8 years ago)

Author:

bdef

Message:

CHG:minor change in opening conditions

File:

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

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

@@ -674 +674 @@
                                 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); */
@@ -683 +683 @@
                 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);
+                                }
                         }
                 }
@@ -703 +703 @@
                         }
                 }
-                
         }
         basalelement->AddInput(HydrologydcEplThicknessEnum,epl_thickness,basalelement->GetElementType());
@@ -745 +744 @@
         /*      epl_storing=storing; */
         /* } */
+        /* return epl_storing; */
         return storing;
-        //return epl_storing;
 }/*}}}*/
 
@@ -761 +760 @@
         
         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;
 }/*}}}*/