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

Timestamp:

2017-05-18T11:14:31+02:00 (7 years ago)

Author:

marc

Message:

Removed about 40 2d arrays from bio_medusa_mod.F90

File:

• branches/UKMO/dev_r5518_medusa_chg_trc_bio_medusa/NEMOGCM/NEMO/TOP_SRC/MEDUSA/carb_chem.F90 (modified) (4 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_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,  &
-                                   f_pco2w, f_ph, f_pp0, f_rhosw,         &
-                                   f_schmidtco2, f_TALK, f_TDIC, f_xco2a, &
+      USE bio_medusa_mod,    ONLY: f_co2flux, f_co3, f_dcf,               &
+                                   f_h2co3, f_hco3, f_henry,              &
+                                   f_kw660, f_omarg, f_omcal,             &
+                                   f_pco2atm, f_pco2w, f_ph, f_pp0,       &
+                                   f_TALK, f_TDIC, f_xco2a,               &
 # if defined key_mocsy
                                    zpho,                                  &
@@ -72 +69 @@
       INTEGER, DIMENSION(jpi,jpj) ::     i2_omcal,i2_omarg
 
+      !! AXY (23/06/15): additional diagnostics for MOCSY and oxygen
+      REAL(wp) :: f_rhosw
+      !! Output arguments from mocsy_interface, which aren't used
+      REAL(wp) :: f_fco2w_dum, f_BetaD_dum, f_opres_dum
+      REAL(wp) :: f_insitut_dum, f_fco2atm_dum
+      REAL(wp) :: f_schmidtco2_dum, f_kwco2_dum, f_K0_dum
+      REAL(wp) :: f_co2starair_dum, f_dpco2_dum
       !! temporary variables
       REAL(wp) ::    fq0,fq1,fq2,fq3,fq4
 
+      INTEGER :: iters
+      !! Loop variables
       INTEGER :: ji, jj, jk
 
@@ -155 +161 @@
                                        gphit(ji,jj),f_kw660(ji,jj),         &
                                        f_xco2a(ji,jj),1,f_ph(ji,jj),        &
-                                       f_pco2w(ji,jj),f_fco2w(ji,jj),       &
+                                       f_pco2w(ji,jj),f_fco2w_dum,          &
                                        f_h2co3(ji,jj),f_hco3(ji,jj),        &
                                        f_co3(ji,jj),f_omarg(ji,jj),         &
-                                       f_omcal(ji,jj),f_BetaD(ji,jj),       &
-                                       f_rhosw(ji,jj),f_opres(ji,jj),       &
-                                       f_insitut(ji,jj),f_pco2atm(ji,jj),   &
-                                       f_fco2atm(ji,jj),f_schmidtco2(ji,jj),&
-                                       f_kwco2(ji,jj),f_K0(ji,jj),          &
-                                       f_co2starair(ji,jj),f_co2flux(ji,jj),& 
-                                       f_dpco2(ji,jj))
+                                       f_omcal(ji,jj),f_BetaD_dum,          &
+                                       f_rhosw,f_opres_dum,                 &
+                                       f_insitut_dum,f_pco2atm(ji,jj),      &
+                                       f_fco2atm_dum,f_schmidtco2_dum,      &
+                                       f_kwco2_dum,f_K0_dum,                &
+                                       f_co2starair_dum,f_co2flux(ji,jj),   & 
+                                       f_dpco2_dum)
                   !!
                   !! mmol / m3 -> umol / kg
-                  f_TDIC(ji,jj) = (zdic(ji,jj) / f_rhosw(ji,jj)) * 1000.
+                  f_TDIC(ji,jj) = (zdic(ji,jj) / f_rhosw) * 1000.
                   !! meq / m3 -> ueq / kg
-                  f_TALK(ji,jj) = (zalk(ji,jj) / f_rhosw(ji,jj)) * 1000.
-                  f_dcf(ji,jj)  = f_rhosw(ji,jj)
+                  f_TALK(ji,jj) = (zalk(ji,jj) / f_rhosw) * 1000.
+                  f_dcf(ji,jj)  = f_rhosw
 #  else
                   !! AXY (22/06/15): use old PML carbonate chemistry 
@@ -183 +189 @@
                                       f_co2flux(ji,jj),f_TDIC(ji,jj),       &
                                       f_TALK(ji,jj),f_dcf(ji,jj),           &
-                                      f_henry(ji,jj),iters(ji,jj))
+                                      f_henry(ji,jj),iters)
                   !! 
                   !! AXY (28/02/14): check output fields
-                  IF (iters(ji,jj) .eq. 25) THEN
+                  IF (iters .eq. 25) THEN
                      IF(lwp) WRITE(numout,*)                                &
-                        ' carb_chem: 3D ITERS WARNING, ',                   &
-                        iters(ji,jj), ' AT (', ji, ', ', jj, ', ',          &
-                        jk, ') AT ', kt
+                        ' carb_chem: 3D ITERS WARNING, ', iters, ' AT (',   &
+                        ji, ', ', jj, ', ', jk, ') AT ', kt
                   ENDIF
 #  endif