Changeset 13265 for NEMO/branches/2020/tickets_2494_2375/src/OCE/ICB/icbini.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/icbini.F90 (modified) (3 diffs)

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

@@ -82 +82 @@
       ff_e(:,:) = 0._wp   ;   tt_e(:,:) = 0._wp   ;
       fr_e(:,:) = 0._wp   ;
+      ! prepration to Nacho work
+      ! e3t_e
+      ! tt3d_e
+      ! uo3d_e
+      ! vo3d_e
+      !
 #if defined key_si3
       hi_e(:,:) = 0._wp   ;
@@ -242 +248 @@
       CALL lbc_lnk_icb( 'icbini', umask_e, 'T', +1._wp, 1, 1 )
       CALL lbc_lnk_icb( 'icbini', vmask_e, 'T', +1._wp, 1, 1 )
-      !
+
+      ! definition of extended lat/lon array needed by icb_bilin_h
+      rlon_e(:,:) = 0._wp     ;  rlon_e(1:jpi,1:jpj) = glamt(:,:) 
+      rlat_e(:,:) = 0._wp     ;  rlat_e(1:jpi,1:jpj) = gphit(:,:)
+      CALL lbc_lnk_icb( 'icbini', rlon_e, 'T', +1._wp, 1, 1 )
+      CALL lbc_lnk_icb( 'icbini', rlat_e, 'T', +1._wp, 1, 1 )
+      !
+      ! definnitionn of extennded ff_f array needed by icb_utl_interp
+      ff_e(:,:) = 0._wp       ;  ff_e(1:jpi,1:jpj) = ff_f(:,:)
+      CALL lbc_lnk_icb( 'icbini', ff_e, 'F', +1._wp, 1, 1 )
+
       ! assign each new iceberg with a unique number constructed from the processor number
       ! and incremented by the total number of processors
@@ -338 +354 @@
                localpt%xi = REAL( mig(ji), wp )
                localpt%yj = REAL( mjg(jj), wp )
-               localpt%lon = icb_utl_bilin(glamt, localpt%xi, localpt%yj, 'T' )
-               localpt%lat = icb_utl_bilin(gphit, localpt%xi, localpt%yj, 'T' )
+               CALL icb_utl_interp( localpt%xi, localpt%yj, plat=localpt%lat, plon=localpt%lon )   
                localpt%mass      = rn_initial_mass     (iberg)
                localpt%thickness = rn_initial_thickness(iberg)