- Timestamp:
- 06/13/13 10:29:11 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp ¶
r15249 r15253 89 89 90 90 if (!sedconverged){ 91 if(VerboseConvergence()) _printf0_(" # unstable constraints = " << num_unstable_constraints << "\n");91 if(VerboseConvergence()) _printf0_(" # Sediment unstable constraints = " << num_unstable_constraints << "\n"); 92 92 if(num_unstable_constraints==0) sedconverged = true; 93 93 if (sedcount>=hydro_maxiter){ … … 111 111 InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,true,ResetPenaltiesEnum); 112 112 InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,false,ConvergedEnum); 113 femmodel-> UpdateConstraintsx();113 femmodel->HydrologyEPLupdateDomainx(); 114 114 femmodel->parameters->SetParam(HydrologyEfficientEnum,HydrologyLayerEnum); 115 115 eplconverged = false; … … 128 128 Mergesolutionfromftogx(&ug_epl,uf,ys,femmodel->nodes,femmodel->parameters); delete ys; 129 129 InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug_epl); 130 femmodel->HydrologyEPLupdateDomainx();130 //femmodel->HydrologyEPLupdateDomainx(); 131 131 ConstraintsStatex(&constraints_converged,&num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters); 132 132 133 133 if (!eplconverged){ 134 if(VerboseConvergence()) _printf0_(" # unstable constraints = " << num_unstable_constraints << "\n");134 if(VerboseConvergence()) _printf0_(" # EPL unstable constraints = " << num_unstable_constraints << "\n"); 135 135 if(num_unstable_constraints==0) eplconverged = true; 136 136 if (eplcount>=hydro_maxiter){ … … 144 144 InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,sediment_kmax,MeltingOffsetEnum); 145 145 InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug_epl); 146 femmodel->HydrologyEPLupdateDomainx();146 //femmodel->HydrologyEPLupdateDomainx(); 147 147 break; 148 148 }
Note:
See TracChangeset
for help on using the changeset viewer.