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 11970 for NEMO/branches/2019/ENHANCE-02_ISF_nemo_TEST_MERGE/src/OCE/nemogcm.F90 – NEMO

Ignore:
Timestamp:
2019-11-26T16:06:55+01:00 (4 years ago)
Author:
davestorkey
Message:

2019/ENHANCE-02_ISF_nemo_TEST_MERGE : copy changes from Pierre's branch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/ENHANCE-02_ISF_nemo_TEST_MERGE/src/OCE/nemogcm.F90

    r11536 r11970  
    6161   USE diaharm        ! tidal harmonics diagnostics  (dia_harm_init routine) 
    6262   USE step           ! NEMO time-stepping                 (stp     routine) 
     63   USE isfstp         ! ice shelf                     (isf_stp_init routine) 
    6364   USE icbini         ! handle bergs, initialisation 
    6465   USE icbstp         ! handle bergs, calving, themodynamics and transport 
     
    431432         RETURN                                       ! end of initialization 
    432433      ENDIF 
     434      ! 
    433435       
    434436                           CALL  istate_init    ! ocean initial state (Dynamics and tracers) 
     
    471473      !                                      ! Icebergs 
    472474                           CALL icb_init( rdt, nit000)   ! initialise icebergs instance 
     475 
     476                                                ! ice shelf 
     477                           CALL isf_init 
    473478 
    474479      !                                      ! Misc. options 
Note: See TracChangeset for help on using the changeset viewer.