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 15410 for NEMO/branches/2020/ticket2487/src/OCE – NEMO

Ignore:
Timestamp:
2021-10-20T11:10:59+02:00 (3 years ago)
Author:
smueller
Message:

Synchronizing with /NEMO/releases/r4.0/r4.0-HEAD@15405 (ticket #2487)

Location:
NEMO/branches/2020/ticket2487
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2020/ticket2487

    • Property svn:externals

      •  

        old new  
        44^/utils/tools_r4.0-HEAD@14974   tools 
        55^/vendors/AGRIF/stable@14105    ext/AGRIF 
        6 ^/vendors/FCM@10134             ext/FCM 
         6^/vendors/FCM@15268             ext/FCM 
        77^/vendors/IOIPSL@9655           ext/IOIPSL 
        88 

  • NEMO/branches/2020/ticket2487/src/OCE/BDY/bdydta.F90

    r15264 r15410  
    246246         ! If full velocities in boundary data, then split it into barotropic and baroclinic component 
    247247         IF( bf_alias(jp_bdyu3d)%ltotvel ) THEN     ! if we read 3D total velocity (can be true only if u3d was read) 
    248             ! 
    249248            igrd = 2                       ! zonal velocity 
    250249            DO ib = 1, idx_bdy(jbdy)%nblen(igrd) 
    … …  
    260259               END DO 
    261260            END DO 
     261         ENDIF   ! ltotvel 
     262         IF( bf_alias(jp_bdyv3d)%ltotvel ) THEN     ! if we read 3D total velocity (can be true only if u3d was read) 
    262263            igrd = 3                       ! meridional velocity 
    263264            DO ib = 1, idx_bdy(jbdy)%nblen(igrd) 

  • NEMO/branches/2020/ticket2487/src/OCE/ICB/icbini.F90

    r15264 r15410  
    7272      IF( .NOT. ln_icebergs )   RETURN 
    7373 
     74      ALLOCATE( utau_icb(jpi,jpj) , vtau_icb(jpi,jpj) ) 
    7475      !                          ! allocate gridded fields 
    7576      IF( icb_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'icb_alloc : unable to allocate arrays' ) 

  • NEMO/branches/2020/ticket2487/src/OCE/ICB/icbutl.F90

    r15264 r15410  
    7676      ss_e(1:jpi,1:jpj) = sss_m(:,:) 
    7777      fr_e(1:jpi,1:jpj) = fr_i (:,:) 
    78       ua_e(1:jpi,1:jpj) = utau (:,:) * umask(:,:,1) ! maybe mask useless because mask applied in sbcblk 
    79       va_e(1:jpi,1:jpj) = vtau (:,:) * vmask(:,:,1) ! maybe mask useless because mask applied in sbcblk 
     78      ua_e(1:jpi,1:jpj) = utau_icb (:,:) * umask(:,:,1) ! maybe mask useless because mask applied in sbcblk 
     79      va_e(1:jpi,1:jpj) = vtau_icb (:,:) * vmask(:,:,1) ! maybe mask useless because mask applied in sbcblk 
    8080      ! 
    8181      CALL lbc_lnk_icb( 'icbutl', uo_e, 'U', -1._wp, 1, 1 ) 

  • NEMO/branches/2020/ticket2487/src/OCE/SBC/sbc_oce.F90

    r15264 r15410  
    113113   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   utau   , utau_b   !: sea surface i-stress (ocean referential)     [N/m2] 
    114114   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   vtau   , vtau_b   !: sea surface j-stress (ocean referential)     [N/m2] 
     115   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   utau_icb, vtau_icb !: sea surface (i,j)-stress used by icebergs   [N/m2] 
    115116   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   taum              !: module of sea surface stress (at T-point)    [N/m2]  
    116117   !! wndm is used onmpute surface gases exchanges in ice-free ocean or leads 

  • NEMO/branches/2020/ticket2487/src/OCE/SBC/sbcmod.F90

    r15264 r15410  
    449449      IF( ln_mixcpl )          CALL sbc_cpl_rcv   ( kt, nn_fsbc, nn_ice )   ! forced-coupled mixed formulation after forcing 
    450450      ! 
    451       IF ( ln_wave .AND. (ln_tauwoc .OR. ln_tauw) ) CALL sbc_wstress( )      ! Wind stress provided by waves  
     451      IF ( ln_wave .AND. (ln_tauwoc .OR. ln_tauw) ) CALL sbc_wstress( )       ! Wind stress provided by waves  
     452      ! 
     453      IF( ln_icebergs ) THEN  ! save pure wind stresses (with no ice-ocean stress) to be used by icebergs 
     454         utau_icb(:,:) = utau(:,:) ; vtau_icb(:,:) = vtau(:,:) 
     455      ENDIF  
    452456      ! 
    453457      !                                            !==  Misc. Options  ==! 

  • NEMO/branches/2020/ticket2487/src/OCE/lib_fortran.F90

    r10425 r15410  
    3434#if defined key_nosignedzero 
    3535   PUBLIC SIGN 
     36#endif 
     37#if defined key_noisnan 
     38   PUBLIC ISNAN 
    3639#endif 
    3740 
    … …  
    486489#endif 
    487490 
     491#if defined key_noisnan 
     492!$AGRIF_DO_NOT_TREAT 
     493   FUNCTION ISNAN(pa) 
     494      !!----------------------------------------------------------------------- 
     495      !!                  ***  FUNCTION ISNAN  *** 
     496      !! 
     497      !! ** Purpose: provide an alternative to non-standard intrinsic function 
     498      !!             ISNAN 
     499      !!----------------------------------------------------------------------- 
     500      USE, INTRINSIC ::   ieee_arithmetic 
     501      !! 
     502      REAL(wp), INTENT(in) ::   pa 
     503      LOGICAL              ::   ISNAN 
     504      !!----------------------------------------------------------------------- 
     505      ! 
     506      ISNAN = ieee_is_nan(pa) 
     507   END FUNCTION ISNAN 
     508!$AGRIF_END_DO_NOT_TREAT 
     509#endif 
     510 
    488511   !!====================================================================== 
    489512END MODULE lib_fortran 

  • NEMO/branches/2020/ticket2487/src/OCE/stpctl.F90

    r13137 r15410  
    2727   USE wet_dry,   ONLY : ll_wd, ssh_ref    ! reference depth for negative bathy 
    2828 
     29   USE lib_fortran     ! Fortran utilities 
    2930   USE netcdf          ! NetCDF library 
    3031   IMPLICIT NONE 
Note: See TracChangeset for help on using the changeset viewer.