Changeset 6934

Timestamp:

2016-09-16T18:09:35+02:00 (8 years ago)

Author:

csanchez

Message:

Added Enda O'Dea changes for SINGV

Location:

branches/UKMO/SINGV_NEMO_5518/NEMOGCM/NEMO/OPA_SRC/DOM

Files:

• domwri.F90 (modified) (4 diffs)
• domzgr.F90 (modified) (1 diff)
• istate.F90 (modified) (1 diff)

branches/UKMO/SINGV_NEMO_5518/NEMOGCM/NEMO/OPA_SRC/DOM/domwri.F90

@@ -32 +32 @@
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2010)
-   !! $Id$
+   !! $Id$ 
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -79 +79 @@
       !                                   !  workspaces
       REAL(wp), POINTER, DIMENSION(:,:  ) :: zprt, zprw 
-      REAL(wp), POINTER, DIMENSION(:,:,:) :: zdepu, zdepv
+      REAL(wp), POINTER, DIMENSION(:,:,:) :: zdepu, zdepv, zdepf
       !!----------------------------------------------------------------------
       !
@@ -85 +85 @@
       !
       CALL wrk_alloc( jpi, jpj, zprt, zprw )
-      CALL wrk_alloc( jpi, jpj, jpk, zdepu, zdepv )
+      CALL wrk_alloc( jpi, jpj, jpk, zdepu, zdepv, zdepf )
       !
       IF(lwp) WRITE(numout,*)
@@ -216 +216 @@
          CALL iom_rstput( 0, 0, inum4, 'gdepw_1d' , gdepw_1d )
       ENDIF
+    
+      !CEOD Added for gdep uvf
+      IF( ln_sco ) THEN                                         ! s-coordinate
+         
+         DO jk = 1,jpk
+            DO jj = 1, jpjm1
+               DO ji = 1, fs_jpim1   ! vector opt.
+                  zdepu(ji,jj,jk) = 0.5*(gdept_0(ji,jj,jk) + gdept_0(ji+1,jj ,jk) )
+                  zdepv(ji,jj,jk) = 0.5*(gdept_0(ji,jj,jk) + gdept_0(ji ,jj+1,jk) )
+
+                  zdepf(ji,jj,jk) = 0.25*(gdept_0(ji,jj,jk) + gdept_0(ji+1 ,jj+1,jk) +gdept_0(ji+1,jj  ,jk)  + gdept_0(ji  ,jj+1,jk) ) 
+               END DO
+            END DO
+         END DO
+         
+         CALL lbc_lnk( zdepu, 'U', 1. )   ;   CALL lbc_lnk( zdepv, 'V', 1. )
+         CALL iom_rstput( 0, 0, inum4, 'gdepu', zdepu, ktype = jp_r4 )
+         CALL iom_rstput( 0, 0, inum4, 'gdepv', zdepv, ktype = jp_r4 )
+         CALL iom_rstput( 0, 0, inum4, 'gdepf', zdepf, ktype = jp_r4 )
+         CALL iom_rstput( 0, 0, inum4, 'gdepw_0', gdepw_0, ktype = jp_r4 )
+      
+      END IF 
       
       IF( ln_zps ) THEN                                         ! z-coordinate - partial steps

branches/UKMO/SINGV_NEMO_5518/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -1958 +1958 @@
          DO jj = 1, jpj
             DO ji = 1, jpi
-               ztaper = EXP( -(gphit(ji,jj)/8._wp)**2._wp )
+               ztaper = 0.0 !CEOD WARN EXP( -(gphit(ji,jj)/8._wp)**2._wp )
                hbatt(ji,jj) = rn_sbot_max * ztaper + hbatt(ji,jj) * ( 1._wp - ztaper )
             END DO

branches/UKMO/SINGV_NEMO_5518/NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90

@@ -211 +211 @@
       !
       DO jk = 1, jpk
-         tsn(:,:,jk,jp_tem) = (  ( ( 7.5 - 0. * ABS( gphit(:,:) )/30. ) * ( 1.-TANH((fsdept(:,:,jk)-80.)/30.) )   &
-            &                + 10. * ( 5000. - fsdept(:,:,jk) ) /5000.)  ) * tmask(:,:,jk)
+         tsn(:,:,jk,jp_tem) = 10.0 !CEOD (  ( ( 7.5 - 0. * ABS( gphit(:,:) )/30. ) * ( 1.-TANH((fsdept(:,:,jk)-80.)/30.) )   &
+!             &                + 10. * ( 5000. - fsdept(:,:,jk) ) /5000.)  ) * tmask(:,:,jk)
          tsb(:,:,jk,jp_tem) = tsn(:,:,jk,jp_tem)
       END DO