Ignore:
Timestamp:
06/13/13 10:29:11 (12 years ago)
Author:
Mathieu Morlighem
Message:

BUG: need to update constraints when updateDOmainx is called

File:
1 edited

Legend:

Unmodified
Added
Removed
  • TabularUnified issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp

    r15249 r15253  
    8989
    9090                        if (!sedconverged){
    91                                 if(VerboseConvergence()) _printf0_("   #unstable constraints = " << num_unstable_constraints << "\n");
     91                                if(VerboseConvergence()) _printf0_("   # Sediment unstable constraints = " << num_unstable_constraints << "\n");
    9292                                if(num_unstable_constraints==0) sedconverged = true;
    9393                                if (sedcount>=hydro_maxiter){
     
    111111                        InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,true,ResetPenaltiesEnum);
    112112                        InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,false,ConvergedEnum);
    113                         femmodel->UpdateConstraintsx();
     113                        femmodel->HydrologyEPLupdateDomainx();
    114114                        femmodel->parameters->SetParam(HydrologyEfficientEnum,HydrologyLayerEnum);
    115115                        eplconverged = false;
     
    128128                                Mergesolutionfromftogx(&ug_epl,uf,ys,femmodel->nodes,femmodel->parameters); delete ys;
    129129                                InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug_epl);
    130                                 femmodel->HydrologyEPLupdateDomainx();
     130                                //femmodel->HydrologyEPLupdateDomainx();
    131131                                ConstraintsStatex(&constraints_converged,&num_unstable_constraints, femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
    132132                               
    133133                                if (!eplconverged){
    134                                         if(VerboseConvergence()) _printf0_("   #unstable constraints = " << num_unstable_constraints << "\n");
     134                                        if(VerboseConvergence()) _printf0_("   # EPL unstable constraints = " << num_unstable_constraints << "\n");
    135135                                        if(num_unstable_constraints==0) eplconverged = true;
    136136                                        if (eplcount>=hydro_maxiter){
     
    144144                                        InputUpdateFromConstantx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,sediment_kmax,MeltingOffsetEnum);
    145145                                        InputUpdateFromSolutionx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,ug_epl);
    146                                         femmodel->HydrologyEPLupdateDomainx();
     146                                        //femmodel->HydrologyEPLupdateDomainx();
    147147                                        break;
    148148                                }
Note: See TracChangeset for help on using the changeset viewer.