Changeset 14433 for NEMO/trunk/src/TOP

Timestamp:

2021-02-11T09:06:49+01:00 (3 years ago)

Author:

smasson

Message:

trunk: merge dev_r14312_MPI_Interface into the trunk, #2598

Location:

NEMO/trunk/src/TOP

Files:

• PISCES/P2Z/p2zbio.F90 (modified) (1 diff)
• TRP/trcadv.F90 (modified) (2 diffs)
• TRP/trdmxl_trc.F90 (modified) (2 diffs)
• oce_trc.F90 (modified) (1 diff)

NEMO/trunk/src/TOP/PISCES/P2Z/p2zbio.F90

@@ -340 +340 @@
       IF( lk_iomput ) THEN
          CALL lbc_lnk( 'p2zbio', zw2d(:,:,:),'T', 1.0_wp )
-         CALL lbc_lnk_multi( 'p2zbio', zw3d(:,:,:,1),'T', 1.0_wp, zw3d(:,:,:,2),'T', 1.0_wp, zw3d(:,:,:,3),'T', 1.0_wp )
+         CALL lbc_lnk( 'p2zbio', zw3d(:,:,:,1),'T', 1.0_wp, zw3d(:,:,:,2),'T', 1.0_wp, zw3d(:,:,:,3),'T', 1.0_wp )
          ! Save diagnostics
          CALL iom_put( "TNO3PHY", zw2d(:,:,1) )

NEMO/trunk/src/TOP/TRP/trcadv.F90

@@ -131 +131 @@
       CASE ( np_FCT )                                 ! FCT      : 2nd / 4th order
          IF (nn_hls.EQ.2) THEN
-            CALL lbc_lnk_multi( 'trcadv', ptr(:,:,:,:,Kbb), 'T', 1., ptr(:,:,:,:,Kmm), 'T', 1.)
-            CALL lbc_lnk_multi( 'traadv', zuu(:,:,:), 'U', -1., zvv(:,:,:), 'V', -1., zww(:,:,:), 'W', 1.)
+            CALL lbc_lnk( 'trcadv', ptr(:,:,:,:,Kbb), 'T', 1., ptr(:,:,:,:,Kmm), 'T', 1.)
+            CALL lbc_lnk( 'traadv', zuu(:,:,:), 'U', -1., zvv(:,:,:), 'V', -1., zww(:,:,:), 'W', 1.)
 #if defined key_loop_fusion
             CALL tra_adv_fct_lf( kt, nittrc000,'TRC', rDt_trc, zuu, zvv, zww, Kbb, Kmm, ptr, jptra, Krhs, nn_fct_h, nn_fct_v )
@@ -157 +157 @@
       CASE ( np_QCK )                                 ! QUICKEST
          IF (nn_hls.EQ.2) THEN
-            CALL lbc_lnk_multi( 'trcadv', zuu(:,:,:), 'U', -1., zvv(:,:,:), 'V', -1.)
+            CALL lbc_lnk( 'trcadv', zuu(:,:,:), 'U', -1., zvv(:,:,:), 'V', -1.)
             CALL lbc_lnk( 'traadv', ptr(:,:,:,:,Kbb), 'T', 1.)
          END IF

NEMO/trunk/src/TOP/TRP/trdmxl_trc.F90

@@ -419 +419 @@
          !-- Lateral boundary conditions
                IF ( cn_cfg .NE. 'gyre' ) THEN
-                  CALL lbc_lnk_multi( 'trdmxl_trc', ztmltot(:,:,jn) , 'T', 1. , ztmlres(:,:,jn) , 'T', 1., &
-                     &                ztmlatf(:,:,jn) , 'T', 1. , ztmlrad(:,:,jn) , 'T', 1. )
+                  CALL lbc_lnk( 'trdmxl_trc', ztmltot(:,:,jn) , 'T', 1. , ztmlres(:,:,jn) , 'T', 1., &
+                     &                        ztmlatf(:,:,jn) , 'T', 1. , ztmlrad(:,:,jn) , 'T', 1. )
                ENDIF
 
@@ -470 +470 @@
          !-- Lateral boundary conditions 
                IF ( cn_cfg .NE. 'gyre' ) THEN            ! other than GYRE configuration    
-                  CALL lbc_lnk_multi( 'trdmxl_trc', ztmltot2(:,:,jn), 'T', 1., ztmlres2(:,:,jn), 'T', 1. )
+                  CALL lbc_lnk( 'trdmxl_trc', ztmltot2(:,:,jn), 'T', 1., ztmlres2(:,:,jn), 'T', 1. )
                   DO jl = 1, jpltrd_trc
                      CALL lbc_lnk( 'trdmxl_trc', ztmltrd2(:,:,jl,jn), 'T', 1. )       ! will be output in the NetCDF trends file

NEMO/trunk/src/TOP/oce_trc.F90

@@ -19 +19 @@
    USE par_oce , ONLY :   jp_sal   =>   jp_sal     !: indice for salinity
    USE par_oce , ONLY :   nn_hls   =>   nn_hls     !: 
-   USE par_oce , ONLY :   Nis0    =>   Nis0      !: 
-   USE par_oce , ONLY :   Njs0    =>   Njs0      !: 
-   USE par_oce , ONLY :   Nie0    =>   Nie0      !: 
-   USE par_oce , ONLY :   Nje0    =>   Nje0      !: 
-   USE par_oce , ONLY :   Nis1    =>   Nis1      !: 
-   USE par_oce , ONLY :   Njs1    =>   Njs1      !: 
-   USE par_oce , ONLY :   Nie1    =>   Nie1      !: 
-   USE par_oce , ONLY :   Nje1    =>   Nje1      !: 
-   USE par_oce , ONLY :   Nis1nxt2    =>   Nis1nxt2      !: 
-   USE par_oce , ONLY :   Njs1nxt2    =>   Njs1nxt2      !: 
-   USE par_oce , ONLY :   Nie1nxt2    =>   Nie1nxt2      !: 
-   USE par_oce , ONLY :   Nje1nxt2    =>   Nje1nxt2      !: 
-   USE par_oce , ONLY :   Nis2    =>   Nis2      !: 
-   USE par_oce , ONLY :   Njs2    =>   Njs2      !: 
-   USE par_oce , ONLY :   Nie2    =>   Nie2      !: 
-   USE par_oce , ONLY :   Nje2    =>   Nje2      !: 
-   USE par_oce , ONLY :   Ni_0    =>   Ni_0      !: 
-   USE par_oce , ONLY :   Nj_0    =>   Nj_0      !: 
-   USE par_oce , ONLY :   Ni_1    =>   Ni_1      !: 
-   USE par_oce , ONLY :   Nj_1    =>   Nj_1      !: 
-   USE par_oce , ONLY :   Ni_2    =>   Ni_2      !: 
-   USE par_oce , ONLY :   Nj_2    =>   Nj_2      !: 
+   USE par_oce , ONLY :   Nis0     =>   Nis0       !: 
+   USE par_oce , ONLY :   Njs0     =>   Njs0       !: 
+   USE par_oce , ONLY :   Nie0     =>   Nie0       !: 
+   USE par_oce , ONLY :   Nje0     =>   Nje0       !: 
+   USE par_oce , ONLY :   Ni_0     =>   Ni_0       !: 
+   USE par_oce , ONLY :   Nj_0     =>   Nj_0       !: 
 
    USE in_out_manager                           !* IO manager *