From 6570c1015d294584984bfabd712f3a69cad6e493 Mon Sep 17 00:00:00 2001
From: midraed <guillermo.olmedo@gmail.com>
Date: Thu, 10 Sep 2015 10:17:26 -0300
Subject: [PATCH] Version 0.0.2.3 published

---
 DESCRIPTION                                   |  2 +-
 NAMESPACE                                     |  5 +++--
 NEWS                                          | 13 ++++++++++++
 ...eHeat_CITRA.R => water_sensibleHeatFlux.R} |  0
 man/calcAnchors.Rd                            | 20 +++++++++++++++++++
 man/calcH.Rd                                  | 19 ++++++++++++++++++
 man/netRadiation.Rd                           | 18 +++++++++++++++++
 man/surfaceTemperature.Rd                     |  2 +-
 8 files changed, 75 insertions(+), 4 deletions(-)
 create mode 100644 NEWS
 rename R/{water_functions_sensibleHeat_CITRA.R => water_sensibleHeatFlux.R} (100%)
 create mode 100644 man/calcAnchors.Rd
 create mode 100644 man/calcH.Rd
 create mode 100644 man/netRadiation.Rd

diff --git a/DESCRIPTION b/DESCRIPTION
index a667693..071762e 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: water
 Title: Actual Evapotranspiration with Energy Balance models
-Version: 0.0.2.2
+Version: 0.0.2.3
 Date: 2015-08-26
 Authors@R: c(person("Guillermo Federico", "Olmedo", role = c("aut", "cre"), email = "guillermo.olmedo@gmail.com"))
 Author: Guillermo Federico Olmedo [aut, cre]
diff --git a/NAMESPACE b/NAMESPACE
index 435017a..a3af662 100644
--- a/NAMESPACE
+++ b/NAMESPACE
@@ -6,6 +6,8 @@ export(METRIC.G)
 export(METRIC.Rn)
 export(METRICtopo)
 export(albedo)
+export(calcAnchors)
+export(calcH)
 export(calcSR)
 export(calcTOAr)
 export(checkSRTMgrids)
@@ -16,10 +18,9 @@ export(incLWradiation)
 export(incSWradiation)
 export(loadImage)
 export(momentumRoughnessLength)
+export(netRadiation)
 export(outLWradiation)
 export(prepareSRTMdata)
-export(sensibleHeatFlux)
-export(sensibleHeatFlux.CITRA)
 export(soilHeatFlux)
 export(solarAngles)
 export(surfaceTemperature)
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..7abebdc
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,13 @@
+water: 
+change log. From 09/09/2015. Most recent changes first / on top.
+Guillermo OLMEDO
+-----------------------------------------------------------------
+
+VERSION 0.0.2.3
+
+* Rename sensibleHEatFlux() to sensibleHEatFlux_old()
+* Remove sensibleHEatFlux.CITRA()
+* Split sensibleHeatFlux in 2 new functions:
+  - calcAnchors() for anchors points
+  - sensibleHeatFlux() for the iterative process to calculate H and dT
+* Added function to estimate Net Radiation
\ No newline at end of file
diff --git a/R/water_functions_sensibleHeat_CITRA.R b/R/water_sensibleHeatFlux.R
similarity index 100%
rename from R/water_functions_sensibleHeat_CITRA.R
rename to R/water_sensibleHeatFlux.R
diff --git a/man/calcAnchors.Rd b/man/calcAnchors.Rd
new file mode 100644
index 0000000..1cf5ece
--- /dev/null
+++ b/man/calcAnchors.Rd
@@ -0,0 +1,20 @@
+% Generated by roxygen2 (4.1.1): do not edit by hand
+% Please edit documentation in R/water_sensibleHeatFlux.R
+\name{calcAnchors}
+\alias{calcAnchors}
+\title{Select anchors pixels for H function}
+\usage{
+calcAnchors(image, Ts, LAI, albedo, Z.om, n = 1,
+  anchors.method = "CITRA-MCB", sat = "auto", ESPA = F, plots = TRUE,
+  deltaTemp = 5)
+}
+\description{
+Select anchors pixels for H function
+}
+\author{
+Guillermo F Olmedo, \email{guillermo.olmedo@gmail.com}
+}
+\references{
+CITRA y MCB (com pers)
+}
+
diff --git a/man/calcH.Rd b/man/calcH.Rd
new file mode 100644
index 0000000..6c9bb12
--- /dev/null
+++ b/man/calcH.Rd
@@ -0,0 +1,19 @@
+% Generated by roxygen2 (4.1.1): do not edit by hand
+% Please edit documentation in R/water_sensibleHeatFlux.R
+\name{calcH}
+\alias{calcH}
+\title{Iterative function to estimate H and R.ah}
+\usage{
+calcH(anchors, Ts, Z.om, weatherStation, ETp.coef = 1.05, Z.om.ws = 0.0018,
+  sat = "auto", ESPA = F, mountainous = FALSE, DEM, Rn, G)
+}
+\description{
+Iterative function to estimate H and R.ah
+}
+\author{
+Guillermo F Olmedo, \email{guillermo.olmedo@gmail.com}
+}
+\references{
+R. G. Allen, M. Tasumi, and R. Trezza, "Satellite-based energy balance for mapping evapotranspiration with internalized calibration (METRIC) - Model" Journal of Irrigation and Drainage Engineering, vol. 133, p. 380, 2007
+}
+
diff --git a/man/netRadiation.Rd b/man/netRadiation.Rd
new file mode 100644
index 0000000..3eea58b
--- /dev/null
+++ b/man/netRadiation.Rd
@@ -0,0 +1,18 @@
+% Generated by roxygen2 (4.1.1): do not edit by hand
+% Please edit documentation in R/water_netRadiation.G.R
+\name{netRadiation}
+\alias{netRadiation}
+\title{Estimates net radiation}
+\usage{
+netRadiation(LAI, albedo, Rs.inc, Rl.inc, Rl.out)
+}
+\description{
+Estimates net radiation
+}
+\author{
+Guillermo F Olmedo, \email{guillermo.olmedo@gmail.com}
+}
+\references{
+R. G. Allen, M. Tasumi, and R. Trezza, "Satellite-based energy balance for mapping evapotranspiration with internalized calibration (METRIC) - Model" Journal of Irrigation and Drainage Engineering, vol. 133, p. 380, 2007
+}
+
diff --git a/man/surfaceTemperature.Rd b/man/surfaceTemperature.Rd
index f102ef2..85c7df6 100644
--- a/man/surfaceTemperature.Rd
+++ b/man/surfaceTemperature.Rd
@@ -4,7 +4,7 @@
 \alias{surfaceTemperature}
 \title{Estimates Land Surface Temperature from Landsat Data}
 \usage{
-surfaceTemperature(path = getwd(), sat = "auto", LAI, aoi)
+surfaceTemperature(path = getwd(), sat = "auto", LAI, aoi, WeatherStation)
 }
 \description{
 Estimates Land Surface Temperature from Landsat Data