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

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

Author: phgrosjean
Date: 2010-03-29 14:02:20 +0200 (Mon, 29 Mar 2010)
New Revision: 21

Removed:
   pkg/seacarb/R/pHinsi.r
Log:
Try to resolve the problem with pHinsi.r versus pHinsi.R

Deleted: pkg/seacarb/R/pHinsi.r
===================================================================
--- pkg/seacarb/R/pHinsi.r	2009-05-07 21:28:17 UTC (rev 20)
+++ pkg/seacarb/R/pHinsi.r	2010-03-29 12:02:20 UTC (rev 21)
@@ -1,22 +0,0 @@
-# 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)
-}