Changeset 13874 for NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/SWG

Timestamp:

2020-11-25T14:49:40+01:00 (3 years ago)

Author:

techene

Message:

#2574 ssh set up at initialization or restart separated from u,v,ts : removed from istate_init added in dom_init

File:

• NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/SWG/MY_SRC/usrdef_istate.F90 (modified) (7 diffs)

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/tests/SWG/MY_SRC/usrdef_istate.F90

@@ -9 +9 @@
    !! History :  4.0  ! 2016-03  (S. Flavoni) Original code
    !!             -   ! 2020-03  (A. Nasser) Shallow Water Eq. configuration
+   !!                 ! 2020-11  (S. Techene, G. Madec) separate tsuv from ssh
    !!----------------------------------------------------------------------
 
@@ -23 +24 @@
    PRIVATE
 
-   PUBLIC   usr_def_istate   ! called in istate.F90
-   PUBLIC   usr_def_ssh      ! called by domqco.F90
+   PUBLIC   usr_def_istate       ! called in istate.F90
+   PUBLIC   usr_def_istate_ssh   ! called by domqco.F90
 
    !!----------------------------------------------------------------------
@@ -33 +34 @@
 CONTAINS
   
-   SUBROUTINE usr_def_istate( pdept, ptmask, pts, pu, pv, pssh )
+   SUBROUTINE usr_def_istate( pdept, ptmask, pts, pu, pv )
       !!----------------------------------------------------------------------
       !!                   ***  ROUTINE usr_def_istate  ***
@@ -49 +50 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk)     , INTENT(  out) ::   pu      ! i-component of the velocity  [m/s] 
       REAL(wp), DIMENSION(jpi,jpj,jpk)     , INTENT(  out) ::   pv      ! j-component of the velocity  [m/s] 
-      REAL(wp), DIMENSION(jpi,jpj)         , INTENT(  out) ::   pssh    ! sea-surface height
       !
       INTEGER :: ji, jj, jk  ! dummy loop indices
@@ -60 +60 @@
       pu  (:,:,:)   = 0._wp        ! ocean at rest
       pv  (:,:,:)   = 0._wp
-      pssh(:,:)     = 0._wp
       pts (:,:,:,:) = 0._wp            ! not used in SWE
 
@@ -69 +68 @@
 
 
-   SUBROUTINE usr_def_ssh( ptmask, pssh )
+   SUBROUTINE usr_def_istate_ssh( ptmask, pssh )
       !!----------------------------------------------------------------------
-      !!                   ***  ROUTINE usr_def_ssh  ***
+      !!                   ***  ROUTINE usr_def_istate_ssh  ***
       !! 
       !! ** Purpose :   Initialization of ssh
       !!                Here SWG configuration 
       !!
-      !! ** Method  :   set ssh
+      !! ** Method  :   set ssh to 0
       !!----------------------------------------------------------------------
       REAL(wp), DIMENSION(jpi,jpj,jpk)     , INTENT(in   ) ::   ptmask  ! t-point ocean mask             [m]
@@ -83 +82 @@
       !
       IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) 'usr_def_ssh : SWG configuration, analytical definition of initial state'
+      IF(lwp) WRITE(numout,*) 'usr_def_istate_ssh : SWG configuration, analytical definition of initial state'
       !
       pssh(:,:)   = 0._wp        ! ocean at rest
       !
-   END SUBROUTINE usr_def_ssh
+   END SUBROUTINE usr_def_istate_ssh
 
    !!======================================================================