Changeset 2824 for branches

Timestamp:

2011-08-09T16:05:52+02:00 (13 years ago)

Author:

acc

Message:

Branch: dev_r2802_NOCS_vvlfix. Changes in dynspg_ts.F90 to make correct use of fse3u_b and to replace unnecessary division operations

File:

• branches/2011/dev_r2802_NOCS_vvlfix/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90 (modified) (5 diffs)

branches/2011/dev_r2802_NOCS_vvlfix/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -119 +119 @@
       INTEGER  ::   ji, jj, jk, jn   ! dummy loop indices
       INTEGER  ::   icycle           ! local scalar
-      REAL(wp) ::   zraur, zcoef, z2dt_e, z2dt_b     ! local scalars
+      REAL(wp) ::   zraur, zcoef, z2dt_e, z1_2dt_b     ! local scalars
       REAL(wp) ::   z1_8, zx1, zy1                   !   -      -
       REAL(wp) ::   z1_4, zx2, zy2                   !   -      -
@@ -161 +161 @@
 
       !                                   !* Local constant initialization
-      z2dt_b = 2.0 * rdt                                    ! baroclinic time step
+      z1_2dt_b = 1._wp / ( 2.0_wp * rdt )                               ! baroclinic time step
+      IF( neuler == 0 .AND. kt == nit000 )   z1_2dt_b = 1.0_wp / rdt    ! baroclinic time step (starting with euler timestep)
       z1_8 = 0.5 * 0.25                                     ! coefficient for vorticity estimates
       z1_4 = 0.5 * 0.5
@@ -195 +196 @@
                !
 #if defined key_vvl
-               ub_b(ji,jj) = ub_b(ji,jj) + (fse3u_0(ji,jj,jk)*(1.+sshu_b(ji,jj)*muu(ji,jj,jk)))* ub(ji,jj,jk) 
-               vb_b(ji,jj) = vb_b(ji,jj) + (fse3v_0(ji,jj,jk)*(1.+sshv_b(ji,jj)*muv(ji,jj,jk)))* vb(ji,jj,jk)   
+!              ub_b(ji,jj) = ub_b(ji,jj) + (fse3u_0(ji,jj,jk)*(1.+sshu_b(ji,jj)*muu(ji,jj,jk)))* ub(ji,jj,jk) 
+!              vb_b(ji,jj) = vb_b(ji,jj) + (fse3v_0(ji,jj,jk)*(1.+sshv_b(ji,jj)*muv(ji,jj,jk)))* vb(ji,jj,jk)   
+               ub_b(ji,jj) = ub_b(ji,jj) + fse3u_b(ji,jj,jk)* ub(ji,jj,jk)   *umask(ji,jj,jk) 
+               vb_b(ji,jj) = vb_b(ji,jj) + fse3v_b(ji,jj,jk)* vb(ji,jj,jk)   *vmask(ji,jj,jk)
 #else
                ub_b(ji,jj) = ub_b(ji,jj) + fse3u_0(ji,jj,jk) * ub(ji,jj,jk)  * umask(ji,jj,jk)
@@ -278 +281 @@
       !                                             ! Remove barotropic contribution of bottom friction 
       !                                             ! from the barotropic transport trend
-      zcoef = -1. / z2dt_b
+      zcoef = -1._wp * z1_2dt_b
 # if defined key_vectopt_loop
       DO jj = 1, 1
@@ -565 +568 @@
       !                                   !* update the general momentum trend
       DO jk=1,jpkm1
-         ua(:,:,jk) = ua(:,:,jk) + ( zu_sum(:,:) - ub_b(:,:) ) / z2dt_b
-         va(:,:,jk) = va(:,:,jk) + ( zv_sum(:,:) - vb_b(:,:) ) / z2dt_b
+         ua(:,:,jk) = ua(:,:,jk) + ( zu_sum(:,:) - ub_b(:,:) ) * z1_2dt_b
+         va(:,:,jk) = va(:,:,jk) + ( zv_sum(:,:) - vb_b(:,:) ) * z1_2dt_b
       END DO
       un_b  (:,:) =  zu_sum(:,:)