Changeset 15253 for issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp

Timestamp:

06/13/13 10:29:11 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: need to update constraints when updateDOmainx is called

File:

• issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp (modified) (4 diffs)

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

@@ -89 +89 @@
 
                         if (!sedconverged){
-                                if(VerboseConvergence()) _printf0_("   #unstable constraints = " << num_unstable_constraints << "\n");
+                                if(VerboseConvergence()) _printf0_("   # Sediment unstable constraints = " << num_unstable_constraints << "\n");
                                 if(num_unstable_constraints==0) sedconverged = true;
                                 if (sedcount>=hydro_maxiter){
@@ -111 +111 @@
                         InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,true,ResetPenaltiesEnum);
                         InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,false,ConvergedEnum);
-                        femmodel->UpdateConstraintsx();
+                        femmodel->HydrologyEPLupdateDomainx();
                         femmodel->parameters->SetParam(HydrologyEfficientEnum,HydrologyLayerEnum);
                         eplconverged = false;
@@ -128 +128 @@
                                 Mergesolutionfromftogx(&ug_epl,uf,ys,femmodel->nodes,femmodel->parameters); delete ys;
                                 InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug_epl);
-                                femmodel->HydrologyEPLupdateDomainx();
+                                //femmodel->HydrologyEPLupdateDomainx();
                                 ConstraintsStatex(&constraints_converged,&num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
                                 
                                 if (!eplconverged){
-                                        if(VerboseConvergence()) _printf0_("   #unstable constraints = " << num_unstable_constraints << "\n");
+                                        if(VerboseConvergence()) _printf0_("   # EPL unstable constraints = " << num_unstable_constraints << "\n");
                                         if(num_unstable_constraints==0) eplconverged = true;
                                         if (eplcount>=hydro_maxiter){
@@ -144 +144 @@
                                         InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,sediment_kmax,MeltingOffsetEnum);
                                         InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug_epl);
-                                        femmodel->HydrologyEPLupdateDomainx();
+                                        //femmodel->HydrologyEPLupdateDomainx();
                                         break;
                                 }