Changeset 16758

Timestamp:

11/14/13 09:56:17 (11 years ago)

Author:

bdef

Message:

CHG : cleanup and change in mask update

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Tria.cpp (modified) (1 diff)
• solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/classes/Elements/Tria.cpp

@@ -7356 +7356 @@
                 /*If mask was alread one, keep one*/
                 else if(old_active[i]>0.){
-                        if(epl_thickness[i]>0.0){
-                                vec_mask->SetValue(nodes[i]->Sid(),1.,INS_VAL);
-                        }
-                        else{
-                                vec_mask->SetValue(nodes[i]->Sid(),0.,INS_VAL);
-                        }
+                        vec_mask->SetValue(nodes[i]->Sid(),1.,INS_VAL);
+                }
+                /*If epl thickness gets under 0, close the layer*/
+                else if(epl_thickness[i]<0.0){
+                        vec_mask->SetValue(nodes[i]->Sid(),0.,INS_VAL);
                 }
                 /*Increase of the efficient system is needed if the epl head reach the maximum value (sediment max value for now)*/

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp

@@ -118 +118 @@
                 if(isefficientlayer){
 
-                        /*Start by retrieving the EPL head slopes*/
-                        /* if(VerboseSolution()) _printf0_("computing EPL Head slope...\n"); */
-                        /* femmodel->SetCurrentConfiguration(L2ProjectionEPLAnalysisEnum); */
-                        /* femmodel->parameters->SetParam(EplHeadSlopeXEnum,InputToL2ProjectEnum); */
-                        /* solutionsequence_linear(femmodel); */
-                        /* femmodel->parameters->SetParam(EplHeadSlopeYEnum,InputToL2ProjectEnum); */
-                        /* solutionsequence_linear(femmodel); */
-                        
                         femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
                         InputUpdateFromConstantx(femmodel,true,ResetPenaltiesEnum);