New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 7492 for branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO – NEMO

Ignore:
Timestamp:
2016-12-13T17:45:59+01:00 (7 years ago)
Author:
timgraham
Message:

Final merge of head of v3.6 STABLE branch into this branch

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/v3_6_extra_CMIP6_diagnostics/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

    r7491 r7492  
    14951495      IF( iom_use('snow_ai_cea') )   CALL iom_put( 'snow_ai_cea', sprecip(:,:) *           zsnw(:,:)   )  ! Snow over sea-ice         (cell average) 
    14961496#else 
    1497 ! runoffs and calving (put in emp_tot) 
     1497      ! runoffs and calving (put in emp_tot) 
    14981498      IF( srcv(jpr_rnf)%laction )   rnf(:,:) = frcv(jpr_rnf)%z3(:,:,1) 
    14991499      IF( iom_use('hflx_rnf_cea') )   & 
Note: See TracChangeset for help on using the changeset viewer.