Skip to content

Commit

Permalink
New release
Browse files Browse the repository at this point in the history
  • Loading branch information
RobelTakele committed Sep 22, 2024
1 parent 3d651b4 commit e83e4a1
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 33 deletions.
7 changes: 2 additions & 5 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
^.*\.Rproj$
^\.Rproj\.user$
^data-raw$
^LICENSE\.md$
^README\.Rmd$
^doc$
^Meta$
^_pkgdown\.yml$
^docs$
^inst\doc$
^pkgdown$
^\.github$
<<<<<<< HEAD
^\.git$
^Makefile$
^Jenkinsfile$
^revdep$
^cran-comments\.md$
^CRAN-SUBMISSION$
=======

>>>>>>> 5bf4ef90266654cfdc6ded681017190829d9c65a
6 changes: 0 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,8 @@
.Rproj*
/doc/
/Meta/


<<<<<<< HEAD
.Rdata
.httr-oauth
.DS_Store
inst/doc

=======
>>>>>>> 5bf4ef90266654cfdc6ded681017190829d9c65a
docs
3 changes: 3 additions & 0 deletions CRAN-SUBMISSION
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Version: 1.4.0
Date: 2024-09-22 12:08:45 UTC
SHA: 3d651b4d5139b793f9404ebfc15f38e40191842c
2 changes: 1 addition & 1 deletion cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## R CMD check results

0 errors | 0 warnings | 3 note
0 errors | 0 warnings | 1 note

* This is a new release.
10 changes: 5 additions & 5 deletions doc/AquaBEHER.R
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ PET <- calcEto(AgroClimateData, method = "PM", crop = "short")

str(PET)

## ----PETplot, fig.height=5, fig.width=10, fig.dpi=400, fig.align='center'-----
## ----PETplot, fig.height = 4, fig.width = 6, fig.dpi = 300, fig.align = 'center'----
## Compute PET using Hargreaves-Samani formulation using the sample data f
## rom 'AgroClimateData':
Eto.HS <- calcEto(AgroClimateData, method = "HS")
Expand All @@ -54,7 +54,7 @@ legend("bottom", c("Eto: Penman–Monteith", "Eto: Hargreaves-Samani"),
xpd = TRUE, col = c("black", "blue")
)

## ----WATBALplot, fig.height=6, fig.width=10, fig.dpi=400, fig.align='center'----
## ----WATBALplot, fig.height = 6, fig.width = 10, fig.dpi = 300, fig.align = 'center'----
PET <- calcEto(AgroClimateData, method = "PM", Zh = 10)

## Add the estimated PET 'ET.Daily' to a new column in AgroClimateData:
Expand Down Expand Up @@ -123,7 +123,7 @@ ggplot(data = watBal.19T20, aes(x = date)) +
panel.grid.major = element_line(linetype = "dotted", color = "grey80")
)

## ----WSC, fig.height=6, fig.width=10, fig.dpi=400, fig.align='center'---------
## ----WSC, fig.height = 6, fig.width = 10, fig.dpi = 300, fig.align = 'center'----
## The wet season calendar is estimated for the onset window ranges from
## 01-September to 31-January having a soil with 80mm of soilWHC:

Expand Down Expand Up @@ -231,7 +231,7 @@ ggplot(seasCal.dF, aes(x = Year)) +
)
)

## ----fcstWSC, fig.width=10, fig.height=6, fig.dpi=400, fig.align='center'-----
## ----fcstWSC, fig.width = 8, fig.height = 5, fig.dpi = 300, fig.align = 'center'----
## Load example data:
data(AgroClimateData)

Expand Down Expand Up @@ -317,7 +317,7 @@ ggplot(SeasFcst.dFgg, aes(x = Category, y = Probability, fill = Category)) +
)) +
geom_text(aes(label = paste0(Probability, "%")),
vjust = -0.5,
size = 5, fontface = "bold"
size = 4, fontface = "bold"
) +
labs(
title = "Seasonal Forecast of the Onset of the Wet Season",
Expand Down
10 changes: 5 additions & 5 deletions doc/AquaBEHER.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ str(PET)
Graphical comparison of the evapotranspiration (mm/day) calculated using
the FAO Penman–Monteith formulation and the Hargreaves-Samani formulation:

```{r PETplot, fig.height=5, fig.width=10, fig.dpi=400, fig.align='center'}
```{r PETplot, fig.height = 4, fig.width = 6, fig.dpi = 300, fig.align = 'center'}
## Compute PET using Hargreaves-Samani formulation using the sample data f
## rom 'AgroClimateData':
Eto.HS <- calcEto(AgroClimateData, method = "HS")
Expand Down Expand Up @@ -189,7 +189,7 @@ calcWatBal(data, soilWHC)
The calcWatBal compute with inputs of data frame containing daily values of
Rain, Eto and soil water holding capacity.

```{r WATBALplot, fig.height=6, fig.width=10, fig.dpi=400, fig.align='center'}
```{r WATBALplot, fig.height = 6, fig.width = 10, fig.dpi = 300, fig.align = 'center'}
PET <- calcEto(AgroClimateData, method = "PM", Zh = 10)
## Add the estimated PET 'ET.Daily' to a new column in AgroClimateData:
Expand Down Expand Up @@ -309,7 +309,7 @@ calcSeasCal(data, onsetWind.start, onsetWind.end, cessaWind.end, soilWHC)
Using the sample climate data provided by the AquaBEHER package,
compute the wet season calendar:

```{r WSC, fig.height=6, fig.width=10, fig.dpi=400, fig.align='center'}
```{r WSC, fig.height = 6, fig.width = 10, fig.dpi = 300, fig.align = 'center'}
## The wet season calendar is estimated for the onset window ranges from
## 01-September to 31-January having a soil with 80mm of soilWHC:
Expand Down Expand Up @@ -438,7 +438,7 @@ seasFcstQBR(hisYearStart, hisYearEnd, rainTerc, seasRain, hisWSCvar,

### Example:

```{r fcstWSC, fig.width=10, fig.height=6, fig.dpi=400, fig.align='center'}
```{r fcstWSC, fig.width = 8, fig.height = 5, fig.dpi = 300, fig.align = 'center'}
## Load example data:
data(AgroClimateData)
Expand Down Expand Up @@ -524,7 +524,7 @@ ggplot(SeasFcst.dFgg, aes(x = Category, y = Probability, fill = Category)) +
)) +
geom_text(aes(label = paste0(Probability, "%")),
vjust = -0.5,
size = 5, fontface = "bold"
size = 4, fontface = "bold"
) +
labs(
title = "Seasonal Forecast of the Onset of the Wet Season",
Expand Down
12 changes: 6 additions & 6 deletions doc/AquaBEHER.html

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions vignettes/AquaBEHER.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ str(PET)
Graphical comparison of the evapotranspiration (mm/day) calculated using
the FAO Penman–Monteith formulation and the Hargreaves-Samani formulation:

```{r PETplot, fig.height=5, fig.width=10, fig.dpi=400, fig.align='center'}
```{r PETplot, fig.height = 4, fig.width = 6, fig.dpi = 300, fig.align = 'center'}
## Compute PET using Hargreaves-Samani formulation using the sample data f
## rom 'AgroClimateData':
Eto.HS <- calcEto(AgroClimateData, method = "HS")
Expand Down Expand Up @@ -189,7 +189,7 @@ calcWatBal(data, soilWHC)
The calcWatBal compute with inputs of data frame containing daily values of
Rain, Eto and soil water holding capacity.

```{r WATBALplot, fig.height=6, fig.width=10, fig.dpi=400, fig.align='center'}
```{r WATBALplot, fig.height = 6, fig.width = 10, fig.dpi = 300, fig.align = 'center'}
PET <- calcEto(AgroClimateData, method = "PM", Zh = 10)
## Add the estimated PET 'ET.Daily' to a new column in AgroClimateData:
Expand Down Expand Up @@ -309,7 +309,7 @@ calcSeasCal(data, onsetWind.start, onsetWind.end, cessaWind.end, soilWHC)
Using the sample climate data provided by the AquaBEHER package,
compute the wet season calendar:

```{r WSC, fig.height=6, fig.width=10, fig.dpi=400, fig.align='center'}
```{r WSC, fig.height = 6, fig.width = 10, fig.dpi = 300, fig.align = 'center'}
## The wet season calendar is estimated for the onset window ranges from
## 01-September to 31-January having a soil with 80mm of soilWHC:
Expand Down Expand Up @@ -438,7 +438,7 @@ seasFcstQBR(hisYearStart, hisYearEnd, rainTerc, seasRain, hisWSCvar,

### Example:

```{r fcstWSC, fig.width=10, fig.height=6, fig.dpi=400, fig.align='center'}
```{r fcstWSC, fig.width = 8, fig.height = 5, fig.dpi = 300, fig.align = 'center'}
## Load example data:
data(AgroClimateData)
Expand Down Expand Up @@ -524,7 +524,7 @@ ggplot(SeasFcst.dFgg, aes(x = Category, y = Probability, fill = Category)) +
)) +
geom_text(aes(label = paste0(Probability, "%")),
vjust = -0.5,
size = 5, fontface = "bold"
size = 4, fontface = "bold"
) +
labs(
title = "Seasonal Forecast of the Onset of the Wet Season",
Expand Down
Binary file modified vignettes/assets/Evapotranspiration.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit e83e4a1

Please sign in to comment.