Changeset 12094

Timestamp:

2019-12-06T15:31:56+01:00 (4 years ago)

Author:

deazer

Message:

Allow ts_init to work properly for already interpolated scoords
Allow bdy to be spread over arbitary rim points

Location:

NEMO/branches/UKMO/NEMO_4.0.1_MIRROR_CO8_package/src/OCE

Files:

• BDY/bdyini.F90 (modified) (1 diff)
• DOM/dtatsd.F90 (modified) (1 diff)

NEMO/branches/UKMO/NEMO_4.0.1_MIRROR_CO8_package/src/OCE/BDY/bdyini.F90

@@ -597 +597 @@
             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

NEMO/branches/UKMO/NEMO_4.0.1_MIRROR_CO8_package/src/OCE/DOM/dtatsd.F90

@@ -179 +179 @@
       ptsd(:,:,:,jp_sal) = sf_tsd(jp_sal)%fnow(:,:,:) 
       !
-      IF( ln_sco ) THEN                   !==   s- or mixed s-zps-coordinate   ==!
+      IF( ln_sco .and. 1.eq.0 ) THEN                   !==   s- or mixed s-zps-coordinate   ==!
          !
          IF( kt == nit000 .AND. lwp )THEN