Changeset 788 for trunk/NEMO

Timestamp:

2008-01-11T17:38:14+01:00 (16 years ago)

Author:

rblod

Message:

Change averaging method in dynspg_ts, see ticket #48

File:

• trunk/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) (6 diffs)

trunk/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -7 +7 @@
    !!             " "  !  05-11  (V. Garnier, G. Madec)  optimization
    !!             9.0  !  06-08  (S. Masson)  distributed restart using iom
+   !!             9.0  !  08-01  (R. Benshila)  change averaging method
    !!---------------------------------------------------------------------
 #if defined key_dynspg_ts   ||   defined key_esopa
@@ -92 +93 @@
       !! * Local declarations
       INTEGER  ::  ji, jj, jk, jit             ! dummy loop indices
-      INTEGER  ::  icycle                      ! temporary scalar
+      INTEGER  ::  icycle, ibaro               ! temporary scalar
       REAL(wp) ::                           &
          zraur, zcoef, z2dt_e, z2dt_b, zfac25,   &  ! temporary scalars
@@ -295 +296 @@
       !----------------
       ! Number of iteration of the barotropic loop
-      icycle = FLOOR( z2dt_b / rdtbt )
+      ibaro = FLOOR( rdt / rdtbt )
+      icycle = 3 /2 * ibaro 
 
       ! variables for the barotropic equations
@@ -304 +306 @@
       zun_e  (:,:) = un_b  (:,:)
       zvn_e  (:,:) = vn_b  (:,:)
-      zssha_b(:,:) = sshn  (:,:)       ! time averaged variables over all sub-timesteps
-      zua_b  (:,:) = un_b  (:,:)   
-      zva_b  (:,:) = vn_b  (:,:)
+      zssha_b(:,:) = 0.e0
+      zua_b  (:,:) = 0.e0
+      zva_b  (:,:) = 0.e0
       IF( lk_vvl ) THEN
          zsshun_e(:,:)    = sshu (:,:)     ! (barotropic) sea surface height (now) at u-point
@@ -464 +466 @@
          ! temporal sum
          !-------------
-         zssha_b(:,:) = zssha_b(:,:) + ssha_e(:,:)
-         zua_b  (:,:) = zua_b  (:,:) + ua_e  (:,:)
-         zva_b  (:,:) = zva_b  (:,:) + va_e  (:,:) 
+         IF( jit >= ibaro/2 ) THEN
+            zssha_b(:,:) = zssha_b(:,:) + ssha_e(:,:)
+            zua_b  (:,:) = zua_b  (:,:) + ua_e  (:,:)
+            zva_b  (:,:) = zva_b  (:,:) + va_e  (:,:) 
+         ENDIF
 
          ! Time filter and swap of dynamics arrays
@@ -530 +534 @@
 
       ! Time average of after barotropic variables
-      zcoef =  1.e0 / (  FLOAT( icycle +1 )  )
+      zcoef =  1.e0 / ( ibaro + 1 )
       zssha_b(:,:) = zcoef * zssha_b(:,:) 
       zua_b  (:,:) = zcoef *  zua_b (:,:)