Changeset 9419 for branches/NERC

Timestamp:

2018-03-22T17:47:56+01:00 (7 years ago)

Author:

jpalmier

Message:

JPALM -- TOP last minute bug correction

Location:

branches/NERC/dev_r5518_GO6_CFC_CDIAC/NEMOGCM/NEMO/TOP_SRC

Files:

• CFC/trcsms_cfc.F90 (modified) (1 diff)
• trcini.F90 (modified) (2 diffs)

branches/NERC/dev_r5518_GO6_CFC_CDIAC/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90

@@ -140 +140 @@
          !! 2 -- Hindcast/proj
          iyear_beg = MOD(nyear, 100)
-         IF (iyear_beg < 20)  iyear_beg = iyear_beg + 100
+         IF (iyear_beg < 15)  iyear_beg = iyear_beg + 100
          !! JPALM -- Same than previously, if iyear_beg is out of P_cfc range,
          !!       we want to set p_CFC to 0.00 --> set iyear_beg = 10
-         IF ((iyear_beg < 30) .OR. (iyear_beg > 115)) iyear_beg = 10             
+         IF ( nyear < 1930)  iyear_beg = 10             
+         IF ( nyear >= 2015) iyear_beg = 114             
       ENDIF
       !!

branches/NERC/dev_r5518_GO6_CFC_CDIAC/NEMOGCM/NEMO/TOP_SRC/trcini.F90

@@ -36 +36 @@
    USE sbc_oce
    USE trcice          ! tracers in sea ice
+# if defined key_medusa 
    USE sms_medusa      ! MEDUSA   initialisation
+# endif
    IMPLICIT NONE
    PRIVATE
@@ -70 +72 @@
       REAL(wp), DIMENSION(6)           :: loc_cycletot3, loc_cycletot2
       REAL(wp), DIMENSION(jpi,jpj,jpk) :: ztot3d
-      REAL(wp), DIMENSION(jpi,jpj)     :: ztot2d, carea
-# endif
+      REAL(wp), DIMENSION(jpi,jpj)     :: ztot2d
+# endif
+      REAL(wp), DIMENSION(jpi,jpj)     :: carea
       CHARACTER (len=25) :: charout
       !!---------------------------------------------------------------------