Changeset 17357

Timestamp:

02/26/14 12:12:12 (11 years ago)

Author:

bdef

Message:

CHG: minor cleanup

File:

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

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

@@ -34 +34 @@
 
         bool       sedconverged,eplconverged,hydroconverged;
-        bool       transfered;
         bool       isefficientlayer;
         int        constraints_converged;
@@ -40 +39 @@
         int        sedcount,eplcount,hydrocount;
         int        hydro_maxiter;
-        IssmDouble sediment_kmax,time;
+        IssmDouble sediment_kmax;
         IssmDouble eps_hyd;
         IssmDouble ndu_sed,nu_sed;
         IssmDouble ndu_epl,nu_epl;
-        IssmDouble EplConv;
 
         /*Recover parameters: */
@@ -51 +49 @@
         femmodel->parameters->FindParam(&hydro_maxiter,HydrologydcMaxIterEnum);
         femmodel->parameters->FindParam(&eps_hyd,HydrologydcRelTolEnum);
-        femmodel->parameters->FindParam(&time,TimeEnum);
 
         hydrocount=1;
@@ -74 +71 @@
         for(;;){
 
-                EplConv=1.0;
                 sedcount=1;
                 eplcount=1;
@@ -169 +165 @@
                         InputUpdateFromConstantx(femmodel,false,ConvergedEnum);
                         femmodel->parameters->SetParam(HydrologyEfficientEnum,HydrologyLayerEnum);
-                        EplConv=1.0;
-
 
                         for(;;){
@@ -220 +214 @@
                                 if (ndu_epl==0.0 && nu_epl==0.0) nu_epl=1.0e-6; /*Hacking the case where the EPL is used but empty*/
                                 if(VerboseConvergence()) _printf0_(setw(50) << left << "   Inner EPL Convergence criterion:" << ndu_epl/nu_epl*100 << "%, aiming lower than " << eps_hyd*10*100 << " %\n");
-                                EplConv=ndu_epl/nu_epl;
                                 if((ndu_epl/nu_epl)<eps_hyd*10.) eplconverged=true;
                                 if (eplcount>=hydro_maxiter){
                                         _error_("   maximum number of EPL iterations (" << hydro_maxiter << ") exceeded");
                                 }
-                                
                                 eplcount++;