Changeset 2789 for branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90

Timestamp:

2011-06-27T13:18:25+02:00 (13 years ago)

Author:

cetlod

Message:

Implementation of the merge of TRA/TRP : first guess, see ticket #842

File:

• branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90 (modified) (12 diffs)

branches/2011/dev_r2787_LOCEAN3_TRA_TRP/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfkpp.F90

@@ -206 +206 @@
       !!         the equation number. (LMD94, here after)
       !!----------------------------------------------------------------------
-#if defined  key_zdfddm
       USE oce     , zviscos => ua   ! temp. array for viscosities use ua as workspace
-      USE oce     , zdiffut => ta   ! temp. array for diffusivities use sa as workspace
-      USE oce     , zdiffus => sa   ! temp. array for diffusivities use sa as workspace
-#else
-      USE oce     , zviscos => ua   ! temp. array for viscosities use ua as workspace
-      USE oce     , zdiffut => ta   ! temp. array for diffusivities use sa as workspace
-#endif
+      USE oce     , zdiffut => va   ! temp. array for diffusivities use sa as workspace
       USE wrk_nemo, ONLY: wrk_in_use, wrk_not_released, wrk_in_use_xz, wrk_not_released_xz
       USE wrk_nemo, ONLY: zBo    => wrk_2d_1, &  ! Surface buoyancy forcing,
@@ -229 +223 @@
                           zblct => wrk_xz_2      !  diffusivities/viscosities
 #if defined key_zdfddm
-      USE wrk_nemo, ONLY: zblcs => wrk_xz_3
+      USE wrk_nemo, ONLY: zdiffus => wrk_3d_1
+      USE wrk_nemo, ONLY: zblcs   => wrk_xz_3
 #endif
       !!
@@ -270 +265 @@
       REAL(wp), POINTER, DIMENSION(:,:) ::     zdifs
       REAL(wp), POINTER, DIMENSION(:)   ::   za2s, za3s, zkmps
-      REAL(wp) ::                       zkm1s
+      REAL(wp) ::                            zkm1s
 #endif
       !!--------------------------------------------------------------------
@@ -276 +271 @@
       IF( wrk_in_use(1, 1,2,3,4,5,6,7,8,9,10,11,12,13,14) .OR.   &
           wrk_in_use(2, 1,2,3,4,5,6,7,8,9,10,11)          .OR.   &
+          wrk_in_use(3, 1)                                .OR. &
           wrk_in_use_xz(1,2,3)                              ) THEN
          CALL ctl_stop('zdf_kpp : requested workspace arrays unavailable.')   ;   RETURN
@@ -369 +365 @@
                ! only retains positive value of rrau
                zrrau = MAX( rrau(ji,jj,jk), epsln )
-               zds   = sn(ji,jj,jk-1) - sn(ji,jj,jk)
+               zds   = tsn(ji,jj,jk-1,jp_sal) - tsn(ji,jj,jk,jp_sal)
                IF( zrrau > 1. .AND. zds > 0.) THEN
                   !
@@ -418 +414 @@
          DO ji = fs_2, fs_jpim1     
             IF( nn_eos < 1) THEN   
-               zt     = tn(ji,jj,1)
-               zs     = sn(ji,jj,1) - 35.0
+               zt     = tsn(ji,jj,1,jp_tem)
+               zs     = tsn(ji,jj,1,jp_sal) - 35.0
                zh     = fsdept(ji,jj,1)
                !  potential volumic mass
@@ -449 +445 @@
 
                zthermal = zbeta * zalbet / ( rcp * zrhos + epsln )
-               zhalin   = zbeta * sn(ji,jj,1) * rcs
+               zhalin   = zbeta * tsn(ji,jj,1,jp_sal) * rcs
             ELSE
                zrhos    = rhop(ji,jj,1) + rau0 * ( 1. - tmask(ji,jj,1) )
                zthermal = rn_alpha / ( rcp * zrhos + epsln )
-               zhalin   = rn_beta * sn(ji,jj,1) * rcs
+               zhalin   = rn_beta * tsn(ji,jj,1,jp_sal) * rcs
             ENDIF
             ! Radiative surface buoyancy force
@@ -462 +458 @@
             wt0(ji,jj) = - ( qsr(ji,jj) + qns(ji,jj) )* ro0cpr * tmask(ji,jj,1)
             ! Surface salinity flux for non-local term
-            ws0(ji,jj) = - ( ( emps(ji,jj)-rnf(ji,jj) ) * sn(ji,jj,1) * rcs ) * tmask(ji,jj,1) 
+            ws0(ji,jj) = - ( ( emps(ji,jj)-rnf(ji,jj) ) * tsn(ji,jj,1,jp_sal) * rcs ) * tmask(ji,jj,1) 
          ENDDO
       ENDDO
@@ -543 +539 @@
                ! zref = gdept(1)
                zref = fsdept(ji,jj,1)
-               zt   = tn(ji,jj,1)
-               zs   = sn(ji,jj,1)
+               zt   = tsn(ji,jj,1,jp_tem)
+               zs   = tsn(ji,jj,1,jp_sal)
                zrh  = rhop(ji,jj,1)
                zu   = ( ub(ji,jj,1) + ub(ji - 1,jj    ,1) ) / MAX( 1. , umask(ji,jj,1) + umask(ji - 1,jj   ,1) )
@@ -556 +552 @@
                ! vertically integration over the upper epsilon*gdept(jk) ; del () array is computed once in zdf_kpp_init
                DO jm = 1, jpkm1
-                  zt   = zt  + del(jk,jm) * tn(ji,jj,jm)
-                  zs   = zs  + del(jk,jm) * sn(ji,jj,jm)
+                  zt   = zt  + del(jk,jm) * tsn(ji,jj,jm,jp_tem)
+                  zs   = zs  + del(jk,jm) * tsn(ji,jj,jm,jp_sal)
                   zu   = zu  + 0.5 * del(jk,jm) &
                      &            * ( ub(ji,jj,jm) + ub(ji - 1,jj,jm) ) &
@@ -567 +563 @@
                END DO
 #endif
-               zsr = SQRT( ABS( sn(ji,jj,jk) ) )
+               zsr = SQRT( ABS( tsn(ji,jj,jk,jp_sal) ) )
                ! depth
                zh = fsdept(ji,jj,jk)
@@ -1234 +1230 @@
          ENDIF
 
-      IF( wrk_not_released(1, 1,2,3,4,5,6,7,8,9,10,11,12,13,14) .OR.   &
-          wrk_not_released(2, 1,2,3,4,5,6,7,8,9,10,11)          .OR.   &
-          wrk_not_released_xz(1,2,3)                               )   &
-          CALL ctl_stop('zdf_kpp : failed to release workspace arrays')
+      IF( wrk_not_released(1, 1,2,3,4,5,6,7,8,9,10,11,12,13,14) .OR. &
+          wrk_not_released(2, 1,2,3,4,5,6,7,8,9,10,11)          .OR. &
+          wrk_not_released(3, 1)                                .OR. &
+          wrk_not_released_xz(1,2,3)  )   CALL ctl_stop('zdf_kpp : failed to release workspace arrays')
       !
    END SUBROUTINE zdf_kpp