Changeset 6802

Timestamp:

2016-07-13T13:04:12+02:00 (8 years ago)

Author:

mattmartin

Message:

Committing changes to the writing of average assimilation background files.

File:

• branches/UKMO/dev_r5518_25hr_mean_assim_bkg/NEMOGCM/NEMO/OPA_SRC/ASM/asmbkg.F90 (modified) (1 diff)

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

@@ -176 +176 @@
             CALL iom_open( c_asmbkg, inum, ldwrt = .TRUE., kiolib = jprstlib)
             !
-            IF( nitbkg_r == nit000 - 1 ) THEN      ! Treat special case when nitbkg = 0
-               zdate = REAL( ndastp )
-#if defined key_zdftke
-               ! lk_zdftke=T :   Read turbulent kinetic energy ( en )
-               IF(lwp) WRITE(numout,*) ' Reading TKE (en) from restart...'
-               CALL tke_rst( nit000, 'READ' )               ! lk_zdftke=T :   Read turbulent kinetic energy ( en )
-
-#endif
-            ELSE
-               zdate = REAL( ndastp )
-            ENDIF
             !
             ! Write the information
-            CALL iom_rstput( kt, nitbkg_r, inum, 'rdastp' , zdate   )
-            
             IF ( ln_avgbkg ) THEN
-               CALL iom_rstput( kt, nitbkg_r, inum, 'un'     , un_tavg )
-               CALL iom_rstput( kt, nitbkg_r, inum, 'vn'     , vn_tavg )
-               CALL iom_rstput( kt, nitbkg_r, inum, 'tn'     , tn_tavg )
-               CALL iom_rstput( kt, nitbkg_r, inum, 'sn'     , sn_tavg )
-               CALL iom_rstput( kt, nitbkg_r, inum, 'sshn'   , sshn_tavg)
-#if defined key_zdftke
-               CALL iom_rstput( kt, nitbkg_r, inum, 'en'     , en_tavg )
-#endif
-               CALL iom_rstput( kt, nitbkg_r, inum, 'gcx'    , gcx_tavg)
-               CALL iom_rstput( kt, nitbkg_r, inum, 'avt'    , avt_tavg)
+               IF( nitavgbkg_r == nit000 - 1 ) THEN      ! Treat special case when nitavgbkg = 0
+                  zdate = REAL( ndastp )
+#if defined key_zdftke
+                  ! lk_zdftke=T :   Read turbulent kinetic energy ( en )
+                  IF(lwp) WRITE(numout,*) ' Reading TKE (en) from restart...'
+                  CALL tke_rst( nit000, 'READ' )               ! lk_zdftke=T :   Read turbulent kinetic energy ( en )
+
+#endif
+               ELSE
+                  zdate = REAL( ndastp )
+               ENDIF
+               CALL iom_rstput( kt, nitavgbkg_r, inum, 'rdastp' , zdate   )
+               CALL iom_rstput( kt, nitavgbkg_r, inum, 'un'     , un_tavg )
+               CALL iom_rstput( kt, nitavgbkg_r, inum, 'vn'     , vn_tavg )
+               CALL iom_rstput( kt, nitavgbkg_r, inum, 'tn'     , tn_tavg )
+               CALL iom_rstput( kt, nitavgbkg_r, inum, 'sn'     , sn_tavg )
+               CALL iom_rstput( kt, nitavgbkg_r, inum, 'sshn'   , sshn_tavg)
+#if defined key_zdftke
+               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)
                !
             ELSE
+               IF( nitbkg_r == nit000 - 1 ) THEN      ! Treat special case when nitbkg = 0
+                  zdate = REAL( ndastp )
+#if defined key_zdftke
+                  ! lk_zdftke=T :   Read turbulent kinetic energy ( en )
+                  IF(lwp) WRITE(numout,*) ' Reading TKE (en) from restart...'
+                  CALL tke_rst( nit000, 'READ' )               ! lk_zdftke=T :   Read turbulent kinetic energy ( en )
+
+#endif
+               ELSE
+                  zdate = REAL( ndastp )
+               ENDIF
+               CALL iom_rstput( kt, nitbkg_r, inum, 'rdastp' , zdate   )
                CALL iom_rstput( kt, nitbkg_r, inum, 'un'     , un                )
                CALL iom_rstput( kt, nitbkg_r, inum, 'vn'     , vn                )