Skip to content

Commit

Permalink
elevation check in multiple detrending
Browse files Browse the repository at this point in the history
  • Loading branch information
cate-to committed Dec 13, 2024
1 parent 5d478e5 commit ba061af
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions interpolation/interpolation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1769,7 +1769,7 @@ bool multipleDetrendingMain(std::vector <Crit3DInterpolationDataPoint> &myPoints
if (!multipleDetrendingElevationFitting(elevationPos, myPoints, mySettings, myVar, errorStr, true))
return false;

detrendingElevation(elevationPos, myPoints, mySettings);
if (mySettings->getCurrentCombination().isProxySignificant(elevationPos)) detrendingElevation(elevationPos, myPoints, mySettings);
}

if (!multipleDetrendingOtherProxiesFitting(elevationPos, myPoints, mySettings, myVar, errorStr))
Expand Down Expand Up @@ -2159,7 +2159,7 @@ bool glocalDetrendingFitting(std::vector <Crit3DInterpolationDataPoint> &myPoint
if (elevationPos != NODATA && mySettings->getSelectedCombination().isProxyActive(elevationPos))
{
if (!multipleDetrendingElevationFitting(elevationPos, subsetPoints, mySettings, myVar, errorStr, false)) return false;
detrendingElevation(elevationPos, subsetPoints, mySettings);
if (mySettings->getCurrentCombination().isProxySignificant(elevationPos)) detrendingElevation(elevationPos, subsetPoints, mySettings);
}
if (!multipleDetrendingOtherProxiesFitting(elevationPos, subsetPoints, mySettings, myVar, errorStr))
return false;
Expand Down
2 changes: 1 addition & 1 deletion project/project.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3488,7 +3488,7 @@ void Project::macroAreaDetrending(Crit3DMacroArea myArea, meteoVariable myVar, s
}

//detrending
if (elevationPos != NODATA && myArea.getCombination().isProxyActive(elevationPos))
if (elevationPos != NODATA && myArea.getCombination().isProxyActive(elevationPos) && myArea.getCombination().isProxySignificant(elevationPos))
{
detrendingElevation(elevationPos, subsetInterpolationPoints, &interpolationSettings);
}
Expand Down

0 comments on commit ba061af

Please sign in to comment.