Changeset 24313 for issm/trunk/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp

Timestamp:

11/01/19 12:01:57 (5 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 24310

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (9 diffs)

issm/trunk/src/c

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota

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

@@ -57 +57 @@
         if(!isefficientlayer) hydroconverged=true;
 
-        /*Retrieve inputs as the initial state for the non linear iteration*/
+        /*{{{*//*Retrieve inputs as the initial state for the non linear iteration*/
         GetSolutionFromInputsx(&ug_sed,femmodel);
         Reducevectorgtofx(&uf_sed, ug_sed, femmodel->nodes,femmodel->parameters);
@@ -65 +65 @@
                 femmodel->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
                 GetSolutionFromInputsx(&ug_epl,femmodel);
-                /*Initialize the element mask*/
+                /*Initialize the EPL element mask*/
                 inefanalysis->ElementizeEplMask(femmodel);
                 effanalysis->InitZigZagCounter(femmodel);
+                /*Initialize the IDS element mask*/
+                femmodel->SetCurrentConfiguration(HydrologyDCInefficientAnalysisEnum);
+                inefanalysis->ElementizeIdsMask(femmodel);
         }
+        /*}}}*/
         /*The real computation starts here, outermost loop is on the two layer system*/
         for(;;){
@@ -84 +88 @@
                 /*Loop on sediment layer to deal with transfer and head value*/
                 femmodel->SetCurrentConfiguration(HydrologyDCInefficientAnalysisEnum);
-                InputUpdateFromConstantx(femmodel,true,ResetPenaltiesEnum);
+                ResetZigzagCounterx(femmodel);
                 InputUpdateFromConstantx(femmodel,false,ConvergedEnum);
                 femmodel->UpdateConstraintsx();
@@ -98 +102 @@
                         /*{{{*//*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);
-                                CreateNodalConstraintsx(&ys,femmodel->nodes,HydrologyDCInefficientAnalysisEnum);
+                                CreateNodalConstraintsx(&ys,femmodel->nodes);
                                 Reduceloadx(pf,Kfs,ys); delete Kfs;
                                 delete uf_sed;
@@ -130 +134 @@
                         sedconverged=false;
 
-                        /*Checking convegence on the value of the sediment head*/
+                        /*Checking convergence on the value of the sediment head*/
                         duf=uf_sed_sub_iter->Duplicate();_assert_(duf);
                         uf_sed_sub_iter->Copy(duf);
@@ -160 +164 @@
                         if(VerboseSolution()) _printf0_("==updating mask...\n");
                         femmodel->HydrologyEPLupdateDomainx(&ThickCount);
-                        inefanalysis->ElementizeEplMask(femmodel);
-                        InputUpdateFromConstantx(femmodel,true,ResetPenaltiesEnum);
+                        ResetZigzagCounterx(femmodel);
                         InputUpdateFromConstantx(femmodel,false,ConvergedEnum);
 
@@ -172 +175 @@
                                 femmodel->SetCurrentConfiguration(L2ProjectionEPLAnalysisEnum);
                                 femmodel->UpdateConstraintsL2ProjectionEPLx(&L2Count);
-                                inefanalysis->ElementizeEplMask(femmodel);
                                 femmodel->parameters->SetParam(EplHeadSlopeXEnum,InputToL2ProjectEnum);
                                 solutionsequence_linear(femmodel);
@@ -182 +184 @@
                                 //updating mask after the computation of the epl thickness (Allow to close too thin EPL)
                                 femmodel->HydrologyEPLupdateDomainx(&ThickCount);
-                                inefanalysis->ElementizeEplMask(femmodel);
                                 /*}}}*/
 
                                 if(VerboseSolution()) _printf0_("Building EPL Matrix...\n");
                                 SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel);
-                                CreateNodalConstraintsx(&ys,femmodel->nodes,HydrologyDCEfficientAnalysisEnum);
+                                CreateNodalConstraintsx(&ys,femmodel->nodes);
                                 Reduceloadx(pf,Kfs,ys); delete Kfs;
                                 delete uf_epl;
@@ -229 +230 @@
                         }
                 }
-                /*}}}*/ /*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)

@@ -5 +5 @@
 *.obj
 *.exe
+*.mod
 appscan.*
 ouncemake*
@@ -14 +15 @@
 probe.results
 stXXXX*
-*.deps
-*.dirstamp
+.deps
+.dirstamp
 .libs
 issm
@@ -21 +22 @@
 issm_slr
 issm_ocean
-lnb_param.mod
-lovenb_sub.mod
-model.mod
-util.mod
+issm_dakota