Changeset 13247 for NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/USR

Timestamp:

2020-07-03T19:15:31+02:00 (4 years ago)

Author:

francesca

Message:

dev_r12558_HPC-08_epico_Extra_Halo: merge with trunk@13227, see #2366

Location:

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/USR

Files:

• usrdef_nam.F90 (modified) (1 diff)
• usrdef_sbc.F90 (modified) (1 diff)

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/USR/usrdef_nam.F90

@@ -69 +69 @@
       kk_cfg = nn_GYRE
       !
-      IF( Agrif_Root() ) THEN         ! Global Domain size: add 1 land point on each side
-         kpi = 30 * nn_GYRE + 2       !                     
-         kpj = 20 * nn_GYRE + 2
-      ELSE                            ! Global Domain size: add nbghostcells + 1 "land" point on each side
+      kpi = 30 * nn_GYRE + 2       !                     
+      kpj = 20 * nn_GYRE + 2
+#if defined key_agrif
+      IF( .NOT.Agrif_Root() ) THEN         ! Global Domain size: add 1 land point on each side
          kpi  = nbcellsx + nbghostcells_x   + nbghostcells_x   + 2
          kpj  = nbcellsy + nbghostcells_y_s + nbghostcells_y_n + 2
       ENDIF
+#endif
       kpk = jpkglo
       !                             ! Set the lateral boundary condition of the global domain

NEMO/branches/2020/dev_r12558_HPC-08_epico_Extra_Halo/src/OCE/USR/usrdef_sbc.F90

@@ -181 +181 @@
          wndm(ji,jj) = SQRT( zmod * zcoef )
       END_2D
-      CALL lbc_lnk_multi( 'usrdef_sbc', taum(:,:), 'T', 1. , wndm(:,:), 'T', 1. )
+      CALL lbc_lnk_multi( 'usrdef_sbc', taum(:,:), 'T', 1.0_wp , wndm(:,:), 'T', 1.0_wp )
 
       ! ---------------------------------- !