Changeset 6809

Timestamp:

2016-07-19T16:30:01+02:00 (8 years ago)

Author:

kingr

Message:

Removed gcx from assim background write. Variable=0, and is not read by assim. Added if def key around allocation of en for assim bkg write.

File:

• branches/UKMO/dev_r5518_25hr_mean_assim_bkg/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90 (modified) (6 diffs)

branches/UKMO/dev_r5518_25hr_mean_assim_bkg/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90

@@ -63 +63 @@
    REAL(wp),SAVE, ALLOCATABLE,   DIMENSION(:,:,:) ::   en_tavg
 #endif
-   REAL(wp),SAVE, ALLOCATABLE,   DIMENSION(:,:)   ::   sshn_tavg, gcx_tavg
+   REAL(wp),SAVE, ALLOCATABLE,   DIMENSION(:,:)   ::   sshn_tavg
    REAL(wp),SAVE :: numtimes_tavg     ! No of times to average over
 
@@ -123 +123 @@
          ENDIF
          sshn_tavg=0
+#if defined key_zdftke
          ALLOCATE( en_tavg(jpi,jpj,jpk), STAT=ierror )
          IF( ierror > 0 ) THEN
@@ -128 +129 @@
          ENDIF
          en_tavg=0
+#endif
          ALLOCATE( avt_tavg(jpi,jpj,jpk), STAT=ierror )
          IF( ierror > 0 ) THEN
             CALL ctl_stop( 'asm_wri_bkg: unable to allocate avt_tavg' )   ;   RETURN
          ENDIF
-         ALLOCATE( gcx_tavg(jpi,jpj), STAT=ierror )
-         IF( ierror > 0 ) THEN
-            CALL ctl_stop( 'asm_wri_bkg: unable to allocate gcx_tavg' )   ;   RETURN
-         ENDIF
-         gcx_tavg=0    
          avt_tavg=0
          
@@ -154 +151 @@
          un_tavg(:,:,:)        = un_tavg(:,:,:) + un(:,:,:) / numtimes_tavg
          vn_tavg(:,:,:)        = vn_tavg(:,:,:) + vn(:,:,:) / numtimes_tavg
-!         gcx_tavg(:,:)         = gcx_tavg(:,:)  + gcx(:,:) / numtimes_tavg
          avt_tavg(:,:,:)        = avt_tavg(:,:,:) + avt(:,:,:) / numtimes_tavg
 #if defined key_zdftke
@@ -199 +195 @@
                CALL iom_rstput( kt, nitavgbkg_r, inum, 'en'     , en_tavg )
 #endif
-               CALL iom_rstput( kt, nitavgbkg_r, inum, 'gcx'    , gcx_tavg)
                CALL iom_rstput( kt, nitavgbkg_r, inum, 'avt'    , avt_tavg)
                !
@@ -223 +218 @@
                CALL iom_rstput( kt, nitbkg_r, inum, 'en'     , en                )
 #endif
-               CALL iom_rstput( kt, nitbkg_r, inum, 'gcx'    , gcx               )
                CALL iom_rstput( kt, nitbkg_r, inum, 'avt'    , avt               )
                !