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 13687 – NEMO

Changeset 13687


Ignore:
Timestamp:
2020-10-28T10:57:37+01:00 (3 years ago)
Author:
dancopsey
Message:

Fix merge conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/NEMO_4.0.1_implicit_ice_drag/src/OCE/SBC/sbc_ice.F90

    r13670 r13687  
    129129         &      dqns_ice(jpi,jpj,jpl) , tn_ice   (jpi,jpj,jpl) , alb_ice    (jpi,jpj,jpl) ,   & 
    130130         &      qml_ice (jpi,jpj,jpl) , qcn_ice  (jpi,jpj,jpl) , qtr_ice_top(jpi,jpj,jpl) ,   & 
    131          &      rCdU_ice   (jpi,jpj)  ,                                                       & 
     131         &      rCdU_ice(jpi,jpj)     ,                                                       & 
    132132         &      utau_ice(jpi,jpj)     , vtau_ice (jpi,jpj)     , wndm_ice   (jpi,jpj)     ,   & 
    133133         &      evap_ice(jpi,jpj,jpl) , devap_ice(jpi,jpj,jpl) , qprec_ice  (jpi,jpj)     ,   & 
Note: See TracChangeset for help on using the changeset viewer.