Index: /issm/trunk-jpl/src/c/analyses/hydrology_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/hydrology_core.cpp (revision 15160) +++ /issm/trunk-jpl/src/c/analyses/hydrology_core.cpp (revision 15161) @@ -81,6 +81,7 @@ InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SedimentHeadEnum,SedimentHeadOldEnum); femmodel->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum); - - if(VerboseSolution()) _printf0_(" computing water transfer\n"); + if (isefficientlayer){ + InputDuplicatex(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EplHeadEnum,EplHeadOldEnum); + } if(VerboseSolution()) _printf0_(" computing water head\n"); Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15160) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 15161) @@ -2135,4 +2135,6 @@ name==SedimentHeadOldEnum || name==SedimentHeadEnum || + name==EplHeadOldEnum || + name==EplHeadEnum || name==WaterTransferEnum || name==BasisIntegralEnum || @@ -6218,5 +6220,5 @@ if(reCast(dt)){ - old_wh_input=inputs->GetInput(EplHeadEnum); _assert_(old_wh_input); + old_wh_input=inputs->GetInput(EplHeadOldEnum); _assert_(old_wh_input); } @@ -6407,5 +6409,5 @@ this->parameters->FindParam(&penalty_factor,HydrologydcPenaltyFactorEnum); kappa=kmax*pow(10.,penalty_factor); - + for(int i=0;iGetHydrologyDCInefficientHmax(&h_max,nodes[i]); @@ -6417,4 +6419,6 @@ residual[i]=0.0; } + if(this->id==1)printf("residual, %g \n", residual[1]); + if(this->id==1)printf("hSed, %g \n", values[1]); } /*Add input to the element: */ @@ -6422,5 +6426,4 @@ this->inputs->AddInput(new TriaP1Input(SedimentHeadEnum,values)); this->inputs->AddInput(new TriaP1Input(SedimentHeadResidualEnum,residual)); - if(converged)this->inputs->AddInput(new TriaP1Input(SedimentHeadOldEnum,values)); /*Free ressources:*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp (revision 15160) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/HydrologyDCInefficient/UpdateElementsHydrologyDCInefficient.cpp (revision 15161) @@ -43,5 +43,4 @@ iomodel->FetchDataToInput(elements,BasalforcingsMeltingRateEnum); iomodel->FetchDataToInput(elements,SedimentHeadEnum); - /* iomodel->FetchDataToInput(elements,SedimentHeadOldEnum);*/ /*Free data: */ Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 15160) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 15161) @@ -90,4 +90,5 @@ SedimentHeadResidualEnum, EplHeadEnum, + EplHeadOldEnum, HydrologydcRelTolEnum, HydrologydcSpcsedimentHeadEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 15160) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 15161) @@ -98,4 +98,5 @@ case SedimentHeadResidualEnum : return "SedimentHeadResidual"; case EplHeadEnum : return "EplHead"; + case EplHeadOldEnum : return "EplHeadOld"; case HydrologydcRelTolEnum : return "HydrologydcRelTol"; case HydrologydcSpcsedimentHeadEnum : return "HydrologydcSpcsedimentHead"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 15160) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 15161) @@ -98,4 +98,5 @@ else if (strcmp(name,"SedimentHeadResidual")==0) return SedimentHeadResidualEnum; else if (strcmp(name,"EplHead")==0) return EplHeadEnum; + else if (strcmp(name,"EplHeadOld")==0) return EplHeadOldEnum; else if (strcmp(name,"HydrologydcRelTol")==0) return HydrologydcRelTolEnum; else if (strcmp(name,"HydrologydcSpcsedimentHead")==0) return HydrologydcSpcsedimentHeadEnum; @@ -136,9 +137,9 @@ else if (strcmp(name,"InversionMinParameters")==0) return InversionMinParametersEnum; else if (strcmp(name,"InversionNsteps")==0) return InversionNstepsEnum; - else if (strcmp(name,"InversionNumControlParameters")==0) return InversionNumControlParametersEnum; else stage=2; } if(stage==2){ - if (strcmp(name,"InversionNumCostFunctions")==0) return InversionNumCostFunctionsEnum; + if (strcmp(name,"InversionNumControlParameters")==0) return InversionNumControlParametersEnum; + else if (strcmp(name,"InversionNumCostFunctions")==0) return InversionNumCostFunctionsEnum; else if (strcmp(name,"InversionStepThreshold")==0) return InversionStepThresholdEnum; else if (strcmp(name,"InversionThicknessObs")==0) return InversionThicknessObsEnum; @@ -259,9 +260,9 @@ else if (strcmp(name,"TimesteppingStartTime")==0) return TimesteppingStartTimeEnum; else if (strcmp(name,"TimesteppingFinalTime")==0) return TimesteppingFinalTimeEnum; - else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum; else stage=3; } if(stage==3){ - if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum; + if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum; + else if (strcmp(name,"TimesteppingTimeAdapt")==0) return TimesteppingTimeAdaptEnum; else if (strcmp(name,"TimesteppingTimeStep")==0) return TimesteppingTimeStepEnum; else if (strcmp(name,"TransientIsdiagnostic")==0) return TransientIsdiagnosticEnum; @@ -382,9 +383,9 @@ else if (strcmp(name,"SpcDynamic")==0) return SpcDynamicEnum; else if (strcmp(name,"SpcStatic")==0) return SpcStaticEnum; - else if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum; else stage=4; } if(stage==4){ - if (strcmp(name,"StokesIceFront")==0) return StokesIceFrontEnum; + if (strcmp(name,"SpcTransient")==0) return SpcTransientEnum; + else if (strcmp(name,"StokesIceFront")==0) return StokesIceFrontEnum; else if (strcmp(name,"StringArrayParam")==0) return StringArrayParamEnum; else if (strcmp(name,"StringParam")==0) return StringParamEnum; @@ -505,9 +506,9 @@ else if (strcmp(name,"PentaP1ElementResult")==0) return PentaP1ElementResultEnum; else if (strcmp(name,"StringExternalResult")==0) return StringExternalResultEnum; - else if (strcmp(name,"Step")==0) return StepEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"Time")==0) return TimeEnum; + if (strcmp(name,"Step")==0) return StepEnum; + else if (strcmp(name,"Time")==0) return TimeEnum; else if (strcmp(name,"TriaP1ElementResult")==0) return TriaP1ElementResultEnum; else if (strcmp(name,"WaterColumnOld")==0) return WaterColumnOldEnum; Index: /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp =================================================================== --- /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp (revision 15160) +++ /issm/trunk-jpl/src/c/solutionsequences/solutionsequence_hydro_nonlinear.cpp (revision 15161) @@ -154,26 +154,28 @@ duf->AYPX(uf_sed,-1.0); ndu_sed=duf->Norm(NORM_TWO); nu_sed=aged_uf_sed->Norm(NORM_TWO); - if (xIsNan(ndu_sed) || xIsNan(nu_sed)) _error_("convergence criterion is NaN!"); - if(isefficientlayer){ - duf=aged_uf_epl->Duplicate(); aged_uf_epl->Copy(duf); duf->AYPX(uf_epl,-1.0); - ndu_epl=duf->Norm(NORM_TWO); nu_epl=aged_uf_epl->Norm(NORM_TWO); - if (xIsNan(ndu_epl) || xIsNan(nu_epl)) _error_("convergence criterion is NaN!"); - } - //print + if (xIsNan(ndu_sed) || xIsNan(nu_sed)) _error_("Sed convergence criterion is NaN!"); if (!xIsNan(eps_hyd)){ - if((ndu_sed/nu_sed) " << eps_hyd*100 << " %\n"); - hydroconverged=false; - } - if(isefficientlayer){ - if((ndu_epl/nu_epl) " << eps_hyd*100 << " %\n"); + if(VerboseConvergence()) _printf0_(setw(50) << left << " Sediment Convergence criterion:" << ndu_sed/nu_sed*100 << " > " << eps_hyd*100 << " %\n"); + hydroconverged=false; + } + } + else{ + duf=aged_uf_epl->Duplicate(); aged_uf_epl->Copy(duf); duf->AYPX(uf_epl,-1.0); + ndu_epl=duf->Norm(NORM_TWO); nu_epl=aged_uf_epl->Norm(NORM_TWO); + if (xIsNan(ndu_epl) || xIsNan(nu_epl)) _error_("EPL convergence criterion is NaN!"); + 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 ((ndu_epl/nu_epl)elements,femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,ug); - + /*Free ressources: */ delete ug;