Changeset 7452 for branches/UKMO/r6232_CO6_CO5_zenv_pomsdwl/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

Timestamp:

2016-12-05T19:17:59+01:00 (8 years ago)

Author:

jcastill

Message:

Changes as in UKMO/2015_V36_STABLE_CO6_CO5_zenv_pomsdwl@5793

File:

• branches/UKMO/r6232_CO6_CO5_zenv_pomsdwl/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90 (modified) (9 diffs)

branches/UKMO/r6232_CO6_CO5_zenv_pomsdwl/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -102 +102 @@
       INTEGER ::   ios
       !
-      NAMELIST/namzgr/ ln_zco, ln_zps, ln_sco, ln_isfcav
+      NAMELIST/namzgr/ ln_zco, ln_zps, ln_sco, ln_isfcav, ln_read_zenv
       !!----------------------------------------------------------------------
       !
@@ -125 +125 @@
          WRITE(numout,*) '             s- or hybrid z-s-coordinate    ln_sco    = ', ln_sco
          WRITE(numout,*) '             ice shelf cavities             ln_isfcav = ', ln_isfcav
+         WRITE(numout,*) '             Read zenv from Bathy T/F ln_read_zenv    = ', ln_read_zenv
       ENDIF
 
@@ -532 +533 @@
             ELSE
                CALL iom_get  ( inum, jpdom_data, 'Bathymetry'    , bathy, lrowattr=ln_use_jattr  )
+               IF ( ln_read_zenv ) THEN                  ! Whether we should read zenv or not  
+                   CALL iom_get  ( inum, jpdom_data, 'zenv', zenv )  
+               ENDIF  
             END IF
             CALL iom_close( inum )
@@ -1812 +1816 @@
       !
       REAL(wp), POINTER, DIMENSION(:,:  ) :: ztmpi1, ztmpi2, ztmpj1, ztmpj2
-      REAL(wp), POINTER, DIMENSION(:,:  ) :: zenv, ztmp, zmsk, zri, zrj, zhbat
+      REAL(wp), POINTER, DIMENSION(:,:  ) :: ztmp, zmsk, zri, zrj, zhbat
 
       NAMELIST/namzgr_sco/ln_s_sh94, ln_s_sf12, ln_sigcrit, rn_sbot_min, rn_sbot_max, rn_hc, rn_rmax,rn_theta, &
@@ -1820 +1824 @@
       IF( nn_timing == 1 )  CALL timing_start('zgr_sco')
       !
-      CALL wrk_alloc( jpi, jpj, zenv, ztmp, zmsk, zri, zrj, zhbat , ztmpi1, ztmpi2, ztmpj1, ztmpj2 )
+      CALL wrk_alloc( jpi, jpj, ztmp, zmsk, zri, zrj, zhbat , ztmpi1, ztmpi2, ztmpj1, ztmpj2 )
       !
       REWIND( numnam_ref )              ! Namelist namzgr_sco in reference namelist : Sigma-stretching parameters
@@ -1874 +1878 @@
       !                                        ! =============================
       ! use r-value to create hybrid coordinates
+      scosrf(:,:) = 0._wp             ! ocean surface depth (here zero: no under ice-shelf sea)  
+      scobot(:,:) = bathy(:,:)        ! ocean bottom  depth  
+      IF( ln_read_zenv) THEN  
+           WRITE(numout,*) '      Zenv is not calculated but read from Bathy File ln_read_zenv        = ', ln_read_zenv  
+      ELSE  
       zenv(:,:) = bathy(:,:)
       !
@@ -1896 +1905 @@
       ! 
       ! smooth the bathymetry (if required)
-      scosrf(:,:) = 0._wp             ! ocean surface depth (here zero: no under ice-shelf sea)
-      scobot(:,:) = bathy(:,:)        ! ocean bottom  depth
       !
       jl = 0
@@ -1961 +1968 @@
       END DO                                                !     End loop     !
       !                                                     ! ================ !
+      ENDIF ! End of IF Block for reading in zenv  
+      CALL lbc_lnk( zenv, 'T', 1._wp, 'no0' ) 
       DO jj = 1, jpj
          DO ji = 1, jpi
@@ -2236 +2245 @@
       END DO
       !
-      CALL wrk_dealloc( jpi, jpj, zenv, ztmp, zmsk, zri, zrj, zhbat , ztmpi1, ztmpi2, ztmpj1, ztmpj2 )
+      CALL wrk_dealloc( jpi, jpj, ztmp, zmsk, zri, zrj, zhbat , ztmpi1, ztmpi2, ztmpj1, ztmpj2 )
       !
       IF( nn_timing == 1 )  CALL timing_stop('zgr_sco')