Ignore:
Timestamp:
2015-07-15T17:46:12+02:00 (5 years ago)
Author:
andrewryan
Message:

merged in latest version of trunk alongside changes to SAO_SRC to be compatible with latest OBS

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_r4650_UKMO14.12_STAND_ALONE_OBSOPER/NEMOGCM/NEMO/TOP_SRC/trcini.F90

    r5034 r5600  
    3131   USE lib_mpp         ! distribued memory computing library 
    3232   USE sbc_oce 
     33   USE trcice          ! tracers in sea ice 
    3334  
    3435   IMPLICIT NONE 
     
    7172      CALL top_alloc()              ! allocate TOP arrays 
    7273 
    73 #if defined key_offline 
    74       ltrcdm2dc = .FALSE. 
    75 #endif 
    76  
    77       IF( ltrcdm2dc )CALL ctl_warn( ' Diurnal cycle on physics but not in PISCES or LOBSTER ' ) 
     74      l_trcdm2dc = ln_dm2dc .OR. ( ln_cpl .AND. ncpl_qsr_freq /= 1 ) 
     75      l_trcdm2dc = l_trcdm2dc  .AND. .NOT. lk_offline 
     76      IF( l_trcdm2dc .AND. lwp ) & 
     77         &   CALL ctl_warn(' Coupling with passive tracers and used of diurnal cycle. & 
     78         & Computation of a daily mean shortwave for some biogeochemical models) ') 
    7879 
    7980      IF( nn_cla == 1 )   & 
     
    100101      IF( lk_c14b    )       CALL trc_ini_c14b         ! C14 bomb  tracer 
    101102      IF( lk_my_trc  )       CALL trc_ini_my_trc       ! MY_TRC  tracers 
     103 
     104      CALL trc_ice_ini                                 ! Tracers in sea ice 
    102105 
    103106      IF( lwp ) THEN 
     
    143146  
    144147      tra(:,:,:,:) = 0._wp 
    145       IF( ln_zps .AND. .NOT. lk_c1d )   &              ! Partial steps: before horizontal gradient of passive 
    146         &    CALL zps_hde( nit000, jptra, trn, pgtu=gtru, pgtv=gtrv, sgtu=gtrui, sgtv=gtrvi )       ! tracers at the bottom ocean level 
     148      IF( ln_zps .AND. .NOT. lk_c1d .AND. .NOT. ln_isfcav )   &              ! Partial steps: before horizontal gradient of passive 
     149        &    CALL zps_hde    ( nit000, jptra, trn, gtru, gtrv  )  ! Partial steps: before horizontal gradient 
     150      IF( ln_zps .AND. .NOT. lk_c1d .AND.       ln_isfcav )   & 
     151        &    CALL zps_hde_isf( nit000, jptra, trn, pgtu=gtru, pgtv=gtrv, pgtui=gtrui, pgtvi=gtrvi )       ! tracers at the bottom ocean level 
     152 
    147153 
    148154      ! 
Note: See TracChangeset for help on using the changeset viewer.