Changeset 18726

Timestamp:

11/03/14 15:19:49 (10 years ago)

Author:

bdef

Message:

BUG: modification in solutionsequence flowpath

Location:

issm/trunk-jpl/src/c

Files:

• classes/FemModel.cpp (modified) (1 diff)
• solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (8 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -1914 +1914 @@
         if(VerboseSolution()) _printf0_("   Number of active nodes L2 Projection: "<< counter <<"\n");
 
+        /*+++++++this is done in the solution sequence+++++++++++++++*/
         /*Update dof indexings*/
-        this->UpdateConstraintsx();
-}
-/*}}}*/
+        //      this->UpdateConstraintsx();
+        /*++++++++++++++++++++++++++*/
+}
+/*}}}*/

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

@@ -94 +94 @@
                 ResetConstraintsx(femmodel);
 
-                /* {{{ *//*Treating the sediment*/
+                /*{{{*//*Treating the sediment*/
                 for(;;){
                         sedconverged=false;
                         uf_sed_sub_iter=uf_sed->Duplicate();_assert_(uf_sed_sub_iter);
                         uf_sed->Copy(uf_sed_sub_iter);
-                        /* {{{ *//*Loop on the sediment layer to deal with the penalization*/
+                        /*{{{*//*Loop on the sediment layer to deal with the penalization*/
                         for(;;){
-                                /* {{{ *//*Core of the computation*/
+                                /*{{{*/ /*Core of the computation*/
                                 if(VerboseSolution()) _printf0_("Building Sediment Matrix...\n");
                                 SystemMatricesx(&Kff,&Kfs,&pf,&df,&sediment_kmax,femmodel);
@@ -113 +113 @@
                                 InputUpdateFromSolutionx(femmodel,ug_sed);
                                 ConstraintsStatex(&constraints_converged,&num_unstable_constraints,femmodel);
-                                /* }}} */
+                                /*}}}*/
                                 if (!sedconverged){
                                         if(VerboseConvergence()) _printf0_("   # Sediment unstable constraints = " << num_unstable_constraints << "\n");
@@ -126 +126 @@
                         }
                 
-                        /* }}} *//*End of the sediment penalization loop*/
+                        /*}}}*//*End of the sediment penalization loop*/
                         /*Update EPL mask*/
-                        if(isefficientlayer){
-                                inefanalysis->ElementizeEplMask(femmodel);
-                        }
+                        
+                        /*++++++This is probably useless+++++++*/
+                        /* if(isefficientlayer){ */
+                        /*      inefanalysis->ElementizeEplMask(femmodel); */
+                        /* } */
+                        /*+++++++++++++*/
+
                         sedconverged=false;
                         
@@ -156 +160 @@
                         }
                 }
-                /* }}} *//*End of the global sediment loop*/
-                /* {{{ *//*Now dealing with the EPL in the same way*/
+                /*}}}*//*End of the global sediment loop*/
+                /*{{{*//*Now dealing with the EPL in the same way*/
                 if(isefficientlayer){
                         femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
                         /*updating mask*/
                         femmodel->HydrologyEPLupdateDomainx();
+                        inefanalysis->ElementizeEplMask(femmodel);
                         InputUpdateFromConstantx(femmodel,true,ResetPenaltiesEnum);
                         InputUpdateFromConstantx(femmodel,false,ConvergedEnum);
@@ -170 +175 @@
                                 ug_epl_sub_iter=ug_epl->Duplicate();_assert_(ug_epl_sub_iter);
                                 ug_epl->Copy(ug_epl_sub_iter);
-                                /* {{{ *//*Retrieve the EPL head slopes and compute EPL Thickness*/
+                                /*{{{*//*Retrieve the EPL head slopes and compute EPL Thickness*/
                                 if(VerboseSolution()) _printf0_("computing EPL Head slope...\n");
-                                inefanalysis->ElementizeEplMask(femmodel);
+                                //                              inefanalysis->ElementizeEplMask(femmodel);
                                 femmodel->SetCurrentConfiguration(L2ProjectionEPLAnalysisEnum);
                                 femmodel->UpdateConstraintsL2ProjectionEPLx();
@@ -180 +185 @@
                                 femmodel->parameters->SetParam(EplHeadSlopeYEnum,InputToL2ProjectEnum);
                                 solutionsequence_linear(femmodel);
+
                                 femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
-
                                 effanalysis->ComputeEPLThickness(femmodel);
-
                                 //updating mask after the computation of the epl thickness (Allow to close too thin EPL)
                                 femmodel->HydrologyEPLupdateDomainx();
                                 inefanalysis->ElementizeEplMask(femmodel);
-                                /* }}} */
+                                /*}}}*/
                                         
                                 if(VerboseSolution()) _printf0_("Building EPL Matrix...\n");
@@ -229 +233 @@
                         }
                 }
-                /* }}} */ /*End of the global EPL loop*/
-
-                /* {{{ */ /*Now dealing with the convergence of the whole system*/
+                /*}}}*/ /*End of the global EPL loop*/
+
+                /*{{{*/ /*Now dealing with the convergence of the whole system*/
                 if(!hydroconverged){
                         //compute norm(du)/norm(u)
@@ -271 +275 @@
                 if(hydroconverged)break;
         }
-        /* }}} */
+        /*}}}*/
         if(isefficientlayer)InputUpdateFromSolutionx(femmodel,ug_epl);
         femmodel->SetCurrentConfiguration(HydrologyDCInefficientAnalysisEnum);