Changeset 10047 for branches/NERC/dev_r5518_GO6_under_ice_relax/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90

Timestamp:

2018-08-08T17:12:35+02:00 (6 years ago)

Author:

jpalmier

Message:

merge with GO6_package_branch 9385-10020 ; plus debug OMIP_DIC

File:

• branches/NERC/dev_r5518_GO6_under_ice_relax/NEMOGCM/NEMO/TOP_SRC/MEDUSA/trcbio_medusa.F90 (modified) (7 diffs)

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

@@ -75 +75 @@
 # endif
 # if defined key_omip_dic
-                                            zomd,                           &
+                                            zomd,f_pi_xco2a,                &
 # endif                                            
 # if defined key_mocsy
@@ -83 +83 @@
                                             zfer, zpds, zphd, zphn, zsil,   &
                                             zzme, zzmi
-      USE dom_oce,                    ONLY: e3t_0, e3t_n,                   &
-                                            gdept_0, gdept_n,               &
-                                            gdepw_0, gdepw_n,               &
-                                            nday_year, nsec_day,            &
+      USE dom_oce,                    ONLY: e3t_0, gdept_0,  gdepw_0,       &
+                                            nday_year, nsec_day,            & 
                                             nyear, nyear_len, ndastp,       &
                                             nsec_month,                     &
                                             rdt, tmask, mig, mjg, nimpp,    &
                                             njmpp 
+#if defined key_vvl
+      USE dom_oce,                    ONLY: e3t_n, gdept_n,  gdepw_n
+#endif
+
       USE in_out_manager,             ONLY: lwp, numout, nn_date0
-# if defined key_iomput
       USE iom,                        ONLY: lk_iomput
-# endif
       USE lbclnk,                     ONLY: lbc_lnk
       USE lib_mpp,                    ONLY: mpp_max, mpp_maxloc,            & 
@@ -384 +384 @@
 
 #  if defined key_omip_dic
-         f_xco2a(:,:) = 284.317          !! CMIP6 pre-industrial pCO2
+         f_pi_xco2a(:,:) = 284.317          !! CMIP6 pre-industrial pCO2
 #  endif
       
@@ -708 +708 @@
                            ji, jj, jk, kt
                      endif
-#  if defined key_omip_dic
+#   if defined key_omip_dic
                      if (trn(ji,jj,jk,jpomd).lt.0.) then
                         IF (lwp) write (numout,*)                            &
@@ -717 +717 @@
                            ji, jj, jk, kt
                      endif
+#   endif
 #  endif
                   endif
@@ -839 +840 @@
       !! temporary variables
       REAL(wp), INTENT( in ), DIMENSION(3,3) :: tiny_var, tiny_mask
-      CHARACTER(25), INTENT( in )            :: var_nm
+      CHARACTER(3), INTENT( in )            :: var_nm
       REAL(wp), INTENT( in )                 :: mini, maxi
       REAL(wp), INTENT( out )                :: varout
@@ -1043 +1044 @@
 CONTAINS
    SUBROUTINE trc_bio_medusa( kt )                   ! Empty routine
+      IMPLICIT NONE
       INTEGER, INTENT( in ) ::   kt
       WRITE(*,*) 'trc_bio_medusa: You should not have seen this print! error?', kt