Changeset 10425 for NEMO/trunk/src/OCE/USR

Timestamp:

2018-12-19T22:54:16+01:00 (6 years ago)

Author:

smasson

Message:

trunk: merge back dev_r10164_HPC09_ESIWACE_PREP_MERGE@10424 into the trunk

Location:

NEMO/trunk/src/OCE/USR

Files:

• usrdef_fmask.F90 (modified) (1 diff)
• usrdef_sbc.F90 (modified) (2 diffs)
• usrdef_zgr.F90 (modified) (1 diff)

NEMO/trunk/src/OCE/USR/usrdef_fmask.F90

@@ -143 +143 @@
       ENDIF
       !
-      CALL lbc_lnk( pfmsk, 'F', 1._wp )      ! Lateral boundary conditions on fmask
+      CALL lbc_lnk( 'usrdef_fmask', pfmsk, 'F', 1._wp )      ! Lateral boundary conditions on fmask
       !
    END SUBROUTINE usr_def_fmask

NEMO/trunk/src/OCE/USR/usrdef_sbc.F90

@@ -132 +132 @@
       END DO
 
-      zsumemp = GLOB_SUM( emp  (:,:)   ) 
-      zsurf   = GLOB_SUM( tmask(:,:,1) ) 
+      zsumemp = GLOB_SUM( 'usrdef_sbc', emp  (:,:)   ) 
+      zsurf   = GLOB_SUM( 'usrdef_sbc', tmask(:,:,1) ) 
       zsumemp = zsumemp / zsurf         ! Default GYRE configuration
 
@@ -186 +186 @@
          END DO
       END DO
-      CALL lbc_lnk_multi( taum(:,:), 'T', 1. , wndm(:,:), 'T', 1. )
+      CALL lbc_lnk_multi( 'usrdef_sbc', taum(:,:), 'T', 1. , wndm(:,:), 'T', 1. )
 
       ! ---------------------------------- !

NEMO/trunk/src/OCE/USR/usrdef_zgr.F90

@@ -202 +202 @@
       z2d(:,:) = REAL( jpkm1 , wp )          ! flat bottom
       !
-      CALL lbc_lnk( z2d, 'T', 1. )           ! set surrounding land to zero (here jperio=0 ==>> closed)
+      CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. )           ! set surrounding land to zero (here jperio=0 ==>> closed)
       !
       k_bot(:,:) = NINT( z2d(:,:) )           ! =jpkm1 over the ocean point, =0 elsewhere