Changeset 9419


Ignore:
Timestamp:
2018-03-22T17:47:56+01:00 (2 years ago)
Author:
jpalmier
Message:

JPALM — TOP last minute bug correction

Location:
branches/NERC/dev_r5518_GO6_CFC_CDIAC/NEMOGCM/NEMO/TOP_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/NERC/dev_r5518_GO6_CFC_CDIAC/NEMOGCM/NEMO/TOP_SRC/CFC/trcsms_cfc.F90

    r9163 r9419  
    140140         !! 2 -- Hindcast/proj 
    141141         iyear_beg = MOD(nyear, 100) 
    142          IF (iyear_beg < 20)  iyear_beg = iyear_beg + 100 
     142         IF (iyear_beg < 15)  iyear_beg = iyear_beg + 100 
    143143         !! JPALM -- Same than previously, if iyear_beg is out of P_cfc range, 
    144144         !!       we want to set p_CFC to 0.00 --> set iyear_beg = 10 
    145          IF ((iyear_beg < 30) .OR. (iyear_beg > 115)) iyear_beg = 10              
     145         IF ( nyear < 1930)  iyear_beg = 10              
     146         IF ( nyear >= 2015) iyear_beg = 114              
    146147      ENDIF 
    147148      !! 
  • branches/NERC/dev_r5518_GO6_CFC_CDIAC/NEMOGCM/NEMO/TOP_SRC/trcini.F90

    r9262 r9419  
    3636   USE sbc_oce 
    3737   USE trcice          ! tracers in sea ice 
     38# if defined key_medusa  
    3839   USE sms_medusa      ! MEDUSA   initialisation 
     40# endif 
    3941   IMPLICIT NONE 
    4042   PRIVATE 
     
    7072      REAL(wp), DIMENSION(6)           :: loc_cycletot3, loc_cycletot2 
    7173      REAL(wp), DIMENSION(jpi,jpj,jpk) :: ztot3d 
    72       REAL(wp), DIMENSION(jpi,jpj)     :: ztot2d, carea 
    73 # endif 
     74      REAL(wp), DIMENSION(jpi,jpj)     :: ztot2d 
     75# endif 
     76      REAL(wp), DIMENSION(jpi,jpj)     :: carea 
    7477      CHARACTER (len=25) :: charout 
    7578      !!--------------------------------------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.