Changeset 13265 for NEMO/branches/2020/tickets_2494_2375/src/OCE/ICB/icbdyn.F90

Timestamp:

2020-07-08T13:34:28+02:00 (4 years ago)

Author:

mathiot

Message:

ticket #2494 and #2375: ticket #2494 changes and part of ticket #2375 (lbc_icb_lnk on extended variable at T point removed), ff_e initialisation and lbc_lnk move in the icbini.F90; tests on possible useless lbc_lnk in icbclv not yet done

File:

• NEMO/branches/2020/tickets_2494_2375/src/OCE/ICB/icbdyn.F90 (modified) (3 diffs)

NEMO/branches/2020/tickets_2494_2375/src/OCE/ICB/icbdyn.F90

@@ -14 +14 @@
    USE dom_oce        ! NEMO ocean domain
    USE phycst         ! NEMO physical constants
+   USE in_out_manager                      ! IO parameters
    !
    USE icb_oce        ! define iceberg arrays
@@ -155 +156 @@
          pt%xi   = zxi_n
          pt%yj   = zyj_n
-
-         ! update actual position
-         pt%lon  = icb_utl_bilin_x(glamt, pt%xi, pt%yj )
-         pt%lat  = icb_utl_bilin(gphit, pt%xi, pt%yj, 'T' )
 
          berg => berg%next                         ! switch to the next berg
@@ -270 +267 @@
       ! Interpolate gridded fields to berg
       nknberg = berg%number(1)
-      CALL icb_utl_interp( pxi, pe1, zuo, zui, zua, zssh_x,                     &
-         &                 pyj, pe2, zvo, zvi, zva, zssh_y, zsst, zcn, zhi, zff )
+      CALL icb_utl_interp( pxi, pyj, pe1=pe1, pe2=pe2,   &   ! scale factor
+         &                 puo=zuo, pui=zui, pua=zua,    &   ! oce/ice/atm velocities
+         &                 pvo=zvo, pvi=zvi, pva=zva,    &   ! oce/ice/atm velocities
+         &                 pssh_i=zssh_x, pssh_j=zssh_y, &   ! ssh gradient
+         &                 phi=zhi, pff=zff )               ! ice thickness and coriolis
+
+      IF (lwp) THEN
+         WRITE(numout,*) 'icbdyn ', pxi, pyj 
+         WRITE(numout,*) pe1, zuo, zui, zua, zssh_x
+         WRITE(numout,*) pe2, zvo, zvi, zva, zssh_y
+         WRITE(numout,*) zhi, zff 
+         WRITE(numout,*) ''
+      END IF
+
 
       zM = berg%current_point%mass