Changeset 12068 for NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/nemogcm.F90

Timestamp:

2019-12-05T13:18:21+01:00 (4 years ago)

Author:

davestorkey

Message:

2019/UKMO_MERGE_2019 : Merging in changes from ENHANCE-02_ISF_nemo.

File:

• NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/nemogcm.F90 (modified) (3 diffs)

NEMO/branches/2019/UKMO_MERGE_2019/src/OCE/nemogcm.F90

@@ -61 +61 @@
    USE diaharm        ! tidal harmonics diagnostics  (dia_harm_init routine)
    USE step           ! NEMO time-stepping                 (stp     routine)
+   USE isfstp         ! ice shelf                     (isf_stp_init routine)
    USE icbini         ! handle bergs, initialisation
    USE icbstp         ! handle bergs, calving, themodynamics and transport
@@ -436 +437 @@
          RETURN                                       ! end of initialization
       ENDIF
+      !
       
                            CALL  istate_init( Nbb, Nnn, Naa )    ! ocean initial state (Dynamics and tracers)
@@ -476 +478 @@
       !                                      ! Icebergs
                            CALL icb_init( rdt, nit000)   ! initialise icebergs instance
+
+                                                ! ice shelf
+                           CALL isf_init( Nbb, Nnn, Naa )
 
       !                                      ! Misc. options