Changeset 7880 for branches/NERC/dev_r5518_NOC_MEDUSA_Stable

Timestamp:

2017-04-06T12:59:22+02:00 (7 years ago)

Author:

marc

Message:

Marc 6/4/17. Fix bug where flatx is not set in call to mocsy_interface

File:

• branches/NERC/dev_r5518_NOC_MEDUSA_Stable/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90 (modified) (5 diffs)

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

@@ -354 +354 @@
       REAL(wp) ::    f_riv_loc_n, f_riv_loc_si, f_riv_loc_c, f_riv_loc_alk
       !!
-      !! horizontal grid location
-      REAL(wp) ::    flatx, flonx
-      !!
       !! Jpalm -- 11-10-2015 -- adapt diag to iom_use
       !! 2D var for diagnostics.
@@ -1401 +1398 @@
                      !!                 chemistry package
                      CALL mocsy_interface( ztmp, zsal, zalk, zdic, zsil, zpho,         &    ! inputs
-                     f_pp0, fdep2, flatx, f_kw660, f_xco2a, 1,                         &    ! inputs
+                     f_pp0, fdep2, gphit(ji,jj), f_kw660, f_xco2a, 1,                  &    ! inputs
                      f_ph, f_pco2w, f_fco2w, f_h2co3, f_hco3, f_co3, f_omarg(ji,jj),   &    ! outputs
                      f_omcal(ji,jj), f_BetaD, f_rhosw, f_opres, f_insitut,             &    ! outputs
@@ -1523 +1520 @@
                !! AXY (01/03/10): set up level depth (bottom of level)
                fdep1 = fdep + fthk
-               !! AXY (17/05/13): where am I?
-               flatx = gphit(ji,jj)
-               flonx = glamt(ji,jj)
                !! AXY (28/11/16): local seafloor depth
                !!                 previously mbathy(ji,jj) - 1, now mbathy(ji,jj)
@@ -1762 +1756 @@
                   !!                 zero in this call
                   CALL mocsy_interface( ztmp, zsal, zalk, zdic, zsil, zpho,        &  ! inputs
-                  f_pp0, 0.0, flatx, f_kw660, f_xco2a, 1,                          &  ! inputs
+                  f_pp0, 0.0, gphit(ji,jj), f_kw660, f_xco2a, 1,                   &  ! inputs
                   f_ph, f_pco2w, f_fco2w, f_h2co3, f_hco3, f_co3, f_omarg(ji,jj),  &  ! outputs
                   f_omcal(ji,jj), f_BetaD, f_rhosw, f_opres, f_insitut,            &  ! outputs
@@ -3895 +3889 @@
                !!                 away with if I switch off BGC fluxes in the Gulf of 
                !!                 Finland, which currently appears the source of trouble
-               if ( flonx.gt.24.7 .and. flonx.lt.27.8 .and. &
-                  &   flatx.gt.59.2 .and. flatx.lt.60.2 ) then
+               if ( glamt(ji,jj).gt.24.7 .and. glamt(ji,jj).lt.27.8 .and. &
+                  &   gphit(ji,jj).gt.59.2 .and. gphit(ji,jj).lt.60.2 ) then
                   ibio_switch = 0
                endif