Changeset 13899 for NEMO/branches/2020/tickets_icb_1900/src/TOP/PISCES/P4Z/p4zflx.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/PISCES/P4Z/p4zflx.F90 (modified) (5 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/PISCES/P4Z/p4zflx.F90

@@ -19 +19 @@
    USE sms_pisces     !  PISCES Source Minus Sink variables
    USE p4zche         !  Chemical model
-   USE prtctl_trc     !  print control for debugging
+   USE prtctl         !  print control for debugging
    USE iom            !  I/O manager
    USE fldread        !  read input fields
@@ -110 +110 @@
       IF( l_co2cpl )   satmco2(:,:) = atm_co2(:,:)
 
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          ! DUMMY VARIABLES FOR DIC, H+, AND BORATE
          zfact = rhop(ji,jj,1) / 1000. + rtrn
@@ -126 +126 @@
       ! -------------------------------------------
 
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          ztc  = MIN( 35., ts(ji,jj,1,jp_tem,Kmm) )
          ztc2 = ztc * ztc
@@ -145 +145 @@
 
 
-      DO_2D_11_11
+      DO_2D( 1, 1, 1, 1 )
          ztkel = tempis(ji,jj,1) + 273.15
          zsal  = salinprac(ji,jj,1) + ( 1.- tmask(ji,jj,1) ) * 35.
@@ -178 +178 @@
       IF(sn_cfctl%l_prttrc)   THEN  ! print mean trends (used for debugging)
          WRITE(charout, FMT="('flx ')")
-         CALL prt_ctl_trc_info(charout)
-         CALL prt_ctl_trc(tab4d=tr(:,:,:,:,Krhs), mask=tmask, clinfo=ctrcnm)
+         CALL prt_ctl_info( charout, cdcomp = 'top' )
+         CALL prt_ctl(tab4d_1=tr(:,:,:,:,Krhs), mask1=tmask, clinfo=ctrcnm)
       ENDIF
 

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