Changeset 6904 for branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM

Timestamp:

2016-09-01T12:17:31+02:00 (8 years ago)

Author:

gm

Message:

#1692 - branch SIMPLIF_2_usrdef: OVERFLOW configuration (zco & sco) + small bug corrections

Location:

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM

Files:

• dom_oce.F90 (modified) (2 diffs)
• domain.F90 (modified) (6 diffs)
• dommsk.F90 (modified) (1 diff)
• domzgr.F90 (modified) (1 diff)

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/dom_oce.F90

@@ -162 +162 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:)   ::   gdept_1d, gdepw_1d !: reference depth of t- and w-points (m)
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:)   ::   e3t_1d  , e3w_1d   !: reference vertical scale factors at T- and W-pts (m)
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   e3tp    , e3wp     !: ocean bottom level thickness at T and W points
 
 
@@ -290 +289 @@
          !
          !
-      ALLOCATE( gdept_1d(jpk) , gdepw_1d(jpk) ,                                     &
-         &      e3t_1d  (jpk) , e3w_1d  (jpk) , e3tp (jpi,jpj), e3wp(jpi,jpj) , STAT=ierr(7) )
+      ALLOCATE( gdept_1d(jpk) , gdepw_1d(jpk) , e3t_1d(jpk) , e3w_1d(jpk) , STAT=ierr(7) )
          !
       ALLOCATE( tmask_i(jpi,jpj) , tmask_h(jpi,jpj) ,                        & 

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

@@ -72 +72 @@
       INTEGER ::   iconf = 0    ! local integers
       CHARACTER (len=64) ::   cform = "(A12, 3(A13, I7))" 
-      INTEGER, DIMENSION(jpi,jpj) ::   ik_top, ik_bot       ! top and bottom ocean level
-      REAL(wp), POINTER, DIMENSION(:,:)   ::   zht, z1_hu_0, z1_hv_0
+      INTEGER , DIMENSION(jpi,jpj) ::   ik_top , ik_bot       ! top and bottom ocean level
+      REAL(wp), DIMENSION(jpi,jpj) ::   z1_hu_0, z1_hv_0
       !!----------------------------------------------------------------------
       !
@@ -125 +125 @@
       !           !==  time varying part of coordinate system  ==!
       !
-      IF( ln_linssh ) THEN          ! Fix in time : set to the reference one for all
+      IF( ln_linssh ) THEN       != Fix in time : set to the reference one for all
+      !
          !       before        !          now          !       after         !
          ;  gdept_b = gdept_0  ;   gdept_n = gdept_0   !        ---          ! depth of grid-points
@@ -139 +140 @@
          ;   e3vw_b =  e3vw_0  ;    e3vw_n =  e3vw_0   !        ---          !
          !
-         CALL wrk_alloc( jpi,jpj,   z1_hu_0, z1_hv_0 )
-         !
          z1_hu_0(:,:) = ssumask(:,:) / ( hu_0(:,:) + 1._wp - ssumask(:,:) )     ! _i mask due to ISF
          z1_hv_0(:,:) = ssvmask(:,:) / ( hv_0(:,:) + 1._wp - ssvmask(:,:) )
@@ -151 +150 @@
          ;  r1_hv_b = z1_hv_0  ;   r1_hv_n = z1_hv_0   ; r1_hv_a = z1_hv_0   !
          !
-         CALL wrk_dealloc( jpi,jpj,   z1_hu_0, z1_hv_0 )
-         !
-      ELSE                         ! time varying : initialize before/now/after variables
+         !
+      ELSE                       != time varying : initialize before/now/after variables
          !
          CALL dom_vvl_init 
@@ -191 +189 @@
       USE ioipsl
       NAMELIST/namrun/ cn_ocerst_indir, cn_ocerst_outdir, nn_stocklist, ln_rst_list,                 &
-                       nn_no   , cn_exp   , cn_ocerst_in, cn_ocerst_out, ln_rstart , nn_rstctl ,     &
+         &             nn_no   , cn_exp   , cn_ocerst_in, cn_ocerst_out, ln_rstart , nn_rstctl ,     &
          &             nn_it000, nn_itend , nn_date0    , nn_time0     , nn_leapy  , nn_istate ,     &
          &             nn_stock, nn_write , ln_mskland  , ln_clobber   , nn_chunksz, nn_euler  ,     &
@@ -504 +502 @@
       CALL iom_rstput( 0, 0, inum, 'e3vw_0'  , e3vw_0  , ktype = jp_r8 )
       !                                         
-      !                             !==  ocean top and bottom level  ==!
+      !                             !==  ocean top and bottom level  ==!   (caution: multiplied by ssmask)
       !
       CALL iom_rstput( 0, 0, inum, 'bottom level' , REAL( mbkt, wp )*ssmask , ktype = jp_i4 )   ! nb of ocean T-points

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/dommsk.F90

@@ -132 +132 @@
       DO jj = 1, jpj
          DO ji = 1, jpi
-            iktop = k_top(ji,jj)
-            ikbot = k_bot(ji,jj)
+            iktop = MAX( k_top(ji,jj) , 1 )
+            ikbot =      k_bot(ji,jj)
             tmask(ji,jj,      1:iktop-1) = 0._wp      ! mask the iceshelves
             tmask(ji,jj,iktop  :ikbot  ) = 1._wp
-            tmask(ji,jj,ikbot+1:jpkglo ) = 0._wp      ! mask the ocean topography
+            tmask(ji,jj,ikbot+1:jpk    ) = 0._wp      ! mask the ocean topography
          END DO  
       END DO  

branches/2016/dev_r6409_SIMPLIF_2_usrdef/NEMOGCM/NEMO/OPA_SRC/DOM/domzgr.F90

@@ -260 +260 @@
       !!                                     (min value = 1 over land)
       !!----------------------------------------------------------------------
-      !SF INTEGER , DIMENSION(:,:)  , INTENT(out) ::   k_top, k_bot   ! top & bottom ocean level indices
-      INTEGER , DIMENSION(:,:)  , INTENT(in) ::   k_top, k_bot   ! top & bottom ocean level indices
+      INTEGER , DIMENSION(:,:), INTENT(in) ::   k_top, k_bot   ! top & bottom ocean level indices
       !
       INTEGER ::   ji, jj   ! dummy loop indices