Changeset 661 for trunk/NEMO/OPA_SRC/DOM/domvvl.F90

Timestamp:

2007-05-25T17:51:50+02:00 (17 years ago)

Author:

opalod

Message:

nemo_v2_bugfix_039:RB: change dom_vvl functions to corresponding subroutines for compatibility with AGRIF

File:

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

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           ! 
+   PUBLIC dom_vvl_sf_ini ! 
+   PUBLIC dom_vvl_sf     ! 
 
    !! * Module variables
@@ -301 +301 @@
    END SUBROUTINE dom_vvl_ssh
 
-   FUNCTION sfe3( zssh, gridp )
-      !!----------------------------------------------------------------------
-      !!                ***  ROUTINE sfe3  ***
+   SUBROUTINE  dom_vvl_sf( zssh, gridp, sfe3 )
+      !!----------------------------------------------------------------------
+      !!                ***  ROUTINE dom_vvl_sf  ***
       !!                   
       !! ** Purpose :  compute vertical scale factor at each time step
@@ -310 +310 @@
       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
+      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT( out) :: sfe3    ! 3D workspace
 
       !! * Local declarations
@@ -338 +338 @@
       END SELECT
 
-      END FUNCTION sfe3
-
-   FUNCTION sfe3ini( gridp )
-      !!----------------------------------------------------------------------
-      !!                ***  ROUTINE sfe3  ***
+   END SUBROUTINE dom_vvl_sf
+
+   SUBROUTINE dom_vvl_sf_ini( gridp, sfe3ini )
+      !!----------------------------------------------------------------------
+      !!                ***  ROUTINE dom_vvl_sf_ini  ***
       !!                   
       !! ** Purpose :  affect the appropriate vertical scale factor. It is done
@@ -349 +349 @@
       !! * Arguments
       CHARACTER(LEN=1)                , INTENT( in ) :: gridp      ! grid point type
-      REAL(wp), DIMENSION(jpi,jpj,jpk)               :: sfe3ini    ! 3D workspace
+      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT (out) :: sfe3ini    ! 3D workspace
       !!----------------------------------------------------------------------
 
@@ -368 +368 @@
       END SELECT
 
-      END FUNCTION sfe3ini
+   END SUBROUTINE dom_vvl_sf_ini
 #else
    !!----------------------------------------------------------------------
@@ -382 +382 @@
       WRITE(*,*) 'dom_vvl_ssh: You should not have seen this print! error?', kt
    END SUBROUTINE dom_vvl_ssh
-   FUNCTION sfe3( zssh, gridp ) 
+   SUBROUTINE dom_vvl_sf( zssh, gridp, sfe3 ) 
       !! * 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
+      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT (out) :: 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 ) 
+   END SUBROUTINE dom_vvl_sf
+   SUBROUTINE dom_vvl_sf_ini( gridp, sfe3ini ) 
       !! * Arguments
       CHARACTER(LEN=1)                , INTENT( in ) :: gridp    ! grid point type
-      REAL(wp), DIMENSION(jpi,jpj,jpk)               :: sfe3ini  ! 3D workspace
+      REAL(wp), DIMENSION(jpi,jpj,jpk), INTENT (out) :: sfe3ini  ! 3D workspace
       sfe3ini(:,:,:) = 0.e0
       WRITE(*,*) 'sfe3ini: You should not have seen this print! error?', gridp
-   END FUNCTION sfe3ini
+   END SUBROUTINE dom_vvl_sf_ini
 #endif