Changeset 21476

Timestamp:

01/10/17 08:27:08 (8 years ago)

Author:

bdef

Message:

CHG:Optimizing convergence

Location:

issm/trunk-jpl/src/c

Files:

• analyses/HydrologyDCEfficientAnalysis.cpp (modified) (3 diffs)
• analyses/HydrologyDCInefficientAnalysis.cpp (modified) (2 diffs)
• solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (2 diffs)

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

@@ -679 +679 @@
                         }
                 }
-                /*If mask was already one, keep one or colapse*/
-                else if(old_active[i]>0.){
-                        vec_mask->SetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL);
-                        /* If epl thickness gets under colapse thickness, close the layer */
-                        if(epl_thickness[i]<colapse_thick){
-                                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*/
-                        else if(eplhead[i]<base[i]){
-                                vec_mask->SetValue(basalelement->nodes[i]->Sid(),0.,INS_VAL);
-                                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)*/
                 GetHydrologyDCInefficientHmax(&h_max,basalelement,basalelement->nodes[i]);
@@ -705 +691 @@
                                 }
                         }
+                }
+                /*If mask was already one, keep one or colapse*/
+                else if(old_active[i]>0.){
+                        vec_mask->SetValue(basalelement->nodes[i]->Sid(),1.,INS_VAL);
+                        /* If epl thickness gets under colapse thickness, close the layer */
+                        if(epl_thickness[i]<colapse_thick){
+                                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*/
+                        /* 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); */
+                        /* }*/
                 }
         }
@@ -760 +760 @@
         base_input->GetInputValue(&base_elev,gauss);
 
-        water_sheet=max(0.0,(prestep_head-base_elev));
+        //water_sheet=max(0.0,(prestep_head-base_elev));
+        water_sheet=prestep_head-base_elev;
         
         //epl_transmitivity=epl_conductivity*epl_thickness;
+        //if (element->Sid()==8)printf("water sheet is %f for Elt %i\n",water_sheet,element->Sid());
         epl_transmitivity=epl_conductivity*min(water_sheet,epl_thickness);
         return epl_transmitivity;

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

@@ -525 +525 @@
         sed_head_input->GetInputValue(&prestep_head,gauss);
         water_sheet=max(0.0,(prestep_head-(base_elev-sediment_thickness)));
+
         storing=rho_freshwater*g*sediment_porosity*sediment_thickness*(water_compressibility+(sediment_compressibility/sediment_porosity));
         //porosity for unconfined region
@@ -550 +551 @@
         SedTrans_input->GetInputValue(&FullLayer_transmitivity,gauss);
         water_sheet=max(0.0,(prestep_head-(base_elev-sediment_thickness)));
+
         if (water_sheet<=sediment_thickness){
                 sediment_transmitivity=FullLayer_transmitivity*water_sheet/sediment_thickness;

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

@@ -158 +158 @@
                         femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
                         /*updating mask*/
+                        if(VerboseSolution()) _printf0_("==updating mask...\n");
                         femmodel->HydrologyEPLupdateDomainx(&ThickCount);
                         inefanalysis->ElementizeEplMask(femmodel);
@@ -181 +182 @@
                                 effanalysis->ComputeEPLThickness(femmodel);
                                 //updating mask after the computation of the epl thickness (Allow to close too thin EPL)
-                                /* femmodel->HydrologyEPLupdateDomainx(&ThickCount); */
-                                /* inefanalysis->ElementizeEplMask(femmodel); */
+                                femmodel->HydrologyEPLupdateDomainx(&ThickCount);
+                                inefanalysis->ElementizeEplMask(femmodel);
                                 /*}}}*/