Changeset 7104 for branches/UKMO/r5936_CO6_CO5_shelfdiagnostic/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

2016-10-26T14:37:32+02:00 (8 years ago)

Author:

jcastill

Message:

Changes as in r6549 of branch 2015_CO6_CO5_shelfdiagnostic

File:

• branches/UKMO/r5936_CO6_CO5_shelfdiagnostic/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (4 diffs)

branches/UKMO/r5936_CO6_CO5_shelfdiagnostic/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -84 +84 @@
    USE crsini          ! initialise grid coarsening utility
    USE lbcnfd , ONLY   : isendto, nsndto, nfsloop, nfeloop   ! Setup of north fold exchanges 
+   USE diatmb          ! Top,middle,bottom output 
+   USE dia25h          ! 25h mean output 
    USE sbc_oce, ONLY   : lk_oasis
    USE stopar
@@ -470 +472 @@
       IF( lk_asminc     )   CALL asm_inc_init   ! Initialize assimilation increments
       IF(lwp) WRITE(numout,*) 'Euler time step switch is ', neuler
+                            CALL dia_tmb_init  ! TMB outputs 
+                            CALL dia_25h_init  ! 25h mean outputs 
       !
    END SUBROUTINE nemo_init
@@ -622 +626 @@
       USE dom_oce   , ONLY: dom_oce_alloc
       USE trc_oce   , ONLY: trc_oce_alloc
+      USE diainsitutem, ONLY: insitu_tem_alloc
 #if defined key_diadct 
       USE diadct    , ONLY: diadct_alloc 
@@ -636 +641 @@
       ierr = ierr + dom_oce_alloc   ()          ! ocean domain
       ierr = ierr + zdf_oce_alloc   ()          ! ocean vertical physics
+      ierr = ierr + insitu_tem_alloc()
       !
       ierr = ierr + trc_oce_alloc   ()          ! shared TRC / TRA arrays