Ignore:
Timestamp:
2018-12-19T22:54:16+01:00 (2 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:
3 edited

Legend:

Unmodified
Added
Removed
  • NEMO/trunk/src/OCE/USR/usrdef_fmask.F90

    r10069 r10425  
    143143      ENDIF 
    144144      ! 
    145       CALL lbc_lnk( pfmsk, 'F', 1._wp )      ! Lateral boundary conditions on fmask 
     145      CALL lbc_lnk( 'usrdef_fmask', pfmsk, 'F', 1._wp )      ! Lateral boundary conditions on fmask 
    146146      ! 
    147147   END SUBROUTINE usr_def_fmask 
  • NEMO/trunk/src/OCE/USR/usrdef_sbc.F90

    r10069 r10425  
    132132      END DO 
    133133 
    134       zsumemp = GLOB_SUM( emp  (:,:)   )  
    135       zsurf   = GLOB_SUM( tmask(:,:,1) )  
     134      zsumemp = GLOB_SUM( 'usrdef_sbc', emp  (:,:)   )  
     135      zsurf   = GLOB_SUM( 'usrdef_sbc', tmask(:,:,1) )  
    136136      zsumemp = zsumemp / zsurf         ! Default GYRE configuration 
    137137 
     
    186186         END DO 
    187187      END DO 
    188       CALL lbc_lnk_multi( taum(:,:), 'T', 1. , wndm(:,:), 'T', 1. ) 
     188      CALL lbc_lnk_multi( 'usrdef_sbc', taum(:,:), 'T', 1. , wndm(:,:), 'T', 1. ) 
    189189 
    190190      ! ---------------------------------- ! 
  • NEMO/trunk/src/OCE/USR/usrdef_zgr.F90

    r10069 r10425  
    202202      z2d(:,:) = REAL( jpkm1 , wp )          ! flat bottom 
    203203      ! 
    204       CALL lbc_lnk( z2d, 'T', 1. )           ! set surrounding land to zero (here jperio=0 ==>> closed) 
     204      CALL lbc_lnk( 'usrdef_zgr', z2d, 'T', 1. )           ! set surrounding land to zero (here jperio=0 ==>> closed) 
    205205      ! 
    206206      k_bot(:,:) = NINT( z2d(:,:) )           ! =jpkm1 over the ocean point, =0 elsewhere 
Note: See TracChangeset for help on using the changeset viewer.