Changeset 13662 for NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/OCE/LBC/mpp_loc_generic.h90

Timestamp:

2020-10-22T20:49:56+02:00 (4 years ago)

Author:

clem

Message:

update to almost r4.0.4

Location:

NEMO/branches/2019/dev_r11842_SI3-10_EAP

Files:

• . (modified) (1 prop)
• src/OCE/LBC/mpp_loc_generic.h90 (modified) (3 diffs)

NEMO/branches/2019/dev_r11842_SI3-10_EAP

@@ -1 @@
-^/utils/build/arch@HEAD       arch
-^/utils/build/makenemo@HEAD   makenemo
-^/utils/build/mk@HEAD         mk
-^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
-^/vendors/FCM@HEAD            ext/FCM
-^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/utils/build/arch@12130      arch
+^/utils/build/makenemo@12191  makenemo
+^/utils/build/mk@11662        mk
+^/utils/tools_r4.0-HEAD@12672 tools
+^/vendors/AGRIF/dev@10586     ext/AGRIF
+^/vendors/FCM@10134           ext/FCM
+^/vendors/IOIPSL@9655         ext/IOIPSL
+
+# SETTE mapping (inactive)
+#^/utils/CI/sette@12135        sette

@@ -1 @@
-^/utils/build/arch@HEAD       arch
-^/utils/build/makenemo@HEAD   makenemo
-^/utils/build/mk@HEAD         mk
-^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
-^/vendors/FCM@HEAD            ext/FCM
-^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/utils/build/arch@12130      arch
+^/utils/build/makenemo@12191  makenemo
+^/utils/build/mk@11662        mk
+^/utils/tools_r4.0-HEAD@12672 tools
+^/vendors/AGRIF/dev@10586     ext/AGRIF
+^/vendors/FCM@10134           ext/FCM
+^/vendors/IOIPSL@9655         ext/IOIPSL
+
+# SETTE mapping (inactive)
+#^/utils/CI/sette@12135        sette

NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/OCE/LBC/mpp_loc_generic.h90

@@ -32 +32 @@
       REAL(wp)        , INTENT(  out) ::   pmin    ! Global minimum of ptab
       INDEX_TYPE(:)                                ! index of minimum in global frame
-# if defined key_mpp_mpi
       !
       INTEGER  ::   ierror, ii, idim
@@ -77 +76 @@
       !
       IF( ln_timing ) CALL tic_tac(.TRUE., ld_global = .TRUE.)
+#if defined key_mpp_mpi
       CALL MPI_ALLREDUCE( zain, zaout, 1, MPI_2DOUBLE_PRECISION, MPI_OPERATION ,MPI_COMM_OCE, ierror)
+#else
+      zaout(:,:) = zain(:,:)
+#endif
       IF( ln_timing ) CALL tic_tac(.FALSE., ld_global = .TRUE.)
       !
@@ -92 +95 @@
       kindex(1) = index0
       kindex(:) = kindex(:) + 1   ! start indices at 1
-#else
-      kindex = 0 ; pmin = 0.
-      WRITE(*,*) 'ROUTINE_LOC: You should not have seen this print! error?'
-#endif
 
    END SUBROUTINE ROUTINE_LOC

@@ -1 @@
-^/utils/build/arch@HEAD       arch
-^/utils/build/makenemo@HEAD   makenemo
-^/utils/build/mk@HEAD         mk
-^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
-^/vendors/FCM@HEAD            ext/FCM
-^/vendors/IOIPSL@HEAD         ext/IOIPSL
+^/utils/build/arch@12130      arch
+^/utils/build/makenemo@12191  makenemo
+^/utils/build/mk@11662        mk
+^/utils/tools_r4.0-HEAD@12672 tools
+^/vendors/AGRIF/dev@10586     ext/AGRIF
+^/vendors/FCM@10134           ext/FCM
+^/vendors/IOIPSL@9655         ext/IOIPSL
+
+# SETTE mapping (inactive)
+#^/utils/CI/sette@12135        sette