Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export(sEddyProc_sTKFluxPartition)
export(sEddyProc_sTKFluxPartitionUStarScens)
export(sEddyProc_update_ustarthreshold_columns)
export(sEddyProc_useAnnualUStarThresholds)
export(sEddyProc_useSeaonsalUStarThresholds)
export(sEddyProc_useSeasonalUStarThresholds)
export(usControlUstarEst)
export(usControlUstarSubsetting)
export(usCreateSeasonFactorMonth)
Expand Down
8 changes: 5 additions & 3 deletions R/aEddy.R
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ sEddyProc_sSetUstarScenarios <- function(
sEddyProc$methods(sSetUstarScenarios = sEddyProc_sSetUstarScenarios)

#' @export
sEddyProc_useSeaonsalUStarThresholds <- function(
sEddyProc_useSeasonalUStarThresholds <- function(
### use seasonal estimates of uStar thresholds
) {
##seealso<< \code{\link{sEddyProc_sSetUstarScenarios}},
Expand All @@ -295,14 +295,16 @@ sEddyProc_useSeaonsalUStarThresholds <- function(
uStarMap <- usGetSeasonalSeasonUStarMap(uStarThAgg)
.self$sSetUstarScenarios(uStarMap)
}
sEddyProc$methods(useSeaonsalUStarThresholds = sEddyProc_useSeaonsalUStarThresholds)
sEddyProc$methods(useSeasonalUStarThresholds = sEddyProc_useSeasonalUStarThresholds)
# backward compatibiity to former typo
sEddyProc$methods(useSeaonsalUStarThresholds = sEddyProc_useSeasonalUStarThresholds)

#' @export
sEddyProc_useAnnualUStarThresholds <- function(
### use seasonal estimates of uStar thresholds
) {
##seealso<< \code{\link{sEddyProc_sSetUstarScenarios}},
## \code{\link{sEddyProc_useSeaonsalUStarThresholds}}
## \code{\link{sEddyProc_useSeasonalUStarThresholds}}
uStarThAgg <- .self$sGetEstimatedUstarThresholdDistribution()
uStarMap <- usGetAnnualSeasonUStarMap(uStarThAgg)
.self$sSetUstarScenarios(uStarMap)
Expand Down
2 changes: 1 addition & 1 deletion man/sEddyProc_useAnnualUStarThresholds.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@


\seealso{\code{\link{sEddyProc_sSetUstarScenarios}},
\code{\link{sEddyProc_useSeaonsalUStarThresholds}}}
\code{\link{sEddyProc_useSeasonalUStarThresholds}}}

Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
\name{sEddyProc_useSeaonsalUStarThresholds}
\alias{sEddyProc_useSeaonsalUStarThresholds}
\title{sEddyProc useSeaonsalUStarThresholds}
\name{sEddyProc_useSeasonalUStarThresholds}
\alias{sEddyProc_useSeasonalUStarThresholds}
\title{sEddyProc useSeasonalUStarThresholds}
\description{use seasonal estimates of uStar thresholds}
\usage{sEddyProc_useSeaonsalUStarThresholds()}
\usage{sEddyProc_useSeasonalUStarThresholds()}



Expand Down
10 changes: 5 additions & 5 deletions vignettes/DEGebExample.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ abline( v = seasonStartsDate$DateTime)
The user-specific seasoning is provided to the gap-filling by the argument `seasonFactor`.
```{r DEGeb_estUStar1b, cache = TRUE}
(uStarTh <- EProc$sEstUstarThold(seasonFactor = seasonFactor))
#EProc$useSeaonsalUStarThresholds()
#EProc$useSeasonalUStarThresholds()
# estimation can be inspected by plotting the saturation of NEE with UStar
# for the temperatures of one season
#EProc$sPlotNEEVersusUStarForSeason( levels(uStarTh$season)[2] )
Expand All @@ -116,11 +116,11 @@ the mean across the years.
By default the gap-filling uses annually aggregated estimates of uStar-Threshold.
This usually works for sites with continuous vegetation cover.
For the crop-site of this example, we will use a different threshold for each of
the defined seasons, by calling `sEddyProc_useSeaonsalUStarThresholds`
the defined seasons, by calling `sEddyProc_useSeasonalUStarThresholds`
before gapfilling.

```{r DEGeb_estUStar1c}
EProc$useSeaonsalUStarThresholds()
EProc$useSeasonalUStarThresholds()
EProc$sGetUstarScenarios()
```

Expand Down Expand Up @@ -154,7 +154,7 @@ EProc$sEstimateUstarScenarios(
# EProc$sGetEstimatedUstarThresholdDistribution()
#))
#EProc$sSetUstarScenarios(uStarScens)
EProc$useSeaonsalUStarThresholds()
EProc$useSeasonalUStarThresholds()
EProc$sGetUstarScenarios()
```

Expand Down Expand Up @@ -205,7 +205,7 @@ resUStar <- EProc$sEstUstarThold(
, seasonFactor = seasonFactor
)
#(uStarThCP <- usGetSeasonalSeasonUStarMap(resUStar))
EProc$useSeaonsalUStarThresholds()
EProc$useSeasonalUStarThresholds()
EProc$sGetUstarScenarios()
```

Expand Down
10 changes: 5 additions & 5 deletions vignettes/DEGebExample.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ argument `seasonFactor`.
## 12 season 2006 2006120 0.06966667
## 13 season 2006 2006305 0.25094444

#EProc$useSeaonsalUStarThresholds()
#EProc$useSeasonalUStarThresholds()
# estimation can be inspected by plotting the saturation of NEE with UStar
# for the temperatures of one season
#EProc$sPlotNEEVersusUStarForSeason( levels(uStarTh$season)[2] )
Expand All @@ -106,9 +106,9 @@ By default the gap-filling uses annually aggregated estimates of
uStar-Threshold. This usually works for sites with continuous vegetation
cover. For the crop-site of this example, we will use a different
threshold for each of the defined seasons, by calling
`sEddyProc_useSeaonsalUStarThresholds` before gapfilling.
`sEddyProc_useSeasonalUStarThresholds` before gapfilling.

EProc$useSeaonsalUStarThresholds()
EProc$useSeasonalUStarThresholds()
EProc$sGetUstarScenarios()

## season uStar
Expand Down Expand Up @@ -148,7 +148,7 @@ uStar Threshold.
# EProc$sGetEstimatedUstarThresholdDistribution()
#))
#EProc$sSetUstarScenarios(uStarScens)
EProc$useSeaonsalUStarThresholds()
EProc$useSeasonalUStarThresholds()
EProc$sGetUstarScenarios()

## season uStar U10 U90
Expand Down Expand Up @@ -206,7 +206,7 @@ as Gap.
, seasonFactor = seasonFactor
)
#(uStarThCP <- usGetSeasonalSeasonUStarMap(resUStar))
EProc$useSeaonsalUStarThresholds()
EProc$useSeasonalUStarThresholds()
EProc$sGetUstarScenarios()

## season uStar
Expand Down
4 changes: 2 additions & 2 deletions vignettes/uStarCases.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -152,12 +152,12 @@ In conjunction with method `usGetSeasonalSeasonUStarMap` and
`sEddyProc_sSetUstarScenarios` this can be used
to set seasonally different u* threshold.
However, this common case supported by method
`sEddyProc_useSeaonsalUStarThresholds`.
`sEddyProc_useSeasonalUStarThresholds`.

```{r uStarScenSetSeasonal}
#EProc$sSetUstarScenarios(
# usGetSeasonalSeasonUStarMap(uStarThAgg)[,-2])
EProc$useSeaonsalUStarThresholds()
EProc$useSeasonalUStarThresholds()
# inspect the changed thresholds to be used
EProc$sGetUstarScenarios()
```
Expand Down
4 changes: 2 additions & 2 deletions vignettes/uStarCases.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,11 @@ estimates for different aggregation levels, use method
In conjunction with method `usGetSeasonalSeasonUStarMap` and
`sEddyProc_sSetUstarScenarios` this can be used to set seasonally
different u\* threshold. However, this common case supported by method
`sEddyProc_useSeaonsalUStarThresholds`.
`sEddyProc_useSeasonalUStarThresholds`.

#EProc$sSetUstarScenarios(
# usGetSeasonalSeasonUStarMap(uStarThAgg)[,-2])
EProc$useSeaonsalUStarThresholds()
EProc$useSeasonalUStarThresholds()
# inspect the changed thresholds to be used
EProc$sGetUstarScenarios()

Expand Down
Loading