--- MITgcm_contrib/bling/pkg/bling_airseaflux.F	2014/05/23 17:33:42	1.1
+++ MITgcm_contrib/bling/pkg/bling_airseaflux.F	2016/02/28 21:49:24	1.3
@@ -1,4 +1,4 @@
-C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/bling/pkg/bling_airseaflux.F,v 1.1 2014/05/23 17:33:42 mmazloff Exp $
+C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/bling/pkg/bling_airseaflux.F,v 1.3 2016/02/28 21:49:24 mmazloff Exp $
 C $Name:  $
 
 #include "BLING_OPTIONS.h"
@@ -6,7 +6,7 @@
 
 CBOP
       subroutine BLING_AIRSEAFLUX( 
-     I           PTR_DIC, PTR_ALK, PTR_NUT, PTR_O2, 
+     I           PTR_DIC, PTR_ALK, PTR_O2, PTR_NO3, PTR_PO4, 
      O           SGDIC, SGO2, 
      I           bi, bj, imin, imax, jmin, jmax,
      I           myIter, myTime, myThid)
@@ -34,7 +34,7 @@
 #ifdef ALLOW_EXF
 # include "EXF_FIELDS.h"
 #endif
-#ifdef ALLOW_AUTODIFF_TAMC
+#ifdef ALLOW_AUTODIFF
 # include "tamc.h"
 #endif
 
@@ -49,11 +49,13 @@
 C     === Input ===
 C     PTR_DIC          :: DIC tracer field
 C     PTR_ALK          :: alkalinity tracer field
-C     PTR_NUT          :: macro-nutrient tracer field
+C     PTR_NO3          :: nitrate tracer field
+C     PTR_PO4          :: phosphate tracer field
 C     PTR_O2           :: oxygen tracer field
       _RL  PTR_DIC(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
       _RL  PTR_ALK(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
-      _RL  PTR_NUT(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
+      _RL  PTR_NO3(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
+      _RL  PTR_PO4(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
       _RL  PTR_O2 (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr)
 C     === Output ===
 C     SGDIC            :: tendency of DIC due to air-sea exchange 
@@ -110,7 +112,7 @@
 
              surfalk(i,j)  = PTR_ALK(i,j,1)
      &                          * maskC(i,j,1,bi,bj)
-             surfphos(i,j) = PTR_NUT(i,j,1)/NUTfac
+             surfphos(i,j) = PTR_PO4(i,j,1)
      &                          * maskC(i,j,1,bi,bj)
 
 C FOR NON-INTERACTIVE Si
@@ -138,7 +140,7 @@
 
 C Pre-compute part of exchange coefficient: pisvel*(1-fice)
 C Schmidt number is accounted for later
-              pisvel(i,j) = 0.337 _d 0 *wind(i,j,bi,bj)**2/3.6 _d 5
+              pisvel(i,j) = 0.337 _d 0 * wind(i,j,bi,bj)**2/3.6 _d 5
               Kwexch_Pre(i,j) = pisvel(i,j)
      &                              * (1. _d 0 - FIce(i,j,bi,bj))
 
@@ -171,6 +173,7 @@
           ELSE
             pCO2(i,j,bi,bj) = 0. _d 0
           ENDIF
+
         ENDDO
        ENDDO
 
@@ -189,7 +192,7 @@
              SchmidtNoDIC(i,j)=max(1.0 _d -2, SchmidtNoDIC(i,j))
 
 C First determine local saturation pCO2
-#ifdef USE_EXFPCO2
+#ifdef USE_EXFCO2
               pCO2sat(i,j) = apco2(i,j,bi,bj) 
 #else
               pCO2sat(i,j) = bling_pCO2