Changeset 7958 for branches/UKMO/dev_r5518_medusa_chg_trc_bio_medusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/carb_chem.F90

Timestamp:

2017-04-24T13:30:28+02:00 (7 years ago)

Author:

marc

Message:

Pulled air-sea gas exchange and river inputs from trcbio_medusa.F90 into air_sea.F90

File:

• branches/UKMO/dev_r5518_medusa_chg_trc_bio_medusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/carb_chem.F90 (modified) (6 diffs)

branches/UKMO/dev_r5518_medusa_chg_trc_bio_medusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/carb_chem.F90

@@ -31 +31 @@
       !!  - ...
       !!----------------------------------------------------------------------
-      USE bio_medusa_mod,    ONLY: iters, f_BetaD, f_dcf, f_fco2atm,      &
-                                   f_co2flux, f_co2starair, f_co3,        &
-                                   f_fco2w, f_dpco2, f_h2co3, f_hco3,     &
+      USE bio_medusa_mod,    ONLY: iters, f_BetaD, f_co2flux,             &
+                                   f_co2starair, f_co3, f_dcf, f_dpco2,   &
+                                   f_fco2atm, f_fco2w, f_h2co3, f_hco3,   &
+                                   f_henry,                               &
                                    f_insitut, f_K0, f_kw660, f_kwco2,     &
                                    f_omarg, f_omcal, f_opres, f_pco2atm,  &
@@ -82 +83 @@
       i2_omarg(:,:) = 0
 
-      !! loop over 3D space
+      !! Loop over levels
       DO jk = 1,jpk
+
          DO jj = 2,jpjm1
             DO ji = 2,jpim1
                !! OPEN wet point IF..THEN loop
-               if (tmask(ji,jj,jk).eq.1) then
+               IF (tmask(ji,jj,jk).eq.1) THEN
                   IF (lk_oasis) THEN
                      !! use 2D atm xCO2 from atm coupling
@@ -116 +118 @@
                         ' at (', ji, ',', jj, ',', jk, ') at time', kt
                 IF(lwp) WRITE(numout,*)                                 &
-                        ' carb_chem: T SWITCHING 3D, ',                 &
+                        ' carb_chem: T SWITCHING 3D, ',                      &
          tsn(ji,jj,jk,jp_tem), ' -> ', tsb(ji,jj,jk,jp_tem)
                      ztmp(ji,jj) = tsb(ji,jj,jk,jp_tem)     !! temperature
@@ -125 +127 @@
                         ' at (', ji, ',', jj, ',', jk, ') at time', kt
                   endif
-! MAYBE BUT A BREAK IN HERE - marc
-                  !!
-                  !! Blank input variables not used at this stage (they 
-                  !! relate to air-sea flux)
-                  f_kw660(ji,jj) = 1.0
-                  f_pp0(ji,jj)   = 1.0
-                  !!
+               ENDIF
+            ENDDO
+         ENDDO
+
+         !! Blank input variables not used at this stage (they 
+         !! relate to air-sea flux)
+         f_kw660(:,:) = 1.0
+         f_pp0(:,:)   = 1.0
+
+         DO jj = 2,jpjm1
+            DO ji = 2,jpim1
+               IF (tmask(ji,jj,jk).eq.1) THEN
                   !! calculate carbonate chemistry at grid cell midpoint
 #  if defined key_mocsy
@@ -168 +175 @@
                                       f_omcal(ji,jj),f_omarg(ji,jj),        &
                                       f_co2flux(ji,jj),f_TDIC(ji,jj),       &
-                                      f_TALK(ji,jj), f_dcf(ji,jj),          &
-                                      f_henry(ji,jj), iters(ji,jj))
+                                      f_TALK(ji,jj),f_dcf(ji,jj),           &
+                                      f_henry(ji,jj),iters(ji,jj))
                   !! 
                   !! AXY (28/02/14): check output fields
@@ -229 +236 @@
                      i2_omarg(ji,jj)   = 1
                   endif
-               endif
+               ENDIF
             ENDDO
          ENDDO