Changeset 13899 for NEMO/branches/2020/tickets_icb_1900/src/TOP/C14/trcwri_c14.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/TOP/C14/trcwri_c14.F90 (modified) (2 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/TOP/C14/trcwri_c14.F90

@@ -60 +60 @@
          zz3d(:,:,:) = 0._wp
          !
-         DO_3D_11_11( 1, jpkm1 )
+         DO_3D( 1, 1, 1, 1, 1, jpkm1 )
             IF( tmask(ji,jj,jk) > 0._wp) THEN
                z3d (ji,jj,jk) = tr(ji,jj,jk,jp_c14,Kmm)
@@ -71 +71 @@
          z2d(:,:) =0._wp
          jk = 1
-         DO_2D_11_11
+         DO_2D( 1, 1, 1, 1 )
             ztemp = zres(ji,jj) / c14sbc(ji,jj)
             IF( ztemp > 0._wp .AND. tmask(ji,jj,jk) > 0._wp ) z2d(ji,jj) = LOG( ztemp )

@@ -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