Changeset 12343

Timestamp:

2020-01-28T11:13:46+01:00 (5 years ago)

Author:

acc

Message:

Branch 2019/dev_r11943_MERGE_2019. Implement recommended changes to fix ticket #2371

Location:

NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE

Files:

• ISF/isfcav.F90 (modified) (1 diff)
• ISF/isfcpl.F90 (modified) (1 diff)
• SBC/sbcblk.F90 (modified) (1 diff)
• TDE/tide_mod.F90 (modified) (1 diff)

NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ISF/isfcav.F90

@@ -22 +22 @@
    USE isfdiags , ONLY: isf_diags_flx  ! ice shelf diags subroutine
    !
-   USE oce      , ONLY: ts                     ! ocean tracers
-   USE par_oce  , ONLY: jpi,jpj                ! ocean space and time domain
-   USE phycst   , ONLY: grav,rau0,r1_rau0_rcp  ! physical constants
-   USE eosbn2   , ONLY: ln_teos10               ! use ln_teos10 or not
+   USE oce      , ONLY: ts                              ! ocean tracers
+   USE par_oce  , ONLY: jpi,jpj                         ! ocean space and time domain
+   USE phycst   , ONLY: grav,rau0,rau0_rcp,r1_rau0_rcp  ! physical constants
+   USE eosbn2   , ONLY: ln_teos10                       ! use ln_teos10 or not
    !
    USE in_out_manager ! I/O manager

NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/ISF/isfcpl.F90

@@ -16 +16 @@
    USE lib_mpp , ONLY: mpp_sum, mpp_max ! mpp routine
    USE domvvl  , ONLY: dom_vvl_zgr      ! vertical scale factor interpolation
+   USE domngb  , ONLY: dom_ngb          ! find the closest grid point from a given lon/lat position
    !
    USE oce            ! ocean dynamics and tracers

NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/SBC/sbcblk.F90

@@ -416 +416 @@
             END SELECT
             IF(ztmp < 0._wp) THEN
-               IF (lwp) WRITE(numout,'("   Mean humidity value found on proc #",i5.5," is: ",f)') narea, ztmp
+               IF (lwp) WRITE(numout,'("   Mean humidity value found on proc #",i6.6," is: ",f10.5)') narea, ztmp
                CALL ctl_stop( 'STOP', 'Something is wrong with air humidity!!!', &
                   &   ' ==> check the unit in your input files'       , &

NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/TDE/tide_mod.F90

@@ -19 +19 @@
    USE oce, ONLY : ssh        ! sea-surface height
    USE par_oce                ! ocean parameters
-   USE phycst, ONLY : rpi     ! pi
+   USE phycst, ONLY : rpi, rad, rday
    USE daymod, ONLY : ndt05   ! half-length of time step
    USE in_out_manager         ! I/O units