Changeset 12342


Ignore:
Timestamp:
2020-01-28T11:10:01+01:00 (9 months ago)
Author:
acc
Message:

Branch 2019/dev_r12072_MERGE_OPTION2_2019. Implement recommended changes to fix ticket #2370

Location:
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF/isfcav.F90

    r12062 r12342  
    2222   USE isfdiags , ONLY: isf_diags_flx  ! ice shelf diags subroutine 
    2323   ! 
    24    USE oce      , ONLY: tsn                    ! ocean tracers 
    25    USE par_oce  , ONLY: jpi,jpj                ! ocean space and time domain 
    26    USE phycst   , ONLY: grav,rau0,r1_rau0_rcp  ! physical constants 
    27    USE eosbn2   , ONLY: ln_teos10               ! use ln_teos10 or not 
     24   USE oce      , ONLY: tsn                             ! ocean tracers 
     25   USE par_oce  , ONLY: jpi,jpj                         ! ocean space and time domain 
     26   USE phycst   , ONLY: grav,rau0,rau0_rcp,r1_rau0_rcp  ! physical constants 
     27   USE eosbn2   , ONLY: ln_teos10                       ! use ln_teos10 or not 
    2828   ! 
    2929   USE in_out_manager ! I/O manager 
  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/ISF/isfcpl.F90

    r12169 r12342  
    1616   USE lib_mpp , ONLY: mpp_sum, mpp_max ! mpp routine 
    1717   USE domvvl  , ONLY: dom_vvl_zgr      ! vertical scale factor interpolation 
     18   USE domngb  , ONLY: dom_ngb          ! find the closest grid point from a given lon/lat position 
    1819   ! 
    1920   USE oce            ! ocean dynamics and tracers 
  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/SBC/sbcblk.F90

    r12210 r12342  
    415415            END SELECT 
    416416            IF(ztmp < 0._wp) THEN 
    417                IF (lwp) WRITE(numout,'("   Mean humidity value found on proc #",i5.5," is: ",f)') narea, ztmp 
     417               IF (lwp) WRITE(numout,'("   Mean humidity value found on proc #",i6.6," is: ",f10.5)') narea, ztmp 
    418418               CALL ctl_stop( 'STOP', 'Something is wrong with air humidity!!!', & 
    419419                  &   ' ==> check the unit in your input files'       , & 
  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/TDE/tide_mod.F90

    r12202 r12342  
    1919   USE oce, ONLY : sshn       ! sea-surface height 
    2020   USE par_oce                ! ocean parameters 
    21    USE phycst, ONLY : rpi     ! pi 
     21   USE phycst, ONLY : rpi, rad, rday 
    2222   USE daymod, ONLY : ndt05   ! half-length of time step 
    2323   USE in_out_manager         ! I/O units 
Note: See TracChangeset for help on using the changeset viewer.