Changeset 14267 for NEMO

Timestamp:

2021-01-05T19:58:20+01:00 (3 years ago)

Author:

dbyrne

Message:

Boundary SSH switch and offset implemented

Location:

NEMO/branches/NERC/NEMO_4.0.4_CO9_package_tides/src/OCE/BDY

Files:

• bdy_oce.F90 (modified) (2 diffs)
• bdydta.F90 (modified) (1 diff)
• bdyini.F90 (modified) (3 diffs)

NEMO/branches/NERC/NEMO_4.0.4_CO9_package_tides/src/OCE/BDY/bdy_oce.F90

@@ -43 +43 @@
       INTEGER          , DIMENSION(2)   ::  nread
       LOGICAL                           ::  lneed_ssh
+      !--- davbyr
+      LOGICAL                           ::  lforced_ssh 
+     !--- END davbyr
       LOGICAL                           ::  lneed_dyn2d
       LOGICAL                           ::  lneed_dyn3d
@@ -117 +120 @@
    REAL(wp), DIMENSION(jp_bdy) ::   rice_hpnd               !: pond thick. of incoming sea ice
    REAL(wp), DIMENSION(jp_bdy) ::   rice_hlid               !: pond lid thick. of incoming sea ice
+   
+   !  davbyr 
+   LOGICAL, DIMENSION(jp_bdy) ::   ln_ssh_bdy               !: =T USE SSH BDY - name list switch
+   REAL(wp), DIMENSION(jp_bdy) ::  rn_ssh_shift             !: =F SHIFT SSH AT A BORDER BY rn_ssh_shift m_
+   !  END davbyr
    !
    !!----------------------------------------------------------------------

NEMO/branches/NERC/NEMO_4.0.4_CO9_package_tides/src/OCE/BDY/bdydta.F90

@@ -362 +362 @@
          ENDIF
       ENDIF
+      
+      ! davbyr - add a shift to the boundary + free elevation Enda, JT from NEMO RAN 3.6
+      DO jbdy = 1, nb_bdy
+         IF( dta_bdy(jbdy)%lneed_ssh ) THEN
+             nblen => idx_bdy(jbdy)%nblenrim
+             igrd  = 1
+             DO ib = 1, nblen(igrd)
+                ii = idx_bdy(jbdy)%nbi(ib,igrd)
+                ij = idx_bdy(jbdy)%nbj(ib,igrd)
+                dta_bdy(jbdy)%ssh(ib) = dta_bdy(jbdy)%ssh(ib) + rn_ssh_shift(jbdy) * tmask(ii,ij,1)
+                IF( .NOT. dta_bdy(jbdy)%lforced_ssh ) dta_bdy(jbdy)%ssh(ib) = sshn(ii,ij) * tmask(ii,ij,1)
+             END DO
+         END IF
+      END DO
+      !--- END davbyr
+      
       !
       IF( ln_timing )   CALL timing_stop('bdy_dta')

NEMO/branches/NERC/NEMO_4.0.4_CO9_package_tides/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