Changeset 13463 for NEMO/branches/2019/dev_r11351_fldread_with_XIOS/src/TOP/PISCES/SED/sedchem.F90

Timestamp:

2020-09-14T17:40:34+02:00 (4 years ago)

Author:

andmirek

Message:

Ticket #2195:update to trunk 13461

Location:

NEMO/branches/2019/dev_r11351_fldread_with_XIOS

Files:

• . (modified) (1 prop)
• src/TOP/PISCES/SED/sedchem.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_r11351_fldread_with_XIOS

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
+
+# SETTE
+^/utils/CI/sette@13382        sette

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
+
+# SETTE
+^/utils/CI/sette@13382        sette

NEMO/branches/2019/dev_r11351_fldread_with_XIOS/src/TOP/PISCES/SED/sedchem.F90

@@ -23 +23 @@
    REAL(wp), PARAMETER :: pp_rdel_ah_target = 1.E-4_wp
 
+   !! * Substitutions
+#  include "do_loop_substitute.h90"
    !! * Module variables
    REAL(wp) :: &
@@ -136 +138 @@
          CALL sed_chem_cst
       ELSE
-         DO jj = 1,jpj
-            DO ji = 1, jpi
-               ikt = mbkt(ji,jj) 
-               IF ( tmask(ji,jj,ikt) == 1 ) THEN
-                  zchem_data(ji,jj,1) = ak13  (ji,jj,ikt)
-                  zchem_data(ji,jj,2) = ak23  (ji,jj,ikt)
-                  zchem_data(ji,jj,3) = akb3  (ji,jj,ikt)
-                  zchem_data(ji,jj,4) = akw3  (ji,jj,ikt)
-                  zchem_data(ji,jj,5) = aksp  (ji,jj,ikt)
-                  zchem_data(ji,jj,6) = borat (ji,jj,ikt)
-                  zchem_data(ji,jj,7) = ak1p3 (ji,jj,ikt)
-                  zchem_data(ji,jj,8) = ak2p3 (ji,jj,ikt)
-                  zchem_data(ji,jj,9) = ak3p3 (ji,jj,ikt)
-                  zchem_data(ji,jj,10)= aksi3 (ji,jj,ikt)
-                  zchem_data(ji,jj,11)= sio3eq(ji,jj,ikt)
-                  zchem_data(ji,jj,12)= aks3  (ji,jj,ikt)
-                  zchem_data(ji,jj,13)= akf3  (ji,jj,ikt)
-                  zchem_data(ji,jj,14)= sulfat(ji,jj,ikt)
-                  zchem_data(ji,jj,15)= fluorid(ji,jj,ikt)
-               ENDIF
-            ENDDO
-         ENDDO
+         DO_2D( 1, 1, 1, 1 )
+            ikt = mbkt(ji,jj) 
+            IF ( tmask(ji,jj,ikt) == 1 ) THEN
+               zchem_data(ji,jj,1) = ak13  (ji,jj,ikt)
+               zchem_data(ji,jj,2) = ak23  (ji,jj,ikt)
+               zchem_data(ji,jj,3) = akb3  (ji,jj,ikt)
+               zchem_data(ji,jj,4) = akw3  (ji,jj,ikt)
+               zchem_data(ji,jj,5) = aksp  (ji,jj,ikt)
+               zchem_data(ji,jj,6) = borat (ji,jj,ikt)
+               zchem_data(ji,jj,7) = ak1p3 (ji,jj,ikt)
+               zchem_data(ji,jj,8) = ak2p3 (ji,jj,ikt)
+               zchem_data(ji,jj,9) = ak3p3 (ji,jj,ikt)
+               zchem_data(ji,jj,10)= aksi3 (ji,jj,ikt)
+               zchem_data(ji,jj,11)= sio3eq(ji,jj,ikt)
+               zchem_data(ji,jj,12)= aks3  (ji,jj,ikt)
+               zchem_data(ji,jj,13)= akf3  (ji,jj,ikt)
+               zchem_data(ji,jj,14)= sulfat(ji,jj,ikt)
+               zchem_data(ji,jj,15)= fluorid(ji,jj,ikt)
+            ENDIF
+         END_2D
 
          CALL pack_arr ( jpoce, ak1s  (1:jpoce), zchem_data(1:jpi,1:jpj,1) , iarroce(1:jpoce) )
@@ -577 +577 @@
          saltprac(:) = salt(:) * 35.0 / 35.16504
       ELSE
-         saltprac(:) = temp(:)
+         saltprac(:) = salt(:)
       ENDIF
 

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL
+
+# SETTE
+^/utils/CI/sette@13382        sette