Changeset 13899 for NEMO/branches/2020/tickets_icb_1900/src/OCE/ISF/isfutils.F90

Timestamp:

2020-11-27T17:26:33+01:00 (4 years ago)

Author:

mathiot

Message:

ticket #1900: update branch to trunk and add ICB test case

Location:

NEMO/branches/2020/tickets_icb_1900

Files:

• . (modified) (1 prop)
• src/OCE/ISF/isfutils.F90 (modified) (4 diffs)

NEMO/branches/2020/tickets_icb_1900

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools/@HEAD           tools
+^/utils/tools@HEAD            tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12931        sette
+^/utils/CI/sette@13559        sette

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools/@HEAD           tools
+^/utils/tools@HEAD            tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12931        sette
+^/utils/CI/sette@13559        sette

NEMO/branches/2020/tickets_icb_1900/src/OCE/ISF/isfutils.F90

@@ -12 +12 @@
    !!----------------------------------------------------------------------
 
-   USE iom           , ONLY: iom_open, iom_get, iom_close, jpdom_data        ! read input file
+   USE iom           , ONLY: iom_open, iom_get, iom_close, jpdom_global      ! read input file
    USE lib_fortran   , ONLY: glob_sum, glob_min, glob_max                    ! compute global value
-   USE par_oce       , ONLY: jpi,jpj,jpk, jpnij                              ! domain size
-   USE dom_oce       , ONLY: nldi, nlei, nldj, nlej, narea, tmask_h, tmask_i ! local domain
+   USE par_oce       , ONLY: jpi,jpj,jpk, jpnij, Nis0, Nie0, Njs0, Nje0      ! domain size
+   USE dom_oce       , ONLY: narea, tmask_h, tmask_i                         ! local domain
    USE in_out_manager, ONLY: i8, wp, lwp, numout                             ! miscelenious
    USE lib_mpp
@@ -47 +47 @@
 
       CALL iom_open( TRIM(cdfile), inum )
-      CALL iom_get( inum, jpdom_data, TRIM(cdvar), pvar)
+      CALL iom_get( inum, jpdom_global, TRIM(cdvar), pvar)
       CALL iom_close(inum)
 
@@ -84 +84 @@
       !
       ! local MOD sum
-      DO jj=nldj,nlej
-         DO ji=nldi,nlei
+      DO jj=Njs0,Nje0
+         DO ji=Nis0,Nie0
             idums = ABS(MOD(TRANSFER(pvar(ji,jj), ip),imodd))
             itmps(narea) = MOD(itmps(narea) + idums, imods)
@@ -138 +138 @@
       ! local MOD sum
       DO jk=1,jpk
-         DO jj=nldj,nlej
-            DO ji=nldi,nlei
+         DO jj=Njs0,Nje0
+            DO ji=Nis0,Nie0
                idums = ABS(MOD(TRANSFER(pvar(ji,jj,jk), ip),imodd))
                itmps(narea) = MOD(itmps(narea) + idums, imods)

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools/@HEAD           tools
+^/utils/tools@HEAD            tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@12931        sette
+^/utils/CI/sette@13559        sette