Changeset 6900 for branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/OVERFLOW/MY_SRC/usrdef_istate.F90

Timestamp:

2016-08-29T17:55:22+02:00 (8 years ago)

Author:

flavoni

Message:

#1692 and ROBUST-3 : Update OVERFLOW configuration, and some cleaning

File:

• branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/OVERFLOW/MY_SRC/usrdef_istate.F90 (modified) (3 diffs)

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/CONFIG/OVERFLOW/MY_SRC/usrdef_istate.F90

@@ -2 +2 @@
    !!==============================================================================
    !!                       ***  MODULE usrdef_istate   ***
+   !!
+   !!                      ===  OVERFLOW configuration  ===
+   !!
    !! User defined : set the initial state of a user configuration
    !!==============================================================================
-   !! History :  NEMO ! 2016-03  (S. Flavoni) Original code
+   !! History :  NEMO ! 2016-03  (S. Flavoni, G. Madec) Original code
    !!----------------------------------------------------------------------
 
@@ -40 +43 @@
       REAL(wp), DIMENSION(jpi,jpj,jpk)     , INTENT(in   ) ::   pdept   ! depth of t-point               [m]
       REAL(wp), DIMENSION(jpi,jpj,jpk)     , INTENT(in   ) ::   ptmask  ! t-point ocean mask             [m]
-      REAL(wp), DIMENSION(jpi,jpj,jpk,jpts), INTENT(  out) ::   pts     ! T & S fields      [Celcius ; g/kg]
+      REAL(wp), DIMENSION(jpi,jpj,jpk,jpts), INTENT(  out) ::   pts     ! T & S fields      [Celsius ; g/kg]
       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
-      INTEGRE :: dam         ! location of dam
+      INTEGER  ::   jk     ! dummy loop indices
+      REAL(wp) ::   zdam   ! location of dam [m]
       !!----------------------------------------------------------------------
       !
       IF(lwp) WRITE(numout,*)
-      IF(lwp) WRITE(numout,*) 'usr_def_istate : analytical definition of initial state '
+      IF(lwp) WRITE(numout,*) 'usr_def_istate : OVERFLOW configuration, analytical definition of initial state '
       IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~~   Ocean at rest, with a dam on T profile, and uniform S profile'
       !
@@ -57 +60 @@
       pssh(:,:)   = 0._wp
       !
-      DO jk = 1, jpk            ! T & S profiles
-         DO jj = 1, jpj
-            DO ji = 1, jpi
-                IF( ji .LE. dam ) THEN
-                   pts(ji,jj,jk,jp_tem) = 10.  * tmask(ji,jj,jk)
-                ELSE
-                   pts(ji,jj,jk,jp_tem) = 20. * tmask(ji,jj,jk)
-                ENDIF
-          END DO
-        END DO
+      !                          ! T & S profiles
+      zdam = 20.e+3
+      pts(:,:,:,jp_tem) = 20._wp * tmask(:,:,:)
+      DO jk = 1, jpkm1
+         WHERE( gphit(:,:) <= zdam )   pts(:,:,jk,jp_tem) = 10._wp * tmask(:,:,jk)
       END DO
       !