Changeset 13109

Timestamp:

2020-06-16T12:07:28+02:00 (3 years ago)

Author:

rblod

Message:

ticket #2129 : major corrections in domcfg

Location:

utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg

Files:

• namelist_ref (modified) (1 diff)
• src/agrif_connect.F90 (modified) (4 diffs)
• src/agrif_dom_update.F90 (modified) (6 diffs)
• src/domain.F90 (modified) (2 diffs)
• src/domzgr.F90 (modified) (1 diff)
• src/mppini.F90 (modified) (1 diff)

utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/namelist_ref

@@ -24 +24 @@
 &namdom        !   space and time domain (bathymetry, mesh, timestep)
 !-----------------------------------------------------------------------
+   ln_read_cfg = .false.   !  Read from a domain_cfg file
    nn_bathy    =    1      !  compute analyticaly (=0) or read (=1) the bathymetry file
                            !  or compute (2) from external bathymetry
    nn_interp   =    1                          ! type of interpolation (nn_bathy =2)
+   cn_domcfg   = ' '       ! Name of the domain_cfg input file
    cn_topo     =  'bathymetry_ORCA12_V3.3.nc'  ! external topo file (nn_bathy =2)
    cn_bath     =  'Bathymetry'                 ! topo name in file  (nn_bathy =2)

utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/agrif_connect.F90

@@ -29 +29 @@
       ALLOCATE(e3t_interp(jpi,jpj,jpk))
       e3t_interp = -10.
-      Agrif_UseSpecialValue = .TRUE.
+      Agrif_UseSpecialValue = .FALSE.
       Agrif_SpecialValue = 0.
       CALL Agrif_Bc_variable(e3t_connect_id, procname = connect_e3t_connect)
@@ -90 +90 @@
       !!---------------------------------------------------------------------- 
       INTEGER :: ji, jj, jk 
-      REAL(wp), DIMENSION(i1:i2,j1:j2) :: bathy_local   
+      REAL(wp), DIMENSION(i1:i2,j1:j2) :: bathy_local, bathy_interp
+      REAL(wp) :: zdepth, zmax 
       !
       IF( before) THEN
@@ -114 +115 @@
             DO ji=i1,i2
                bathy_local (ji,jj) = SUM ( e3t_0(ji,jj, 1:mbkt(ji,jj) ) ) * ssmask(ji,jj)
-            END DO
-         END DO
+               bathy_interp (ji,jj) = ptab(ji,jj,jpk+1)
+
+        ! Connected bathymetry
+               bathy_local(ji,jj)=(1.-ztabramp(ji,jj))*bathy_local(ji,jj)+ztabramp(ji,jj)*bathy_interp(ji,jj)
+            END DO
+         END DO
+
+        ! Update mbkt and ssmask
+         zmax = gdepw_1d(jpk) + e3t_1d(jpk)
+         bathy_local(:,:) = MAX(MIN(zmax,bathy_local(:,:)),0._wp)
+         WHERE( bathy_local(i1:i2,j1:j2) == 0._wp); mbathy(i1:i2,j1:j2) = 0
+         ELSE WHERE                       ; mbathy(i1:i2,j1:j2) = jpkm1
+         END WHERE
+
+         DO jk=jpkm1,1,-1
+           zdepth = gdepw_1d(jk)+MIN(e3zps_min,e3t_1d(jk)*e3zps_rat)
+           WHERE( 0._wp < bathy_local(:,:) .AND. bathy_local(:,:) <= zdepth ) mbathy(i1:i2,j1:j2) = jk-1
+         ENDDO
+
+         WHERE (mbathy(i1:i2,j1:j2) == 0); ssmask(i1:i2,j1:j2) = 0
+         ELSE WHERE                      ; ssmask(i1:i2,j1:j2) = 1.
+         END WHERE
+         
+         mbkt(i1:i2,j1:j2) = MAX( mbathy(i1:i2,j1:j2), 1 )
+
          !
          DO jk=1,jpk
@@ -125 +149 @@
                      e3t_0(ji,jj,jk) = ( 1. - ztabramp(ji,jj) )*e3t_0(ji,jj,jk) + ztabramp(ji,jj)*e3t_interp(ji,jj,jk)
                   ENDIF
+                  IF( jk > mbkt(ji,jj)) THEN
+                    e3t_0(ji,jj,jk) = e3t_1d(jk)
+                  ENDIF
              END DO
            END DO

utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/agrif_dom_update.F90

@@ -22 +22 @@
       IF( Agrif_Root() ) return
 
-      CALL agrif_update_variable(bottom_level_id,locupdate=(/npt_copy,0/),procname = update_bottom_level)
+      CALL agrif_update_variable(bottom_level_id,procname = update_bottom_level)
       !
       Agrif_UseSpecialValueInUpdate = .TRUE.
@@ -41 +41 @@
       !
       !!---------------------------------------------------------------------- 
+      REAL(WP),DIMENSION(jpi,jpj) :: zk
       !
       IF( before) THEN
@@ -49 +50 @@
          WHERE ( mbkt(i1:i2,j1:j2) .EQ. 0 )
             ssmask(i1:i2,j1:j2) = 0.
+            mbkt(i1:i2,j1:j2)   = 1
          ELSEWHERE
             ssmask(i1:i2,j1:j2) = 1.
-         END WHERE           
+         END WHERE 
+         zk(:,:) = REAL(mbkt(:,:),wp); CALL lbc_lnk('update_bottom',zk,'T',1.); mbkt(:,:) = MAX(NINT(zk(:,:)),1)
+         CALL lbc_lnk('update_bottom',ssmask,'T',1.)          
       ENDIF
       !
@@ -71 +75 @@
             DO jj=j1,j2
                DO ji=i1,i2
-                   IF( mbkt(ji,jj) .LE. jk ) THEN
+                   IF( mbkt(ji,jj) .GE. jk ) THEN
                       tabres(ji,jj,jk) = e3t_0(ji,jj,jk)
                    ELSE
@@ -83 +87 @@
             DO jj=j1,j2
                DO ji=i1,i2
-                   IF( mbkt(ji,jj) .LE.jk ) THEN
+                   IF( mbkt(ji,jj) .GE. jk ) THEN
                       e3t_0(ji,jj,jk) = MAX(tabres(ji,jj,jk),MIN(e3zps_min,e3t_1d(jk)*e3zps_rat))
                    ELSE
@@ -91 +95 @@
             END DO
          END DO
+
+         CALL lbc_lnk('update_e3t',e3t_0,'T',1.)
          !
       ENDIF

utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/domain.F90

@@ -108 +108 @@
          &             ln_cfmeta, ln_iscpl
 
-      NAMELIST/namdom/ nn_bathy, cn_topo, cn_bath, cn_lon, cn_lat, rn_scale, nn_interp, &
+      NAMELIST/namdom/ ln_read_cfg, nn_bathy, cn_domcfg, cn_topo, cn_bath, cn_lon, cn_lat, rn_scale, nn_interp, &
          &              rn_bathy , rn_e3zps_min, rn_e3zps_rat, nn_msh, rn_hmin,            &
          &             rn_atfp , rn_rdt   ,  ln_crs      , jphgr_msh ,                               &
@@ -405 +405 @@
       CALL iom_rstput( 0, 0, inum, 'top_level'    , REAL( mikt, wp )*ssmask , ktype = jp_i4 )   ! nb of ocean T-points (ISF)
       CALL iom_rstput( 0, 0, inum, 'isf_draft'    , risfdep , ktype = jp_r8 )
-      CALL iom_rstput( 0, 0, inum, 'bathy_metry'  , bathy   , ktype = jp_r8 )
+      DO jj = 1,jpj
+         DO ji = 1,jpi
+            z2d (ji,jj) = SUM ( e3t_0(ji,jj, 1:mbkt(ji,jj) ) ) * ssmask(ji,jj) 
+         END DO
+      END DO
+      CALL iom_rstput( 0, 0, inum, 'bathy_metry'   , z2d , ktype = jp_r8 )
       !
       !                              !== closed sea ==!

utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/domzgr.F90

@@ -204 +204 @@
                           CALL zgr_top_level    ! shallowest ocean level for T-, U-, V- points
                           k_top = mikt
-
+                          WHERE( bathy(:,:) <= 0._wp )  k_top(:,:) = 0  ! set k_top to zero over land
       ENDIF
       !

utils/tools_dev_r12970_AGRIF_CMEMS/DOMAINcfg/src/mppini.F90

@@ -278 +278 @@
 #if defined key_agrif
       IF( .NOT. Agrif_Root() ) THEN       ! AGRIF children: specific setting (cf. agrif_user.F90)
-         IF( jpiglo /= nbcellsx + 2 + 2*nbghostcells ) THEN
+         CALL agrif_nemo_init
+         IF( jpiglo /= nbcellsx + 2 + 2*nbghostcells_x ) THEN
             IF(lwp) THEN
                WRITE(numout,*)
-               WRITE(numout,*) 'jpiglo should be: ', nbcellsx + 2 + 2*nbghostcells
+               WRITE(numout,*) 'jpiglo should be: ', nbcellsx + 2 + 2*nbghostcells_x
             ENDIF        
             CALL ctl_stop( 'STOP', 'mpp_init: Agrif children requires jpiglo == nbcellsx + 2 + 2*nbghostcells' )
          ENDIF   
-         IF( jpjglo /= nbcellsy + 2 + 2*nbghostcells ) THEN
+         IF( jpjglo /= nbcellsy + 2 + nbghostcells_y_s + nbghostcells_y_n ) THEN
             IF(lwp) THEN
                WRITE(numout,*)
-               WRITE(numout,*) 'jpjglo shoud be: ', nbcellsy + 2 + 2*nbghostcells
+               WRITE(numout,*) 'jpjglo shoud be: ', nbcellsy + 2 + nbghostcells_y_s + nbghostcells_y_n
             ENDIF        
-            CALL ctl_stop( 'STOP', 'mpp_init: Agrif children requires jpjglo == nbcellsy + 2 + 2*nbghostcells' )
+            CALL ctl_stop( 'STOP', &
+               'mpp_init: Agrif children requires jpjglo == nbcellsy + 2 + nbghostcells_y_s + nbghostcells_y_n' )
          ENDIF   
          IF( ln_use_jattr )   CALL ctl_stop( 'STOP', 'mpp_init:Agrif children requires ln_use_jattr = .false. ' )