Changeset 14133 for NEMO/trunk/tests

Timestamp:

2020-12-08T14:25:34+01:00 (3 years ago)

Author:

jchanut

Message:

Now rn_a0 is public, use it in test cases instead of harcoded values

Location:

NEMO/trunk/tests

Files:

• CANAL/MY_SRC/usrdef_istate.F90 (modified) (2 diffs)
• DOME/MY_SRC/usrdef_istate.F90 (modified) (7 diffs)
• VORTEX/MY_SRC/usrdef_istate.F90 (modified) (2 diffs)

NEMO/trunk/tests/CANAL/MY_SRC/usrdef_istate.F90

@@ -16 +16 @@
    USE dom_oce        
    USE phycst         ! physical constants
+   USE eosbn2, ONLY: rn_a0
    !
    USE in_out_manager ! I/O manager
@@ -197 +198 @@
                   zrho1 = zrho1 - zdzF * zpsurf / grav    ! -1/g Dz(P) = -1/g * F'(z) * Psurf(x,y)
                ENDIF
-               !               pts(ji,jj,jk,jp_tem) = (20._wp + (rho0-zrho1) / 0.28_wp) * ptmask(ji,jj,jk)
-               pts(ji,jj,jk,jp_tem) = (10._wp + (rho0-zrho1) / 0.28_wp) * ptmask(ji,jj,jk)
+               !               pts(ji,jj,jk,jp_tem) = (20._wp + (rho0-zrho1) / rn_a0) * ptmask(ji,jj,jk)
+               pts(ji,jj,jk,jp_tem) = (10._wp + (rho0-zrho1) / rn_a0) * ptmask(ji,jj,jk)
             END DO
          END_2D

NEMO/trunk/tests/DOME/MY_SRC/usrdef_istate.F90

@@ -15 +15 @@
    USE par_oce        ! ocean space and time domain
    USE phycst         ! physical constants
+   USE eosbn2, ONLY: rn_a0
    !
    USE in_out_manager ! I/O manager
@@ -23 +24 @@
 
    PUBLIC   usr_def_istate   ! called by istate.F90
-
+   PUBlIC   usr_def_istate_ssh
    !!----------------------------------------------------------------------
    !! NEMO/OCE 4.0 , NEMO Consortium (2018)
@@ -34 +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  ***
@@ -54 +55 @@
       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
@@ -70 +70 @@
       pu  (:,:,:) = 0._wp        ! ocean at rest
       pv  (:,:,:) = 0._wp
-      pssh(:,:)   = 0._wp
       pts(:,:,:,:) = 0._wp
       !
@@ -100 +99 @@
                zf = 1._wp
             ENDIF   
-            zrho1 = rho0*zn2*zdt/grav/0.2_wp
+            zrho1 = rho0*zn2*zdt/grav/rn_a0
             pts(ji,jj,jk,jp_tem) = (15._wp - zrho1) * ptmask(ji,jj,jk)
 ! Mass conserving initialization:
-!            ztd = 15._wp*gdepw_0(ji,jj,jk+1)-0.5*rho0*zn2/(0.2_wp*grav)*gdepw_0(ji,jj,jk+1)**2
-!            ztu = 15._wp*gdepw_0(ji,jj,jk  )-0.5*rho0*zn2/(0.2_wp*grav)*gdepw_0(ji,jj,jk  )**2
-!            pts(ji,jj,jk,jp_tem) = (ztd - ztu)/e3t_0(ji,jj,jk) * ptmask(ji,jj,jk)
+            ztd = 15._wp*gdepw_0(ji,jj,jk+1)-0.5*rho0*zn2/(rn_a0*grav)*gdepw_0(ji,jj,jk+1)**2
+            ztu = 15._wp*gdepw_0(ji,jj,jk  )-0.5*rho0*zn2/(rn_a0*grav)*gdepw_0(ji,jj,jk  )**2
+            pts(ji,jj,jk,jp_tem) = (ztd - ztu)/e3t_0(ji,jj,jk) * ptmask(ji,jj,jk)
             IF (Agrif_root().AND.(  mjg0(jj) == Nj0glo-2 ) )  THEN
                pv(ji,jj,jk) = -sqrt(zdb*zh0)*exp(-zxw/zro)*(1._wp-zf) * ptmask(ji,jj,jk)
             ENDIF
             IF (Agrif_root().AND.(  mjg0(jj) == Nj0glo-1 ) )  THEN
-               pts(ji,jj,jk,jp_tem) = MIN(pts(ji,jj,jk,jp_tem), 15._wp - zdb*rho0/grav/0.2_wp*(1._wp-zf)) * ptmask(ji,jj,jk) 
+               pts(ji,jj,jk,jp_tem) = MIN(pts(ji,jj,jk,jp_tem), 15._wp - zdb*rho0/grav/rn_a0*(1._wp-zf)) * ptmask(ji,jj,jk) 
                pts(ji,jj,jk,jp_sal) = 1._wp * ptmask(ji,jj,jk) 
             ENDIF
@@ -118 +117 @@
    END SUBROUTINE usr_def_istate
 
+  
+   SUBROUTINE usr_def_istate_ssh( ptmask, pssh )
+      !!----------------------------------------------------------------------
+      !!                   ***  ROUTINE usr_def_istate  ***
+      !! 
+      !! ** Purpose :   Initialization of ssh
+      !!                Here DOME configuration 
+      !!
+      !! ** Method  :   set no initial sea level anomaly
+      !!  
+      !!----------------------------------------------------------------------
+      REAL(wp), DIMENSION(jpi,jpj,jpk)     , INTENT(in   ) ::   ptmask  !
+      REAL(wp), DIMENSION(jpi,jpj)         , INTENT(  out) ::   pssh    !
+      !
+      !!----------------------------------------------------------------------
+      !
+      pssh(:,:) = 0._wp
+      !
+   END SUBROUTINE usr_def_istate_ssh
+
    !!======================================================================
 END MODULE usrdef_istate

NEMO/trunk/tests/VORTEX/MY_SRC/usrdef_istate.F90

@@ -17 +17 @@
    USE dom_oce , ONLY : glamt, gphit, glamu, gphiu, glamv, gphiv  
    USE phycst         ! physical constants
+   USE eosbn2  , ONLY : rn_a0
    !
    USE in_out_manager ! I/O manager
@@ -85 +86 @@
                   & * EXP(-(zx**2+zy**2)/zlambda**2) / (grav*(zH -1._wp + EXP(-zH)));
             ENDIF
-            pts(ji,jj,jk,jp_tem) = (20._wp + (rho0-zrho1) / 0.28_wp) * ptmask(ji,jj,jk)
+            pts(ji,jj,jk,jp_tem) = (20._wp + (rho0-zrho1) / rn_a0 ) * ptmask(ji,jj,jk)
          END DO
       END_2D