Changeset 6775

Timestamp:

2016-07-01T20:32:06+02:00 (8 years ago)

Author:

kingr

Message:

bugfix for previous commit to allow averaged assim bkg.

Location:

branches/UKMO/dev_r5518_25hr_mean_assim_bkg/NEMOGCM/NEMO/OPA_SRC

Files:

• ASM/asmbkg.F90 (modified) (7 diffs)
• ASM/asminc.F90 (modified) (1 diff)
• ASM/asmpar.F90 (modified) (1 diff)
• step.F90 (modified) (2 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
-   REAL(wp),SAVE :: gcx_tavg
+   REAL(wp),SAVE, ALLOCATABLE,   DIMENSION(:,:)   ::   sshn_tavg, gcx_tavg
    REAL(wp),SAVE :: numtimes_tavg     ! No of times to average over
 
@@ -93 +92 @@
       INTEGER :: inum          ! File unit number
       REAL(wp) :: zdate        ! Date
+      INTEGER :: ierror
       !!-----------------------------------------------------------------------
-
 
       ! If creating an averaged assim bkg, initialise on first timestep
@@ -119 +118 @@
          ENDIF
          vn_tavg=0
-         ALLOCATE( ssh_tavg(jpi,jpj), STAT=ierror )
-         IF( ierror > 0 ) THEN
-            CALL ctl_stop( 'asm_wri_bkg: unable to allocate ssh_tavg' )   ;   RETURN
-         ENDIF
-         ssh_tavg=0
+         ALLOCATE( sshn_tavg(jpi,jpj), STAT=ierror )
+         IF( ierror > 0 ) THEN
+            CALL ctl_stop( 'asm_wri_bkg: unable to allocate sshn_tavg' )   ;   RETURN
+         ENDIF
+         sshn_tavg=0
          ALLOCATE( en_tavg(jpi,jpj,jpk), STAT=ierror )
          IF( ierror > 0 ) THEN
@@ -133 +132 @@
             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
-         gcx_tavg=0    
          
          numtimes_tavg = REAL ( nitavgbkg_r -  nn_it000 + 1 )
@@ -151 +154 @@
          un_tavg(:,:,:)        = un_tavg(:,:,:) + un(:,:,:) / numtimes_tavg
          vn_tavg(:,:,:)        = vn_tavg(:,:,:) + vn(:,:,:) / numtimes_tavg
-         gcx_tavg              = gcx_tavg       + gcx / numtimes_tavg
+!         gcx_tavg(:,:)         = gcx_tavg(:,:)  + gcx(:,:) / numtimes_tavg
          avt_tavg(:,:,:)        = avt_tavg(:,:,:) + avt(:,:,:) / numtimes_tavg
 #if defined key_zdftke
@@ -160 +163 @@
 
       ! Write out background at time step nitbkg_r or nitavgbkg_r
-      IF( .NOT. ln_avgbkg .AND. (kt == nitbkg_r) ) .OR. &
-      &       ( ln_avgbkg .AND. (kt == nitavgbkg_r) ) THEN
+      IF ( ( .NOT. ln_avgbkg .AND. (kt == nitbkg_r) ) .OR. &
+      &          ( ln_avgbkg .AND. (kt == nitavgbkg_r) ) ) THEN
          !
          WRITE(cl_asmbkg, FMT='(A,".nc")' ) TRIM( c_asmbkg )
@@ -193 +196 @@
                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    )
+               CALL iom_rstput( kt, nitbkg_r, inum, 'sshn'   , sshn_tavg)
 #if defined key_zdftke
                CALL iom_rstput( kt, nitbkg_r, inum, 'en'     , en_tavg )

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

@@ -161 +161 @@
                                !               so only apply surft increments.
       !!
-      NAMELIST/nam_asminc/ ln_bkgwri, ln_avgbkg                            &
+      NAMELIST/nam_asminc/ ln_bkgwri, ln_avgbkg,                           &
          &                 ln_trainc, ln_dyninc, ln_sshinc,                &
          &                 ln_asmdin, ln_asmiau,                           &

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

@@ -29 +29 @@
    INTEGER, PUBLIC :: nitiaufin_r   !: IAU final time step referenced to nit000
    INTEGER, PUBLIC :: nittrjfrq     !: Frequency of trajectory output for 4D-VAR
+   INTEGER, PUBLIC :: nitavgbkg_r   !: Averaging period for assim bkg referenced to nit000
 
    !!----------------------------------------------------------------------

branches/UKMO/dev_r5518_25hr_mean_assim_bkg/NEMOGCM/NEMO/OPA_SRC/step.F90

@@ -299 +299 @@
       ! Dynamics                                    (tsa used as workspace)
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
+
+      IF( ln_bkgwri )        CALL asm_bkg_wri( kstp )     ! output background fields
+
       IF( lk_dynspg_ts   )  THEN
                                                              ! revert to previously computed momentum tendencies
@@ -317 +320 @@
         IF(  lk_asminc .AND. ln_asmiau .AND. &
            & ln_dyninc      )  CALL dyn_asm_inc( kstp )     ! apply dynamics assimilation increment
-        IF( ln_bkgwri )        CALL asm_bkg_wri( kstp )     ! output background fields
         IF( ln_neptsimp )      CALL dyn_nept_cor( kstp )    ! subtract Neptune velocities (simplified)
         IF( lk_bdy          )  CALL bdy_dyn3d_dmp(kstp )    ! bdy damping trends