Changeset 15737 for NEMO/branches/UKMO/NEMO_4.0.4_eiwpo12/src/OCE/BDY/bdyini.F90

Timestamp:

2022-03-04T15:23:00+01:00 (2 years ago)

Author:

jcastill

Message:

Adding in NOC changes straight from SEAsia_R36 model

File:

• NEMO/branches/UKMO/NEMO_4.0.4_eiwpo12/src/OCE/BDY/bdyini.F90 (modified) (4 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_eiwpo12/src/OCE/BDY/bdyini.F90

@@ -69 +69 @@
          &             ln_vol, nn_volctl, nn_rimwidth
          !
+!     davbyr Propagating ENDA's stuff from 3.6
+      NAMELIST/nambdy_ssh/ ln_ssh_bdy, rn_ssh_shift
+      INTEGER  ::   ib_bdy
+!     END davbyr
       INTEGER  ::   ios                 ! Local integer output status for namelist read
       !!----------------------------------------------------------------------
@@ -97 +101 @@
 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'nambdy in configuration namelist' )
       IF(lwm) WRITE ( numond, nambdy )
+      
+      ! davbyr Propagating ENDA's stuff from 3.6
+      REWIND( numnam_ref )              ! Namelist nambdy in reference namelist :Unstructured open boundaries
+      READ  ( numnam_ref, nambdy_ssh, IOSTAT = ios, ERR = 905)
+905   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy_ssh in reference namelist' )
+
+      REWIND( numnam_cfg )              ! Namelist nambdy in configuration namelist :Unstructured open boundaries
+      READ  ( numnam_cfg, nambdy_ssh, IOSTAT = ios, ERR = 906)
+906   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nambdy_ssh in configuration namelist' )
+      IF(lwm) WRITE ( numond, nambdy_ssh )
+
+      IF(lwp) WRITE(numout,*)
+      IF(lwp) WRITE(numout,*) 'nambdy_ssh : use of ssh boundaries'
+      IF(lwp) WRITE(numout,*) '~~~~~~~~'
+      IF(lwp) WRITE(numout,*) '      ln_ssh_bdy: '
+      DO ib_bdy = 1,nb_bdy
+        IF(lwp) WRITE(numout,*) '      ln_ssh_bdy  (',ib_bdy,'): ',ln_ssh_bdy(ib_bdy)
+      IF(lwp) WRITE(numout,*) '      rn_ssh_shift: '
+      ENDDO
+      DO ib_bdy = 1,nb_bdy
+        IF(lwp) WRITE(numout,*) '      rn_ssh_shift(',ib_bdy,'): ',rn_ssh_shift(ib_bdy)
+      ENDDO
+      IF(lwp) WRITE(numout,*) '~~~~~~~~'
+      IF(lwp) WRITE(numout,*)
+!     END davbyr
 
       IF( .NOT. Agrif_Root() ) ln_bdy = .FALSE.   ! forced for Agrif children
@@ -201 +230 @@
          dta_bdy(ib_bdy)%lneed_ssh   = cn_dyn2d(ib_bdy) == 'flather'
          dta_bdy(ib_bdy)%lneed_dyn2d = cn_dyn2d(ib_bdy) /= 'none'
+
+       ! davbyr propagating JT override dta_bdy(ib_bdy)%ll_ssh with namelist value (ln_ssh_bdy)
+         dta_bdy(ib_bdy)%lforced_ssh = ln_ssh_bdy(ib_bdy)
+         IF(lwp) WRITE(numout,*) 'nambdy_ssh : use of ssh boundaries'
+         IF(lwp) WRITE(numout,*) '~~~~~~~~'
+         IF(lwp) WRITE(numout,*) '      ib_bdy: ',ib_bdy
+         IF(lwp) WRITE(numout,*) '      dta_bdy(ib_bdy)%lneed_ssh  : ',dta_bdy(ib_bdy)%lneed_ssh
+         IF(lwp) WRITE(numout,*) '      dta_bdy(ib_bdy)%lforced_ssh: ',dta_bdy(ib_bdy)%lforced_ssh
+         IF(lwp) WRITE(numout,*) '~~~~~~~~'
+         ! END davbyr
 
          IF( lwp .AND. dta_bdy(ib_bdy)%lneed_dyn2d ) THEN
@@ -598 +637 @@
             DO ib = 1, idx_bdy(ib_bdy)%nblen(igrd)
                ir = MAX( 1, idx_bdy(ib_bdy)%nbr(ib,igrd) )   ! both rim 0 and rim 1 have the same weights
-               idx_bdy(ib_bdy)%nbw(ib,igrd) = 1.- TANH( REAL( ir - 1 ) *0.5 )      ! tanh formulation
+!               idx_bdy(ib_bdy)%nbw(ib,igrd) = 1.- TANH( REAL( ir - 1 ) *0.5 )      ! tanh formulation
+               idx_bdy(ib_bdy)%nbw(ib,igrd) = 1.- TANH( FLOAT( ir - 1 ) * 0.5 &
+                                                & *(10./FLOAT(nn_rimwidth(ib_bdy))) ) ! JGraham:modified for rim=15
                !               idx_bdy(ib_bdy)%nbw(ib,igrd) = (REAL(nn_rimwidth(ib_bdy)+1-ir)/REAL(nn_rimwidth(ib_bdy)))**2.  ! quadratic
                !               idx_bdy(ib_bdy)%nbw(ib,igrd) =  REAL(nn_rimwidth(ib_bdy)+1-ir)/REAL(nn_rimwidth(ib_bdy))       ! linear