Changeset 1362 for branches/dev_004_VVL/NEMO/OPA_SRC/DOM/domvvl.F90

Timestamp:

2009-03-31T19:52:23+02:00 (15 years ago)

Author:

rblod

Message:

dev_004_VVL: introduce definition of scale factors for vvl, see ticket #390

File:

• branches/dev_004_VVL/NEMO/OPA_SRC/DOM/domvvl.F90 (modified) (7 diffs)

branches/dev_004_VVL/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -81 +81 @@
 #endif
 
-      fsvdept (:,:,:) = gdept (:,:,:)
-      fsvdepw (:,:,:) = gdepw (:,:,:)
-      fsvde3w (:,:,:) = gdep3w(:,:,:)
-      fsve3t  (:,:,:) = e3t   (:,:,:)
-      fsve3u  (:,:,:) = e3u   (:,:,:)
-      fsve3v  (:,:,:) = e3v   (:,:,:)
-      fsve3f  (:,:,:) = e3f   (:,:,:)
-      fsve3w  (:,:,:) = e3w   (:,:,:)
-      fsve3uw (:,:,:) = e3uw  (:,:,:)
-      fsve3vw (:,:,:) = e3vw  (:,:,:)
+      fsdept_0(:,:,:) = gdept (:,:,:)
+      fsdepw_0(:,:,:) = gdepw (:,:,:)
+      fsde3w_0(:,:,:) = gdep3w(:,:,:)
+      fse3t_0 (:,:,:) = e3t   (:,:,:)
+      fse3u_0 (:,:,:) = e3u   (:,:,:)
+      fse3v_0 (:,:,:) = e3v   (:,:,:)
+      fse3f_0 (:,:,:) = e3f   (:,:,:)
+      fse3w_0 (:,:,:) = e3w   (:,:,:)
+      fse3uw_0(:,:,:) = e3uw  (:,:,:)
+      fse3vw_0(:,:,:) = e3vw  (:,:,:)
 
       ! mu computation
@@ -106 +106 @@
             zpk = mbathy(ji,jj) - 1
             DO jk = 1, zpk
-               zmut(ji,jj) = zmut(ji,jj) + fsve3t(ji,jj,jk) * SUM( fsve3t(ji,jj,jk:zpk) )
-               zmuu(ji,jj) = zmuu(ji,jj) + fsve3u(ji,jj,jk) * SUM( fsve3u(ji,jj,jk:zpk) )
-               zmuv(ji,jj) = zmuv(ji,jj) + fsve3v(ji,jj,jk) * SUM( fsve3v(ji,jj,jk:zpk) )
-               zmuf(ji,jj) = zmuf(ji,jj) + fsve3f(ji,jj,jk) * SUM( fsve3f(ji,jj,jk:zpk) )
+               zmut(ji,jj) = zmut(ji,jj) + fse3t_0(ji,jj,jk) * SUM( fse3t_0(ji,jj,jk:zpk) )
+               zmuu(ji,jj) = zmuu(ji,jj) + fse3u_0(ji,jj,jk) * SUM( fse3u_0(ji,jj,jk:zpk) )
+               zmuv(ji,jj) = zmuv(ji,jj) + fse3v_0(ji,jj,jk) * SUM( fse3v_0(ji,jj,jk:zpk) )
+               zmuf(ji,jj) = zmuf(ji,jj) + fse3f_0(ji,jj,jk) * SUM( fse3f_0(ji,jj,jk:zpk) )
             END DO
          END DO
@@ -119 +119 @@
             DO jk = 1, zpk
 #if defined key_sigma_vvl
-               mut(ji,jj,jk) = 1./SUM( fsve3t(ji,jj,1:zpk) ) 
-               muu(ji,jj,jk) = 1./SUM( fsve3u(ji,jj,1:zpk) ) 
-               muv(ji,jj,jk) = 1./SUM( fsve3v(ji,jj,1:zpk) ) 
-               muf(ji,jj,jk) = 1./SUM( fsve3f(ji,jj,1:zpk) ) 
+               mut(ji,jj,jk) = 1./SUM( fse3t_0(ji,jj,1:zpk) ) 
+               muu(ji,jj,jk) = 1./SUM( fse3u_0(ji,jj,1:zpk) ) 
+               muv(ji,jj,jk) = 1./SUM( fse3v_0(ji,jj,1:zpk) ) 
+               muf(ji,jj,jk) = 1./SUM( fse3f_0(ji,jj,1:zpk) ) 
 #else
-               mut(ji,jj,jk) = SUM( fsve3t(ji,jj,jk:zpk) ) / zmut(ji,jj)
-               muu(ji,jj,jk) = SUM( fsve3u(ji,jj,jk:zpk) ) / zmuu(ji,jj)
-               muv(ji,jj,jk) = SUM( fsve3v(ji,jj,jk:zpk) ) / zmuv(ji,jj)
-               muf(ji,jj,jk) = SUM( fsve3f(ji,jj,jk:zpk) ) / zmuf(ji,jj)
+               mut(ji,jj,jk) = SUM( fse3t_0(ji,jj,jk:zpk) ) / zmut(ji,jj)
+               muu(ji,jj,jk) = SUM( fse3u_0(ji,jj,jk:zpk) ) / zmuu(ji,jj)
+               muv(ji,jj,jk) = SUM( fse3v_0(ji,jj,jk:zpk) ) / zmuv(ji,jj)
+               muf(ji,jj,jk) = SUM( fse3f_0(ji,jj,jk:zpk) ) / zmuf(ji,jj)
 #endif
             END DO
@@ -174 +174 @@
       ! Scale factors at T levels
       DO jk = 1, jpkm1
-         fse3t(:,:,jk) = fsve3t(:,:,jk) * ( 1 + sshn(:,:)  * mut(:,:,jk) )
-         fse3u(:,:,jk) = fsve3u(:,:,jk) * ( 1 + sshu(:,:)  * muu(:,:,jk) )
-         fse3v(:,:,jk) = fsve3v(:,:,jk) * ( 1 + sshv(:,:)  * muv(:,:,jk) )
-         fse3f(:,:,jk) = fsve3f(:,:,jk) * ( 1 + zsshf(:,:) * muf(:,:,jk) )
+         fse3t(:,:,jk) = fse3t_0(:,:,jk) * ( 1 + sshn(:,:)  * mut(:,:,jk) )
+         fse3u(:,:,jk) = fse3u_0(:,:,jk) * ( 1 + sshu(:,:)  * muu(:,:,jk) )
+         fse3v(:,:,jk) = fse3v_0(:,:,jk) * ( 1 + sshv(:,:)  * muv(:,:,jk) )
+         fse3f(:,:,jk) = fse3f_0(:,:,jk) * ( 1 + zsshf(:,:) * muf(:,:,jk) )
       END DO
 
@@ -339 +339 @@
          !
          DO jk = 1, jpk
-            sfe3(:,:,jk)  = fsve3u(:,:,jk) * ( 1 + zssh(:,:) * muu(:,:,jk) )
+            sfe3(:,:,jk)  = fve3u_0(:,:,jk) * ( 1 + zssh(:,:) * muu(:,:,jk) )
          ENDDO
 
@@ -345 +345 @@
          !
          DO jk = 1, jpk
-            sfe3(:,:,jk)  = fsve3v(:,:,jk) * ( 1 + zssh(:,:) * muv(:,:,jk) )
+            sfe3(:,:,jk)  = fse3v_0(:,:,jk) * ( 1 + zssh(:,:) * muv(:,:,jk) )
          ENDDO
 
@@ -351 +351 @@
          !
          DO jk = 1, jpk
-            sfe3(:,:,jk)  = fsve3t(:,:,jk) * ( 1 + zssh(:,:) * mut(:,:,jk) )
+            sfe3(:,:,jk)  = fse3t_0(:,:,jk) * ( 1 + zssh(:,:) * mut(:,:,jk) )
          ENDDO