Changeset 642 for trunk/NEMO/OPA_SRC/DOM

Timestamp:

2007-03-15T12:17:58+01:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_bugfix_028 : CT : correction to be able to compile without compilation stop when using key_zco cpp key

Location:

trunk/NEMO/OPA_SRC/DOM

Files:

• domvvl.F90 (modified) (3 diffs)
• domzgr_substitute.h90 (modified) (1 diff)

trunk/NEMO/OPA_SRC/DOM/domvvl.F90

@@ -32 +32 @@
    PUBLIC dom_vvl_ssh    ! called by trazdf.F90
    PUBLIC dom_vvl        ! called by istate.F90 and step.F90
+   PUBLIC sfe3ini        ! 
+   PUBLIC sfe3           ! 
 
    !! * Module variables
@@ -299 +301 @@
    END SUBROUTINE dom_vvl_ssh
 
+   FUNCTION sfe3( zssh, gridp )
+      !!----------------------------------------------------------------------
+      !!                ***  ROUTINE sfe3  ***
+      !!                   
+      !! ** Purpose :  compute vertical scale factor at each time step
+      !!----------------------------------------------------------------------
+      !! * Arguments
+      CHARACTER(LEN=1)                , INTENT( in ) :: gridp   ! grid point type
+      REAL(wp), DIMENSION(jpi,jpj)    , INTENT( in ) :: zssh    ! 2D workspace
+      REAL(wp), DIMENSION(jpi,jpj,jpk)               :: sfe3    ! 3D workspace
+
+      !! * Local declarations
+      INTEGER  ::   jk                                      ! dummy loop indices
+      !!----------------------------------------------------------------------
+
+      SELECT CASE (gridp)
+
+      CASE ('U')
+         !
+         DO jk = 1, jpk
+            sfe3(:,:,jk)  = fsve3u(:,:,jk) * ( 1 + zssh(:,:) * muu(:,:,jk) )
+         ENDDO
+
+      CASE ('V')
+         !
+         DO jk = 1, jpk
+            sfe3(:,:,jk)  = fsve3v(:,:,jk) * ( 1 + zssh(:,:) * muv(:,:,jk) )
+         ENDDO
+
+      CASE ('T')
+         !
+         DO jk = 1, jpk
+            sfe3(:,:,jk)  = fsve3t(:,:,jk) * ( 1 + zssh(:,:) * mut(:,:,jk) )
+         ENDDO
+
+      END SELECT
+
+      END FUNCTION sfe3
+
+   FUNCTION sfe3ini( gridp )
+      !!----------------------------------------------------------------------
+      !!                ***  ROUTINE sfe3  ***
+      !!                   
+      !! ** Purpose :  affect the appropriate vertical scale factor. It is done
+      !!               to avoid compiling error when using key_zco cpp key
+      !!----------------------------------------------------------------------
+      !! * Arguments
+      CHARACTER(LEN=1)                , INTENT( in ) :: gridp      ! grid point type
+      REAL(wp), DIMENSION(jpi,jpj,jpk)               :: sfe3ini    ! 3D workspace
+      !!----------------------------------------------------------------------
+
+      SELECT CASE (gridp)
+
+      CASE ('U')
+         !
+         sfe3ini(:,:,:)  = fse3u(:,:,:)
+
+      CASE ('V')
+         !
+         sfe3ini(:,:,:)  = fse3v(:,:,:)
+
+      CASE ('T')
+         !
+         sfe3ini(:,:,:)  = fse3t(:,:,:)
+
+      END SELECT
+
+      END FUNCTION sfe3ini
 #else
    !!----------------------------------------------------------------------
@@ -312 +382 @@
       WRITE(*,*) 'dom_vvl_ssh: You should not have seen this print! error?', kt
    END SUBROUTINE dom_vvl_ssh
+   FUNCTION sfe3( zssh, gridp ) 
+      !! * Arguments
+      CHARACTER(LEN=1)                , INTENT( in ) :: gridp   ! grid point type
+      REAL(wp), DIMENSION(jpi,jpj)    , INTENT( in ) :: zssh    ! 2D workspace
+      REAL(wp), DIMENSION(jpi,jpj,jpk)               :: sfe3    ! 3D workspace
+      sfe3(:,:,:) = 0.e0
+      WRITE(*,*) 'sfe3: You should not have seen this print! error?', gridp
+      WRITE(*,*) 'sfe3: You should not have seen this print! error?', zssh(1,1)
+   END FUNCTION sfe3
+   FUNCTION sfe3ini( gridp ) 
+      !! * Arguments
+      CHARACTER(LEN=1)                , INTENT( in ) :: gridp    ! grid point type
+      REAL(wp), DIMENSION(jpi,jpj,jpk)               :: sfe3ini  ! 3D workspace
+      sfe3ini(:,:,:) = 0.e0
+      WRITE(*,*) 'sfe3ini: You should not have seen this print! error?', gridp
+   END FUNCTION sfe3ini
 #endif
 

trunk/NEMO/OPA_SRC/DOM/domzgr_substitute.h90

@@ -56 +56 @@
 #   define  fsve3vw(i,j,k)  e3vw_1(i,j,k)
 #else
-#   define  fsvdept(i,j,k)  gdept(i,j,k)
+#   define  fsvdept(i,j,k)  fsdept(i,j,k)
 
-#   define  fsvdepw(i,j,k)  gdepw(i,j,k)
-#   define  fsvde3w(i,j,k)  gdep3w(i,j,k)
+#   define  fsvdepw(i,j,k)  fsdepw(i,j,k)
+#   define  fsvde3w(i,j,k)  fsde3w(i,j,k)
 
-#   define  fsve3t(i,j,k)   e3t(i,j,k)
-#   define  fsve3u(i,j,k)   e3u(i,j,k)
-#   define  fsve3v(i,j,k)   e3v(i,j,k)
-#   define  fsve3f(i,j,k)   e3f(i,j,k)
+#   define  fsve3t(i,j,k)   fse3t(i,j,k)
+#   define  fsve3u(i,j,k)   fse3u(i,j,k)
+#   define  fsve3v(i,j,k)   fse3v(i,j,k)
+#   define  fsve3f(i,j,k)   fse3f(i,j,k)
 
-#   define  fsve3w(i,j,k)   e3w(i,j,k)
-#   define  fsve3uw(i,j,k)  e3uw(i,j,k)
-#   define  fsve3vw(i,j,k)  e3vw(i,j,k)
+#   define  fsve3w(i,j,k)   fse3w(i,j,k)
+#   define  fsve3uw(i,j,k)  fse3uw(i,j,k)
+#   define  fsve3vw(i,j,k)  fse3vw(i,j,k)
 #endif