New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 9748 – NEMO

Changeset 9748


Ignore:
Timestamp:
2018-06-06T11:51:26+02:00 (6 years ago)
Author:
jchanut
Message:

Make online bathymetry check compliant with nesting tools

Location:
NEMO/trunk/src/NST
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/NST/agrif_oce_interp.F90

    r9598 r9748  
    12371237                  ! 
    12381238                  IF( ABS( ptab(ji,jj,jk) - tmask(ji,jj,jk) * e3t_0(ji,jj,jk) ) > 1.D-2) THEN 
    1239                      IF (western_side) THEN 
     1239                     IF (western_side.AND.(ptab(i1+nbghostcells-1,jj,jk)>0._wp)) THEN 
    12401240                        WRITE(numout,*) 'ERROR bathymetry merge at the western border ji,jj,jk ', ji+nimpp-1,jj+njmpp-1,jk 
    1241                      ELSEIF (eastern_side) THEN 
     1241                        WRITE(numout,*)  ptab(ji,jj,jk), e3t_0(ji,jj,jk)  
     1242                        kindic_agr = kindic_agr + 1 
     1243                     ELSEIF (eastern_side.AND.(ptab(i2-nbghostcells+1,jj,jk)>0._wp)) THEN 
    12421244                        WRITE(numout,*) 'ERROR bathymetry merge at the eastern border ji,jj,jk ', ji+nimpp-1,jj+njmpp-1,jk 
    1243                      ELSEIF (southern_side) THEN 
     1245                        WRITE(numout,*)  ptab(ji,jj,jk), e3t_0(ji,jj,jk) 
     1246                        kindic_agr = kindic_agr + 1 
     1247                     ELSEIF (southern_side.AND.(ptab(ji,j1+nbghostcells-1,jk)>0._wp)) THEN 
    12441248                        WRITE(numout,*) 'ERROR bathymetry merge at the southern border ji,jj,jk', ji+nimpp-1,jj+njmpp-1,jk 
    1245                      ELSEIF (northern_side) THEN 
     1249                        WRITE(numout,*)  ptab(ji,jj,jk), e3t_0(ji,jj,jk) 
     1250                        kindic_agr = kindic_agr + 1 
     1251                     ELSEIF (northern_side.AND.(ptab(ji,j2-nbghostcells+1,jk)>0._wp)) THEN 
    12461252                        WRITE(numout,*) 'ERROR bathymetry merge at the northen border ji,jj,jk', ji+nimpp-1,jj+njmpp-1,jk 
     1253                        WRITE(numout,*)  ptab(ji,jj,jk), e3t_0(ji,jj,jk) 
     1254                        kindic_agr = kindic_agr + 1 
    12471255                     ENDIF 
    1248                      WRITE(numout,*) '      ptab(ji,jj,jk), e3t(ji,jj,jk) ', ptab(ji,jj,jk), e3t_0(ji,jj,jk) 
    1249                      kindic_agr = kindic_agr + 1 
    12501256                  ENDIF 
    12511257               END DO 
  • NEMO/trunk/src/NST/agrif_user.F90

    r9656 r9748  
    446446   CALL Agrif_Set_bc( vb2b_interp_id, (/0,ind1-1/) ) 
    447447 
    448    CALL Agrif_Set_bc(  e3t_id, (/-2*Agrif_irhox()-1,ind1-1/) )   ! if west and rhox=3 and ghost=1: column 2 to 9 
    449    CALL Agrif_Set_bc( umsk_id, (/0,ind1-1/)                  ) 
    450    CALL Agrif_Set_bc( vmsk_id, (/0,ind1-1/)                  ) 
     448   CALL Agrif_Set_bc(  e3t_id, (/-1*Agrif_irhox(),ind1-1/) )   ! if west and rhox=3 and ghost=1: column 2 to 6  
     449   CALL Agrif_Set_bc( umsk_id, (/0,0/) ) 
     450   CALL Agrif_Set_bc( vmsk_id, (/0,0/) ) 
     451 
    451452 
    452453   IF( ln_zdftke.OR.ln_zdfgls )   CALL Agrif_Set_bc( avm_id, (/0,ind1/) ) 
Note: See TracChangeset for help on using the changeset viewer.