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 13662 for NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/OCE/ICB/icbini.F90 – NEMO

Ignore:
Timestamp:
2020-10-22T20:49:56+02:00 (4 years ago)
Author:
clem
Message:

update to almost r4.0.4

Location:
NEMO/branches/2019/dev_r11842_SI3-10_EAP
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • NEMO/branches/2019/dev_r11842_SI3-10_EAP

    • Property svn:externals

      •  

        old new  
        1 ^/utils/build/arch@HEAD       arch 
        2 ^/utils/build/makenemo@HEAD   makenemo 
        3 ^/utils/build/mk@HEAD         mk 
        4 ^/utils/tools@HEAD            tools 
        5 ^/vendors/AGRIF/dev@HEAD      ext/AGRIF 
        6 ^/vendors/FCM@HEAD            ext/FCM 
        7 ^/vendors/IOIPSL@HEAD         ext/IOIPSL 
         1^/utils/build/arch@12130      arch 
         2^/utils/build/makenemo@12191  makenemo 
         3^/utils/build/mk@11662        mk 
         4^/utils/tools_r4.0-HEAD@12672 tools 
         5^/vendors/AGRIF/dev@10586     ext/AGRIF 
         6^/vendors/FCM@10134           ext/FCM 
         7^/vendors/IOIPSL@9655         ext/IOIPSL 
         8 
         9# SETTE mapping (inactive) 
         10#^/utils/CI/sette@12135        sette 

  • NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/OCE/ICB/icbini.F90

    r11536 r13662  
    7979      ua_e(:,:) = 0._wp   ;   va_e(:,:) = 0._wp   ; 
    8080      ff_e(:,:) = 0._wp   ;   tt_e(:,:) = 0._wp   ; 
    81       fr_e(:,:) = 0._wp   ; 
     81      fr_e(:,:) = 0._wp   ;   ss_e(:,:) = 0._wp   ; 
    8282#if defined key_si3 
    8383      hi_e(:,:) = 0._wp   ; 
    … …  
    240240      vmask_e(:,:) = 0._wp   ;   vmask_e(1:jpi,1:jpj) = vmask(:,:,1) 
    241241      CALL lbc_lnk_icb( 'icbini', tmask_e, 'T', +1._wp, 1, 1 ) 
    242       CALL lbc_lnk_icb( 'icbini', umask_e, 'T', +1._wp, 1, 1 ) 
    243       CALL lbc_lnk_icb( 'icbini', vmask_e, 'T', +1._wp, 1, 1 ) 
     242      CALL lbc_lnk_icb( 'icbini', umask_e, 'U', +1._wp, 1, 1 ) 
     243      CALL lbc_lnk_icb( 'icbini', vmask_e, 'V', +1._wp, 1, 1 ) 
    244244      ! 
    245245      ! assign each new iceberg with a unique number constructed from the processor number 
    … …  
    382382         &              rn_rho_bergs   , rn_LoW_ratio   , nn_verbose_level    , ln_operator_splitting,   & 
    383383         &              rn_bits_erosion_fraction        , rn_sicn_shift       , ln_passive_mode      ,   & 
    384          &              ln_time_average_weight          , nn_test_icebergs    , rn_test_box          ,   & 
    385          &              ln_use_calving , rn_speed_limit , cn_dir, sn_icb 
     384         &              nn_test_icebergs                , rn_test_box         , ln_use_calving       ,   & 
     385         &              rn_speed_limit , cn_dir, sn_icb 
    386386      !!---------------------------------------------------------------------- 
    387387 
    … …  
    468468         WRITE(numout,*) '   Do not add freshwater flux from icebergs to ocean                ',   & 
    469469            &                    '                  passive_mode            = ', ln_passive_mode 
    470          WRITE(numout,*) '   Time average the weight on the ocean   time_average_weight       = ', ln_time_average_weight 
    471470         WRITE(numout,*) '   Create icebergs in absence of a restart file   nn_test_icebergs  = ', nn_test_icebergs 
    472471         WRITE(numout,*) '                   in lon/lat box                                   = ', rn_test_box 
Note: See TracChangeset for help on using the changeset viewer.