Changeset 7894 for branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/mocsy_mainmod.F90

Timestamp:

2017-04-11T13:58:38+02:00 (7 years ago)

Author:

jpalmier

Message:

JPALM -- 11-04-2017 -- MEDUSA spring tidy-up refreshning session

File:

• branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/mocsy_mainmod.F90 (modified) (7 diffs)

branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/mocsy_mainmod.F90

@@ -618 +618 @@
   !       -> 'm10' means use Millero (2010) formulation for K1 & K2 (see Dickson et al., 2007)
   !                **** Valid for 0 < T < 50°C and 1 < S < 50 psu
+  !       -> 'w14' means use Waters (2014) formulation for K1 & K2 (see Dickson et al., 2007)
+  !                **** Valid for 0 < T < 50°C and 1 < S < 50 psu
   !     -----------
   !     optKf:
@@ -675 +677 @@
 !f2py character*2 optional, intent(in) :: optKf='pf'
   CHARACTER(2), OPTIONAL, INTENT(in) :: optKf
-  !> for K1,K2 choose either \b 'l' (Lueker et al., 2000) or \b 'm10' (Millero, 2010) 
+  !> for K1,K2 choose either \b 'l' (Lueker et al., 2000) or \b 'm10' (Millero, 2010) or \b 'w14' (Waters et al., 2014)
 !f2py character*3 optional, intent(in) :: optK1K2='l'
   CHARACTER(3), OPTIONAL, INTENT(in) :: optK1K2
@@ -946 +948 @@
                   - 0.01781d0*s + 0.0001122d0*s2))
         ELSEIF (trim(opK1K2) == 'm10') THEN
-!         Millero (2010, Mar. Fresh Wat. Res.) (total pH scale)
-!         pK1o = 6320.813d0*invtk + 19.568224d0*dlogtk -126.34048d0
-!         ma1 = 13.4051d0*sqrts + 0.03185d0*s - (5.218e-5)*s2
-!         mb1 = -531.095d0*sqrts - 5.7789d0*s
-!         mc1 = -2.0663d0*sqrts
-!         pK1 = pK1o + ma1 + mb1*invtk + mc1*dlogtk
-!         K1(i) = 10.0d0**(-pK1) 
-
-!         pK2o = 5143.692d0*invtk + 14.613358d0*dlogtk -90.18333d0
-!         ma2 = 21.5724d0*sqrts + 0.1212d0*s - (3.714e-4)*s2
-!         mb2 = -798.292d0*sqrts - 18.951d0*s
-!         mc2 = -3.403d0*sqrts
-!         pK2 = pK2o + ma2 + mb2*invtk + mc2*dlogtk
-!         K2(i) = 10.0d0**(-pK2)
-
 !         Millero (2010, Mar. Fresh Wat. Res.) (seawater pH scale)
           pK1o = 6320.813d0*invtk + 19.568224d0*dlogtk -126.34048d0
@@ -975 +962 @@
           pK2 = pK2o + ma2 + mb2*invtk + mc2*dlogtk
           K2(i) = 10.0d0**(-pK2)
+        ELSEIF (trim(opK1K2) == 'w14') THEN
+!         Waters, Millero, Woosley (Mar. Chem., 165, 66-67, 2014) (seawater scale)
+          pK1o = 6320.813d0*invtk + 19.568224d0*dlogtk -126.34048d0
+          ma1 = 13.409160d0*sqrts + 0.031646d0*s - (5.1895e-5)*s2
+          mb1 = -531.3642d0*sqrts - 5.713d0*s
+          mc1 = -2.0669166d0*sqrts
+          pK1 = pK1o + ma1 + mb1*invtk + mc1*dlogtk
+          K1(i) = 10.0d0**(-pK1) 
+
+          pK2o = 5143.692d0*invtk + 14.613358d0*dlogtk -90.18333d0
+          ma2 = 21.225890d0*sqrts + 0.12450870d0*s - (3.7243e-4_r8)*s2
+          mb2 = -779.3444d0*sqrts - 19.91739d0*s
+          mc2 = -3.3534679d0*sqrts
+          pK2 = pK2o + ma2 + mb2*invtk + mc2*dlogtk
+          K2(i) = 10.0d0**(-pK2)
         ELSE
-           PRINT *, "optK1K2 must be either 'l' or 'm10'"
+           PRINT *, "optK1K2 must be either 'l' or 'm10', or 'w14'"
            STOP
         ENDIF
@@ -1629 +1631 @@
 ! Local variables
   REAL(kind=wp) :: ssal, salk, sdic, ssil, sphos
-
   REAL(kind=wp) :: tempot, tempis68, tempot68
-! REAL(kind=wp) :: dtempot, dtempot68
   REAL(kind=wp) :: drho
 
@@ -1954 +1954 @@
   !> hydrostatic pressure [db]
   REAL(kind=wp), INTENT(in), DIMENSION(N) :: p
-!f2py optional , depend(pCO2) :: n=len(pCO2)
 
 ! OUTPUT variables:
@@ -2021 +2020 @@
   !> hydrostatic pressure [db]
   REAL(kind=wp), INTENT(in), DIMENSION(N) :: p
-!f2py optional , depend(pCO2) :: n=len(pCO2)
 
 ! OUTPUT variables: