Changeset 519 for trunk/NEMO/OPA_SRC/DIA/diaptr.F90

Timestamp:

2006-10-11T15:49:05+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_update_74 : CT : - add comments for the UBS scheme

• syntax correction
• remove the use of eddy velocity in the calculation of poleward transport since it is already included into the normal velocity
• remove the save of the trend associated to the BBL advective velocity since it is already included into the normal velocity

File:

• trunk/NEMO/OPA_SRC/DIA/diaptr.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/DIA/diaptr.F90

@@ -241 +241 @@
          v_atl , v_ipc,                    &
          vt_atl, vt_pac, vt_ind,           &
-         vs_atl, vs_pac, vs_ind,           &
-         zv_eiv
+         vs_atl, vs_pac, vs_ind             
       INTEGER ::  inum       ! temporary logical unit
       !!----------------------------------------------------------------------
@@ -252 +251 @@
          zggram    = 1.e-6
    
-# if defined key_diaeiv
-         zv_eiv(:,:,:) = v_eiv(:,:,:)
-# else
-         zv_eiv(:,:,:) = 0.e0
-# endif
-
          ! "zonal" mean temperature and salinity at V-points
          tn_jk(:,:) = ptr_vtjk( tn(:,:,:) ) * surf_jk_r(:,:)
@@ -279 +272 @@
                DO ji = 1, jpi
                   ! basin separated velocity
-                  v_atl(ji,jj,:) = (vn(ji,jj,:)+zv_eiv(ji,jj,:))*abasin(ji,jj)
-                  v_ipc(ji,jj,:) = (vn(ji,jj,:)+zv_eiv(ji,jj,:))*(pbasin(ji,jj)+ibasin(ji,jj))
+                  v_atl(ji,jj,:) = vn(ji,jj,:)*abasin(ji,jj)
+                  v_ipc(ji,jj,:) = vn(ji,jj,:)*(pbasin(ji,jj)+ibasin(ji,jj))
 
                   ! basin separated T times V on T points
-                  vt_ind(ji,jj,:) = tn(ji,jj,:) *                                 &
-                     &              ( (vn    (ji,jj,:) + vn    (ji,jj-1,:))*0.5   &
-                     &              + (zv_eiv(ji,jj,:) + zv_eiv(ji,jj-1,:))*0.5 ) 
+                  vt_ind(ji,jj,:) = tn(ji,jj,:) * ( vn(ji,jj,:) + vn(ji,jj-1,:) )*0.5
                   vt_atl(ji,jj,:) = vt_ind(ji,jj,:) * abasin(ji,jj)
                   vt_pac(ji,jj,:) = vt_ind(ji,jj,:) * pbasin(ji,jj)
@@ -291 +282 @@
 
                   ! basin separated S times V on T points
-                  vs_ind(ji,jj,:) = sn(ji,jj,:) *                                 &
-                     &              ( (vn    (ji,jj,:) + vn    (ji,jj-1,:))*0.5   &
-                     &              + (zv_eiv(ji,jj,:) + zv_eiv(ji,jj-1,:))*0.5 ) 
+                  vs_ind(ji,jj,:) = sn(ji,jj,:) * ( vn(ji,jj,:) + vn(ji,jj-1,:) )*0.5
                   vs_atl(ji,jj,:) = vs_ind(ji,jj,:) * abasin(ji,jj)
                   vs_pac(ji,jj,:) = vs_ind(ji,jj,:) * pbasin(ji,jj)