Changeset 13662 for NEMO/branches/2019/dev_r11842_SI3-10_EAP/src/OCE/DYN/dynhpg.F90

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/DYN/dynhpg.F90 (modified) (1 diff)

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/DYN/dynhpg.F90

@@ -1027 +1027 @@
       DO jj = 1, jpj
         DO ji = 1, jpi
-          jk = mbkt(ji,jj)+1
-          IF(     jk <=  0   ) THEN   ;   zrhh(ji,jj,    :   ) = 0._wp
-          ELSEIF( jk ==  1   ) THEN   ;   zrhh(ji,jj,jk+1:jpk) = rhd(ji,jj,jk)
+          jk = mbkt(ji,jj)
+          IF(     jk <=  1   ) THEN   ;   zrhh(ji,jj,    :   ) = 0._wp
+          ELSEIF( jk ==  2   ) THEN   ;   zrhh(ji,jj,jk+1:jpk) = rhd(ji,jj,jk)
           ELSEIF( jk < jpkm1 ) THEN
              DO jkk = jk+1, jpk
                 zrhh(ji,jj,jkk) = interp1(gde3w_n(ji,jj,jkk  ), gde3w_n(ji,jj,jkk-1),   &
-                   &                      gde3w_n(ji,jj,jkk-2), rhd    (ji,jj,jkk-1), rhd(ji,jj,jkk-2))
+                   &                      gde3w_n(ji,jj,jkk-2), zrhh    (ji,jj,jkk-1), zrhh(ji,jj,jkk-2))
              END DO
           ENDIF

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