Changeset 14066 for NEMO/branches/2020/dev_r13787_doc_latex_recovery/tests/ISOMIP/MY_SRC/usrdef_istate.F90

Timestamp:

2020-12-03T20:14:08+01:00 (3 years ago)

Author:

nicolasmartin

Message:

#2414 Sync merge with trunk

Location:

NEMO/branches/2020/dev_r13787_doc_latex_recovery

Files:

• . (modified) (1 prop)
• tests/ISOMIP/MY_SRC/usrdef_istate.F90 (modified) (6 diffs)

NEMO/branches/2020/dev_r13787_doc_latex_recovery

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette_wave@13990         sette

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette_wave@13990         sette

NEMO/branches/2020/dev_r13787_doc_latex_recovery/tests/ISOMIP/MY_SRC/usrdef_istate.F90

@@ -9 +9 @@
    !! History :  NEMO ! 2016-11 (S. Flavoni)             Original code
    !!                 ! 2017-02 (P. Mathiot, S. Flavoni) Adapt code to ISOMIP case
+   !!                 ! 2020-11 (S. Techene, G. Madec) separate tsuv from ssh
    !!----------------------------------------------------------------------
 
@@ -24 +25 @@
    PRIVATE
 
-   PUBLIC   usr_def_istate   ! called by istate.F90
+   PUBLIC   usr_def_istate       ! called by istate.F90
+   PUBLIC   usr_def_istate_ssh   ! called by domqco.F90
 
    !!----------------------------------------------------------------------
@@ -33 +35 @@
 CONTAINS
   
-   SUBROUTINE usr_def_istate( pdept, ptmask, pts, pu, pv, pssh )
+   SUBROUTINE usr_def_istate( pdept, ptmask, pts, pu, pv )
       !!----------------------------------------------------------------------
       !!                   ***  ROUTINE usr_def_istate  ***
@@ -48 +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  ::   jk     ! dummy loop indices
       !!----------------------------------------------------------------------
       !
@@ -58 +57 @@
       pu  (:,:,:) = 0._wp        ! ocean at rest
       pv  (:,:,:) = 0._wp
-      pssh(:,:)   = 0._wp
-      !
       !                          ! T & S profiles
       pts(:,:,:,jp_tem) = - 1.9 * ptmask(:,:,:)          ! ISOMIP configuration : start from constant T+S fields
@@ -66 +63 @@
    END SUBROUTINE usr_def_istate
 
+
+   SUBROUTINE usr_def_istate_ssh( ptmask, pssh )
+      !!----------------------------------------------------------------------
+      !!                   ***  ROUTINE usr_def_istate_ssh  ***
+      !! 
+      !! ** Purpose :   Initialization of ssh
+      !!                Here ISOMIP configuration 
+      !!
+      !! ** Method  :   set ssh to 0
+      !!----------------------------------------------------------------------
+      REAL(wp), DIMENSION(jpi,jpj,jpk)     , INTENT(in   ) ::   ptmask  ! t-point ocean mask   [m]
+      REAL(wp), DIMENSION(jpi,jpj)         , INTENT(  out) ::   pssh    ! sea-surface height   [m]
+      !!----------------------------------------------------------------------
+      !
+      IF(lwp) WRITE(numout,*)
+      IF(lwp) WRITE(numout,*) 'usr_def_istate_ssh : ISOMIP configuration, analytical definition of initial state'
+      !
+      pssh(:,:)   = 0._wp
+      !
+   END SUBROUTINE usr_def_istate_ssh
+
    !!======================================================================
 END MODULE usrdef_istate

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette_wave@13990         sette