Changeset 7104 for branches

Timestamp:

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

Author:

jcastill

Message:

Changes as in r6549 of branch 2015_CO6_CO5_shelfdiagnostic

Location:

branches/UKMO/r5936_CO6_CO5_shelfdiagnostic/NEMOGCM/NEMO/OPA_SRC

Files:

• DIA/dia25h.F90 (added)
• DIA/diainsitutem.F90 (added)
• DIA/diatmb.F90 (added)
• DIA/diawri.F90 (modified) (2 diffs)
• DYN/dynspg_ts.F90 (modified) (4 diffs)
• nemogcm.F90 (modified) (4 diffs)

branches/UKMO/r5936_CO6_CO5_shelfdiagnostic/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -43 +43 @@
    USE in_out_manager  ! I/O manager
    USE diadimg         ! dimg direct access file format output
+   USE diatmb          ! Top,middle,bottom output 
+   USE dia25h          ! 25h Mean output 
    USE iom
    USE ioipsl
@@ -379 +381 @@
       CALL wrk_dealloc( jpi , jpj      , z2d )
       CALL wrk_dealloc( jpi , jpj, jpk , z3d )
+      ! If we want tmb values  
+      
+      IF (ln_diatmb) THEN 
+         CALL dia_tmb  
+      ENDIF  
+      IF (ln_dia25h) THEN 
+         CALL dia_25h( kt ) 
+      ENDIF  
+      
       !
       IF( nn_timing == 1 )   CALL timing_stop('dia_wri')

branches/UKMO/r5936_CO6_CO5_shelfdiagnostic/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -40 +40 @@
    USE timing          ! Timing    
    USE sbcapr          ! surface boundary condition: atmospheric pressure
+   USE diatmb          ! Top,middle,bottom output 
    USE dynadv, ONLY: ln_dynadv_vec
 #if defined key_agrif
@@ -145 +146 @@
       INTEGER  ::   ji, jj, jk, jn        ! dummy loop indices
       INTEGER  ::   ikbu, ikbv, noffset      ! local integers
+      REAL(wp) ::   zmdi
       REAL(wp) ::   zraur, z1_2dt_b, z2dt_bf    ! local scalars
       REAL(wp) ::   zx1, zy1, zx2, zy2          !   -      -
@@ -170 +172 @@
       CALL wrk_alloc( jpi, jpj, zhf )
       !
+      zmdi=1.e+20                               !  missing data indicator for masking
       !                                         !* Local constant initialization
       z1_12 = 1._wp / 12._wp 
@@ -920 +923 @@
       CALL wrk_dealloc( jpi, jpj, zhf )
       !
+      IF ( ln_diatmb ) THEN 
+         CALL iom_put( "baro_u" , un_b*umask(:,:,1)+zmdi*(1-umask(:,:,1 ) ) )  ! Barotropic  U Velocity 
+         CALL iom_put( "baro_v" , vn_b*vmask(:,:,1)+zmdi*(1-vmask(:,:,1 ) ) )  ! Barotropic  V Velocity 
+      ENDIF 
       IF( nn_timing == 1 )  CALL timing_stop('dyn_spg_ts')
       !

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