Changeset 1241 for trunk/NEMO/OPA_SRC/DYN/dynspg_ts.F90

Timestamp:

2009-01-05T17:14:49+01:00 (15 years ago)

Author:

rblod

Message:

Fix a stupid bug for time splitting and ensure restartability for dynspg_ts in addition, see tickets #280 and #292

File:

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

trunk/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -99 +99 @@
       !! * Local declarations
       INTEGER  ::  ji, jj, jk, jit             ! dummy loop indices
-      INTEGER  ::  icycle, ibaro               ! temporary scalar
+      INTEGER  ::  icycle                      ! temporary scalar
       REAL(wp) ::                           &
          zraur, zcoef, z2dt_e, z2dt_b, zfac25,   &  ! temporary scalars
@@ -128 +128 @@
          IF(lwp) WRITE(numout,*) 'dyn_spg_ts : surface pressure gradient trend'
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~   free surface with time splitting'
-         IF(lwp) WRITE(numout,*) ' Number of sub cycle in 1 time-step (2 rdt) : icycle = ', FLOOR( 2*rdt/rdtbt )
+         IF(lwp) WRITE(numout,*) ' Number of sub cycle in 1 time-step (2 rdt) : icycle = ',  2*nn_baro
 
          CALL ts_rst( nit000, 'READ' )   ! read or initialize the following fields:
@@ -304 +304 @@
       !----------------
       ! Number of iteration of the barotropic loop
-      ibaro = FLOOR( rdt / rdtbt )
-      icycle = 3 /2 * ibaro 
+      icycle = 3  * nn_baro / 2
 
       ! variables for the barotropic equations
@@ -341 +340 @@
       DO jit = 1, icycle                                   !  sub-time-step loop  !
          !                                                 ! ==================== !
-         z2dt_e = 2. * rdtbt
-         IF ( jit == 1 )   z2dt_e = rdtbt
+         z2dt_e = 2. * ( rdt / nn_baro )
+         IF ( jit == 1 )   z2dt_e = rdt / nn_baro
 
          ! Time interpolation of open boundary condition data
@@ -484 +483 @@
          ! temporal sum
          !-------------
-         IF( jit >= ibaro/2 ) THEN
+         IF( jit >= nn_baro / 2 ) THEN
             zssha_b(:,:) = zssha_b(:,:) + ssha_e(:,:)
             zua_b  (:,:) = zua_b  (:,:) + ua_e  (:,:)
@@ -552 +551 @@
 
       ! Time average of after barotropic variables
-      zcoef =  1.e0 / ( ibaro + 1 )
+      zcoef =  1.e0 / ( nn_baro + 1 ) 
       zssha_b(:,:) = zcoef * zssha_b(:,:) 
       zua_b  (:,:) = zcoef *  zua_b (:,:) 
       zva_b  (:,:) = zcoef *  zva_b (:,:) 
 #if defined key_obc
-         IF( lp_obc_east  )   sshfoe_b(:,:) = zcoef * sshfoe_b(:,:)
-         IF( lp_obc_west  )   sshfow_b(:,:) = zcoef * sshfow_b(:,:)
-         IF( lp_obc_north )   sshfon_b(:,:) = zcoef * sshfon_b(:,:)
-         IF( lp_obc_south )   sshfos_b(:,:) = zcoef * sshfos_b(:,:)
+      IF( lp_obc_east  )   sshfoe_b(:,:) = zcoef * sshfoe_b(:,:)
+      IF( lp_obc_west  )   sshfow_b(:,:) = zcoef * sshfow_b(:,:)
+      IF( lp_obc_north )   sshfon_b(:,:) = zcoef * sshfon_b(:,:)
+      IF( lp_obc_south )   sshfos_b(:,:) = zcoef * sshfos_b(:,:)
 #endif
      
@@ -620 +619 @@
       ! ------------------------------------------
       sshb_b(:,:) = sshn_b (:,:)
-      IF ( kt == nit000 ) zssha_b(:,:) = sshn(:,:)
+      IF ( neuler == 0 .AND. kt == nit000 ) zssha_b(:,:) = sshn(:,:)
       sshn_b(:,:) = zssha_b(:,:)
       un_b  (:,:) = zua_b  (:,:)