Ignore:
Timestamp:
2020-07-21T09:57:50+02:00 (5 months ago)
Author:
gm
Message:

fixes from last merge qco r12983

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2020/dev_r12527_Gurvan_ShallowWater/src/OCE/ASM/asminc.F90

    r13151 r13328  
    900900         IF ( kt == nitdin_r ) THEN 
    901901            ! 
    902 <<<<<<< .working 
    903             l_1st_euler = 0              ! Force Euler forward step 
    904 ======= 
    905902            l_1st_euler = .TRUE.              ! Force Euler forward step 
    906 >>>>>>> .merge-right.r13092 
    907903            ! 
    908904            ! Sea-ice : SI3 case 
Note: See TracChangeset for help on using the changeset viewer.