[Seacarb-commits] r18 - / pkg/seacarb pkg/seacarb/R

[noreply at r-forge.r-project.org]

Author: phgrosjean
Date: 2009-05-04 14:52:26 +0200 (Mon, 04 May 2009)
New Revision: 18

Added:
   pkg/seacarb/R/pHinsi.r
Removed:
   DESCRIPTION
   README
   pkg/seacarb/README
Log:
Version 2.1.1 clean up

Deleted: DESCRIPTION
===================================================================
--- DESCRIPTION	2009-05-03 09:56:58 UTC (rev 17)
+++ DESCRIPTION	2009-05-04 12:52:26 UTC (rev 18)
@@ -1,10 +0,0 @@
-Package: seacarb
-Title: Calculates parameters of the seawater carbonate system
-Version: 2.1.1
-Date: 2009-04-30
-Author: Heloise Lavigne and Aurelien Proye and Jean-Pierre Gattuso. Portions of code and/or corrections were contributed by Jean-Marie Epitalon, Andreas Hofmann, Bernard Gentili, Jim Orr and Karline Soetaert
-Description: Calculates parameters of the seawater carbonate system
-Maintainer: Jean-Pierre Gattuso <gattuso at obs-vlfr.fr>
-URL: http://www.obs-vlfr.fr/~gattuso/seacarb.php
-License: GPL version 2 or newer
-Packaged: Mon Feb 23 06:50:25 2009; gattuso

Deleted: README
===================================================================
--- README	2009-05-03 09:56:58 UTC (rev 17)
+++ README	2009-05-04 12:52:26 UTC (rev 18)
@@ -1,10 +0,0 @@
-1. Put any C/C++/Fortran code in 'src'
-2. If you have compiled code, add a .First.lib() function in 'R'
-   to load the shared library
-3. Edit the help file skeletons in 'man'
-4. Run R CMD build to create the index files
-5. Run R CMD check to check the package
-6. Run R CMD build to make the package file
-
-
-Read "Writing R Extensions" for more information.

Added: pkg/seacarb/R/pHinsi.r
===================================================================
--- pkg/seacarb/R/pHinsi.r	                        (rev 0)
+++ pkg/seacarb/R/pHinsi.r	2009-05-04 12:52:26 UTC (rev 18)
@@ -0,0 +1,22 @@
+# Copyright (C) 2003 Jean-Pierre Gattuso and Aurelien Proye
+#
+# This file is part of seacarb.
+#
+# Seacarb is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or any later version.
+#
+# Seacarb is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with seacarb; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#
+#
+"pHinsi" <- function(PH=8.2, ALK=2.4e-3, Tinsi=20, Tlab=25, S=35, Pt = 0, Sit = 0, k1k2='l', kf='pf', pHscale="T") {
+	# according to Hunter (1998)
+	#si TA=0 alors calculer TA: TA=660+47.6 * S
+	dat1 <- carb(flag = 8, var1 = PH, var2 = ALK, S = S, T = Tlab, P = 0, Pt = Pt, Sit = Sit, k1k2=k1k2, kf=kf, pHscale=pHscale)
+	DIC <- dat1$DIC
+	dat2 <- carb(flag = 15, var1 = ALK, var2 = DIC, S = S, T = Tinsi, P = 0, Pt = Pt, Sit = Sit, k1k2=k1k2, kf=kf, pHscale=pHscale)
+	ph_insi <- dat2$pH
+	#utiliser DIC et TA pour calculer pH in situ (flag=15)
+	#attr(bor,"unit") <- "mol/kg"
+	return(ph_insi)
+}


Property changes on: pkg/seacarb/R/pHinsi.r
___________________________________________________________________
Name: svn:executable
   + *

Deleted: pkg/seacarb/README
===================================================================
--- pkg/seacarb/README	2009-05-03 09:56:58 UTC (rev 17)
+++ pkg/seacarb/README	2009-05-04 12:52:26 UTC (rev 18)
@@ -1,10 +0,0 @@
-1. Put any C/C++/Fortran code in 'src'
-2. If you have compiled code, add a .First.lib() function in 'R'
-   to load the shared library
-3. Edit the help file skeletons in 'man'
-4. Run R CMD build to create the index files
-5. Run R CMD check to check the package
-6. Run R CMD build to make the package file
-
-
-Read "Writing R Extensions" for more information.