Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
git-svn-id: https://r-oce.googlecode.com/svn/trunk@122 3dc979fe-ab3f-0410-b117-8d365baceae5
  • Loading branch information
[email protected] authored and [email protected] committed Dec 15, 2007
1 parent 351837e commit f6cf20a
Show file tree
Hide file tree
Showing 70 changed files with 69 additions and 100 deletions.
2 changes: 1 addition & 1 deletion man/a03.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@ plot(a03g,station.indices=seq(124,102),coastline=coastline.world,map.xlim=c(-80,
\source{\url{http://cchdo.ucsd.edu/data_access?ExpoCode=90CT40_1} (use the \emph{BOT} link in the \emph{Exchange} section of this page.)}
\references{\url{http://cchdo.ucsd.edu}}
\seealso{This was read with \code{\link{read.section}(a03_hy1.csv)}, working a data file downloaded from the CCHDO site mentioned above.}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/as.coastline.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ coastline.halifax<-as.coastline(latitude[c(HH,GI)],longitude[c(HH,GI)]-360)
The NOAA site \url{http://www.ngdc.noaa.gov/mgg/shorelines/shorelines.html}
is a good source for coastline data files.
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
4 changes: 1 addition & 3 deletions man/as.ctd.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,5 @@ S <- 35 - p / 100
ctd <- as.ctd(S, T, p)
summary(ctd)
}
\references{
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/as.sealevel.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,5 @@ summary(sl)
\references{
\url{ftp://ilikai.soest.hawaii.edu/rqds/hourly.fmt}.
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/coastline.halifax.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ The little island at about 44.64N is visible outside the author's window.}
\code{\link{as.coastline}}. Another
sample coastline file is \code{\link{coastline.maritimes}}; see these for details of the data format. Other coastline datasets provided with
oce are \code{\link{coastline.maritimes}} and \code{\link{coastline.world}}.}
\author{Dan Kelley \email{[email protected]}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/coastline.maritimes.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ dataset at the NOAA site.}
\code{\link{read.coastline}}, or created with
\code{\link{as.coastline}}; see these for details of the data format. Other coastline datasets provided with
oce are \code{\link{coastline.halifax}} and \code{\link{coastline.world}}.}
\author{Dan Kelley \email{[email protected]}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/coastline.world.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ western longitudes have negative values.}
\code{\link{read.coastline}}, or created with
\code{\link{as.coastline}}; see these for details of the data format. Other coastline datasets provided with
oce are \code{\link{coastline.halifax}} and \code{\link{coastline.maritimes}}.}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/coriolis.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ Compute \eqn{f}{f}, the Coriolis parameter as a function of latitude.
Gill, A.E., 1982. \emph{Atmosphere-ocean Dynamics},
Academic Press, New York, 662 pp.
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/ctd.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ column.}
\url{http://www.seabird.com/products/spec_sheets/19plusdata.htm}.
See link{read.ctd} for the data format.
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/ctd.add.column.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ ctd.new <- ctd.add.column(ctd,
The Seabird CTD instrument is described at
\url{http://www.seabird.com/products/spec_sheets/19plusdata.htm}.
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
4 changes: 1 addition & 3 deletions man/ctd.decimate.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,5 @@ data(ctd.raw)
ctd.clean <- ctd.decimate(ctd.trim(ctd.raw))
summary(ctd.clean)
}
%\references{
%}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/ctd.raw.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ data that need trimming with \code{\link{ctd.trim}}.}
the Bedford Basin of the Halifax Harbour, during an
October 2003 field trip of Dalhousie University's
Oceanography 4120/5120 class.}
\author{Dan Kelley \email{[email protected]}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/ctd.trim.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -93,5 +93,5 @@ plot(ctd.decimate(ctd.trim(ctd.raw),method="boxcar")) # ... smoothed
The Seabird CTD instrument is described at
\url{http://www.seabird.com/products/spec_sheets/19plusdata.htm}.
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/ctd.update.header.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ ctd.new <- ctd.update.header(ctd)
The Seabird CTD instrument is described at
\url{http://www.seabird.com/products/spec_sheets/19plusdata.htm}.
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/ctd.write.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ ctd.write(ctd, "ctd.cnv")
The Seabird CTD instrument is described at
\url{http://www.seabird.com/products/spec_sheets/19plusdata.htm}.
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/geod.dist.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ along the track starting from zero.
km <- geod.dist(45, 100, 46, 100)/1000
}
\references{}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca} packaged this, based on R code sent to him by Darren Gillis, who in 2003 had modified Fortran code written in 1974 by (according to comment cards in the source) L. Pfeifer and J. G. Gergen.}
\author{Dan Kelley packaged this, based on R code sent to him by Darren Gillis, who in 2003 had modified Fortran code written in 1974 by (according to comment cards in the source) L. Pfeifer and J. G. Gergen.}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/gravity.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ Compute \eqn{g}{g}, the acceleration due to gravity, as a function of latitude.
\strong{Caution:} Fofonoff and Millard (1983 UNESCO) use a different
formula.
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
4 changes: 1 addition & 3 deletions man/lat.format.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,5 @@ Format a latitude, using "S" for negative latitude.
}
\examples{
}
\references{
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
4 changes: 1 addition & 3 deletions man/latlon.format.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,5 @@ Format a latitude-longitude pair, using "S" for negative latitudes, etc.
}
\examples{
}
\references{
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/lobo.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ of Halifax by Satlantic.}
\url{http://www.satlantic.com/default.asp?mn=1.15.27.139}.
\url{http://www.mbari.org/lobo/}.
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
4 changes: 1 addition & 3 deletions man/lon.format.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,5 @@ Format a longitude, using "W" for west longitude.
}
\examples{
}
\references{
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/magic.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ magic(file)
\seealso{
This is used mainly by \code{\link{read.oce}}.
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
4 changes: 1 addition & 3 deletions man/make.section.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,5 @@ section <- make.section(ctd, ctd.warmed)
summary(section)
plot(section, at=c(1,2), labels=c("Original","Warmed"))
}
\references{
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
4 changes: 1 addition & 3 deletions man/oce.as.POSIXlt.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,5 @@ A POSIXlt object.
}
\examples{
}
\references{
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
3 changes: 1 addition & 2 deletions man/plot.TS.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,5 @@ TT <- Trange[1] + (Trange[2] - Trange[1]) *(1:N)/(N-1) + 0.01*rnorm(N)
plot.TS(as.ctd(S=SS, T=TT, p=0))
}
}
\references{}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
4 changes: 1 addition & 3 deletions man/plot.coastline.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,5 @@ library(oce)
data(coastline.world)
plot(coastline.world)
}
\references{
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
4 changes: 1 addition & 3 deletions man/plot.ctd.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,5 @@ library(oce)
data(ctd)
plot(ctd)
}
\references{
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
4 changes: 1 addition & 3 deletions man/plot.ctd.scan.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,5 @@ library(oce)
data(ctd)
plot.ctd.scan(ctd)
}
\references{
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/plot.lobo.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ plot(d)
\url{http://www.satlantic.com/default.asp?mn=1.15.27.139}
\url{http://www.mbari.org/lobo/}
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
4 changes: 1 addition & 3 deletions man/plot.profile.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,5 @@ plot(ctd)
plot.profile(ctd, type="T")
}
}
\references{
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/plot.sealevel.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,5 @@ to the topic, with the Canadian Hurricane Centre's
\url{http://www.atl.ec.gc.ca/weather/hurricane/juan/summary_e.html}
filling in some more technical details.
}
\author{Dan Kelley \email{[email protected]}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/plot.section.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,5 @@ data(coastline.world)
# Select the Gulf Stream region
plot(a03g,station.indices=seq(124,102),coastline=coastline.world,map.xlim=c(-80,-60))
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
4 changes: 1 addition & 3 deletions man/processing.log.append.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,5 @@ stn15$latitude <- stn15$latitude + 1
stn15 <- processing.log.append(stn15, "DEK: add 1 to latitude, correcting a typo")
}
}
\references{
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/processing.log.summary.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ processing.log.summary(ctd)
}
\references{
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/read.coastline.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,5 @@ lines(cl$data$longitude-360, cl$data$latitude)
The NOAA site \url{http://www.ngdc.noaa.gov/mgg/shorelines/shorelines.html}
is a good source for coastline data files.
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/read.ctd.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,5 @@ it does a reasonable job in many instances.
The WOCE-exchange format is described at
\url{http://www.nodc.noaa.gov/woce_V2/disk02/exchange/exchange_format_desc.htm}
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/read.lobo.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,5 @@ summary(lobo)
\url{http://www.satlantic.com/default.asp?mn=1.15.27.139}
\url{http://www.mbari.org/lobo/}
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/read.oce.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ plot(x) # summary with TS and profiles
plot.TS(x) # just the TS
}
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/read.sealevel.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ provides a graphical interface for downloading sealevel data; the format is desc
\url{ftp://ilikai.soest.hawaii.edu/rqds/hourly.fmt}. The MEDS data are at
\url{http://www.meds-sdmm.dfo-mpo.gc.ca/meds/Databases/TWL/TWL_inventory_e.htm}.}

\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}

\keyword{misc}
2 changes: 1 addition & 1 deletion man/read.section.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@ bottle data"} should turn up other sites, if this one ceases to exist. Only the
so-called \emph{exchange BOT} data format can be processed by read.section() at
this time.
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/sealevel.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ Note that Hurricane Juan hit Halifax on September 28th of 2003, causing a strong
\references{The MEDS archive is at \url{http://www.meds-sdmm.dfo-mpo.gc.ca/meds/Databases/TWL/TWL_inventory_e.htm}.
An entry to the literature about Hurricane Juan is at
\url{http://www.atl.ec.gc.ca/weather/hurricane/juan/}.}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/section.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ the lovely Point Pleasant Park.
A summary of the stations can be obtained from \code{\link{summary.section}},
and a plot can be created with \code{\link{plot.section}}.
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
4 changes: 1 addition & 3 deletions man/section.grid.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,5 @@ data(coastline.world)
# Select the Gulf Stream region
plot(a03g,station.indices=seq(124,102),coastline=coastline.world,map.xlim=c(-80,-60))
}
\references{
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
File renamed without changes.
2 changes: 1 addition & 1 deletion man/summary.coastline.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ plot(cl)
\references{
http://www.ngdc.noaa.gov/mgg/shorelines/shorelines.html
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/summary.ctd.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ summary(profile)
The Seabird CTD instrument is described at
\url{http://www.seabird.com/products/spec_sheets/19plusdata.htm}.
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/summary.lobo.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ summary(l)
\url{http://www.satlantic.com/default.asp?mn=1.15.27.139}
\url{http://www.mbari.org/lobo/}
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/summary.sealevel.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,5 @@ summary(sealevel)
\references{
\url{ftp://ilikai.soest.hawaii.edu/rqds/hourly.fmt}.
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/summary.section.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ library(oce)
data(section)
summary(section)
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
3 changes: 1 addition & 2 deletions man/sw.N2.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,5 @@ abline(v=0)
lines(sw.N2(p,sigthe,df=length(p)/4), -p)
abline(v=0)
}
\references{}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/sw.S.C.T.p.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ print(sw.S.C.T.p(0.65,5,1500)) # 27.99535
fundamental properties of seawater. \emph{Unesco Technical Papers in Marine
Science}, \bold{44}, 53 pp
}
\author{Dan Kelley \email{Dan.Kelley@Dal.Ca}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/sw.S.T.rho.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ with this function.
Gill, A.E., 1982. \emph{Atmosphere-ocean Dynamics},
Academic Press, New York, 662 pp.
}
\author{Dan Kelley \email{[email protected]}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/sw.T.S.rho.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@ temperature <- sw.T.S.rho(S, sig, p)
Gill, A.E., 1982. \emph{Atmosphere-ocean Dynamics},
Academic Press, New York, 662 pp.
}
\author{Dan Kelley \email{[email protected]}}
\author{Dan Kelley}
\keyword{misc}
2 changes: 1 addition & 1 deletion man/sw.T.freeze.Rd
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ UNESCO tech. papers in the marine science no. 28. 1978
eighth report JPOTS
Annex 6 freezing point of seawater F.J. Millero pp.29-35.
}
\author{Dan Kelley \email{[email protected]}}
\author{Dan Kelley}
\keyword{misc}
Loading

0 comments on commit f6cf20a

Please sign in to comment.