Changeset 6035 for branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO

Timestamp:

2015-12-11T12:13:32+01:00 (8 years ago)

Author:

timgraham

Message:

Merged branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics into branch

Location:

branches/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC

Files:

• DIA/dia25h.F90 (copied) (copied from branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/NEMO/OPA_SRC/DIA/dia25h.F90)
• DIA/diatmb.F90 (copied) (copied from branches/2014/dev_r4650_UKMO10_Tidally_Meaned_Diagnostics/NEMOGCM/NEMO/OPA_SRC/DIA/diatmb.F90)
• DIA/diawri.F90 (modified) (2 diffs)
• DYN/dynspg_ts.F90 (modified) (5 diffs)
• nemogcm.F90 (modified) (2 diffs)

branches/2015/dev_MetOffice_merge_2015/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
@@ -382 +384 @@
       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/2015/dev_MetOffice_merge_2015/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
@@ -47 +48 @@
    USE asminc          ! Assimilation increment
 #endif
+
 
    IMPLICIT NONE
@@ -146 +148 @@
       INTEGER  ::   ikbu, ikbv, noffset      ! local integers
       INTEGER  ::   iktu, iktv               ! local integers
+      REAL(wp) ::   zmdi
       REAL(wp) ::   zraur, z1_2dt_b, z2dt_bf    ! local scalars
       REAL(wp) ::   zx1, zy1, zx2, zy2          !   -      -
@@ -171 +174 @@
       CALL wrk_alloc( jpi, jpj, zhf )
       !
+      zmdi=1.e+20                               !  missing data indicator for masking
       !                                         !* Local constant initialization
       z1_12 = 1._wp / 12._wp 
@@ -950 +954 @@
       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/2015/dev_MetOffice_merge_2015/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -90 +90 @@
    USE stopar
    USE stopts
+   USE diatmb          ! Top,middle,bottom output
+   USE dia25h          ! 25h mean output
 
    IMPLICIT NONE
@@ -497 +499 @@
       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