Changeset 12724 for NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/DIA/diamlr.F90

Timestamp:

2020-04-08T21:37:59+02:00 (4 years ago)

Author:

techene

Message:

branch KERNEL-06 : merge with trunk@12698 #2385 - in duplcated files : changes to comply to the new trunk variables and some loop bug fixes

Location:

NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3

Files:

• . (modified) (1 prop)
• src/OCE/DIA/diamlr.F90 (modified) (2 diffs)

NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3

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

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

NEMO/branches/2020/dev_r12377_KERNEL-06_techene_e3/src/OCE/DIA/diamlr.F90

@@ -87 +87 @@
       INTEGER                                     ::   itide                       ! Number of available tidal components
       REAL(wp)                                    ::   ztide_phase                 ! Tidal-constituent phase at adatrj=0
-      CHARACTER (LEN=4), DIMENSION(jpmax_harmo)   ::   ctide_selected = ' n/a '
+      CHARACTER (LEN=4), DIMENSION(jpmax_harmo)   ::   ctide_selected = 'n/a '
       TYPE(tide_harmonic), DIMENSION(:), POINTER  ::   stideconst
 
@@ -148 +148 @@
             ! Retrieve information (frequency, phase, nodal correction) about all
             ! available tidal constituents for placeholder substitution below
-            ctide_selected(1:34) = (/ 'Mf  ', 'Mm  ', 'Ssa ', 'Mtm ', 'Msf ',    &
-   &                      'Msqm', 'Sa  ', 'K1  ', 'O1  ', 'P1  ',     &
-   &                      'Q1  ', 'J1  ', 'S1  ', 'M2  ', 'S2  ', 'N2  ', &
-   &                      'K2  ', 'nu2 ', 'mu2 ', '2N2 ', 'L2  ',    &
-   &                      'T2  ', 'eps2', 'lam2', 'R2  ', 'M3  ',   &
-   &                      'MKS2', 'MN4 ', 'MS4 ', 'M4  ', 'N4  ',   &
-   &                      'S4  ', 'M6  ', 'M8  ' /)
+            ! Warning: we must use the same character length in an array constructor (at least for gcc compiler)
+            ctide_selected(1:34) = (/ 'Mf  ', 'Mm  ', 'Ssa ', 'Mtm ', 'Msf ',         &
+               &                      'Msqm', 'Sa  ', 'K1  ', 'O1  ', 'P1  ',         &
+               &                      'Q1  ', 'J1  ', 'S1  ', 'M2  ', 'S2  ', 'N2  ', &
+               &                      'K2  ', 'nu2 ', 'mu2 ', '2N2 ', 'L2  ',         &
+               &                      'T2  ', 'eps2', 'lam2', 'R2  ', 'M3  ',         &
+               &                      'MKS2', 'MN4 ', 'MS4 ', 'M4  ', 'N4  ',         &
+               &                      'S4  ', 'M6  ', 'M8  ' /)
             CALL tide_init_harmonics(ctide_selected, stideconst)
             itide = size(stideconst)

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