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 7941 for branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO – NEMO

Ignore:
Timestamp:
2017-04-20T18:19:33+02:00 (7 years ago)
Author:
jwhile
Message:

Merged in ciceiau branch

Location:
branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/ASM/asminc.F90

    r6498 r7941  
    766766         !   
    767767      ENDIF 
    768       ! Perhaps the following call should be in step 
    769       IF   ( ln_seaiceinc  )   CALL seaice_asm_inc ( kt )   ! apply sea ice concentration increment 
    770768      ! 
    771769   END SUBROUTINE tra_asm_inc 

  • branches/UKMO/dev_r5518_GO6_package/NEMOGCM/NEMO/OPA_SRC/step.F90

    r6755 r7941  
    117117      END DO 
    118118 
     119      IF( ln_seaiceinc ) & 
     120         &               CALL seaice_asm_inc ( kstp ) ! setup sea ice concentration increment 
    119121                         CALL sbc    ( kstp )         ! Sea Boundary Condition (including sea-ice) 
    120122                                                      ! clem: moved here for bdy ice purpose 
Note: See TracChangeset for help on using the changeset viewer.