Changeset 11864 for NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides

Timestamp:

2019-11-05T23:40:39+01:00 (4 years ago)

Author:

smueller

Message:

Inclusion of string normalisation in subroutine tide_init_components of module tide_mod to permit the selection of tidal constituents irrespective of the capitalisation of their identifiers specified in the namelist (ticket #2194)

File:

• NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides/src/OCE/TDE/tide_mod.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides/src/OCE/TDE/tide_mod.F90

@@ -175 +175 @@
       !! information about the selected tidal components
       !! ----------------------------------------------------------------------
-      CHARACTER(LEN=4),              DIMENSION(jpmax_harmo), INTENT(in)  ::   pcnames         ! Names of selected components
-      TYPE(tide),       POINTER,     DIMENSION(:),           INTENT(out) ::   ptide_comp      ! Selected components
-      INTEGER,          ALLOCATABLE, DIMENSION(:)                        ::   kcomppos        ! Indices of selected components
-      INTEGER                                                            ::   kcomp, jk, ji   ! Miscellaneous integers
-      TYPE(tide),       POINTER,     DIMENSION(:)                        ::   tide_components ! All available components
+      CHARACTER(LEN=4),              DIMENSION(jpmax_harmo), INTENT(in)  ::   pcnames             ! Names of selected components
+      TYPE(tide),       POINTER,     DIMENSION(:),           INTENT(out) ::   ptide_comp          ! Selected components
+      INTEGER,          ALLOCATABLE, DIMENSION(:)                        ::   icomppos            ! Indices of selected components
+      INTEGER                                                            ::   icomp, jk, jj, ji   ! Miscellaneous integers
+      LOGICAL                                                            ::   llmatch             ! Local variables used for
+      INTEGER                                                            ::   ic1, ic2            !    string comparison
+      TYPE(tide),       POINTER,     DIMENSION(:)                        ::   tide_components     ! All available components
       
       ! Populate local array with information about all available tidal
@@ -188 +190 @@
       ! include file that contains the initialisation of elements of array
       ! 'tide_components'
-      ALLOCATE(tide_components(jpmax_harmo), kcomppos(jpmax_harmo))
+      ALLOCATE(tide_components(jpmax_harmo), icomppos(jpmax_harmo))
       ! Initialise array of indices of the selected componenents
-      kcomppos(:) = 0
+      icomppos(:) = 0
       ! Include tidal component parameters for all available components
       IF (nn_tide_var < 1) THEN
@@ -200 +202 @@
       END IF
       ! Identify the selected components that are availble
-      kcomp = 0
+      icomp = 0
       DO jk = 1, jpmax_harmo
          IF (TRIM(pcnames(jk)) /= '') THEN
-            DO ji = 1, jpmax_harmo
-               IF (TRIM(pcnames(jk)) == tide_components(ji)%cname_tide) THEN
-                  kcomp = kcomp + 1
-                  IF (lwp) WRITE(numout, '(10X,"Tidal component #",I2.2,36X,"= ",A4)') kcomp, pcnames(jk)
-                  kcomppos(kcomp) = ji
+            DO jj = 1, jpmax_harmo
+               ! Find matches between selected and available constituents
+               ! (ignore capitalisation unless legacy variant has been selected)
+               IF (nn_tide_var < 1) THEN
+                  llmatch = (TRIM(pcnames(jk)) == TRIM(tide_components(jj)%cname_tide))
+               ELSE
+                  llmatch = .TRUE.
+                  ji = MAX(LEN_TRIM(pcnames(jk)), LEN_TRIM(tide_components(jj)%cname_tide))
+                  DO WHILE (llmatch.AND.(ji > 0))
+                     ic1 = IACHAR(pcnames(jk)(ji:ji))
+                     IF ((ic1 >= 97).AND.(ic1 <= 122)) ic1 = ic1 - 32
+                     ic2 = IACHAR(tide_components(jj)%cname_tide(ji:ji))
+                     IF ((ic2 >= 97).AND.(ic2 <= 122)) ic2 = ic2 - 32
+                     llmatch = (ic1 == ic2)
+                     ji = ji - 1
+                  END DO
+               END IF
+               IF (llmatch) THEN
+                  ! Count and record the match
+                  icomp = icomp + 1
+                  icomppos(icomp) = jj
+                  ! Set the capitalisation of the tidal constituent identifier
+                  ! as specified in the namelist
+                  tide_components(jj)%cname_tide = pcnames(jk)
+                  IF (lwp) WRITE(numout, '(10X,"Tidal component #",I2.2,36X,"= ",A4)') icomp, tide_components(jj)%cname_tide
                   EXIT
                END IF
             END DO
+            IF ((lwp).AND.(jj > jpmax_harmo)) WRITE(numout, '(10X,"Tidal component ",A4," is not available!")') pcnames(jk)
          END IF
       END DO
       
       ! Allocate and populate reduced list of components
-      ALLOCATE(ptide_comp(kcomp))
-      DO jk = 1, kcomp
-         ptide_comp(jk) = tide_components(kcomppos(jk))
+      ALLOCATE(ptide_comp(icomp))
+      DO jk = 1, icomp
+         ptide_comp(jk) = tide_components(icomppos(jk))
       END DO
       
       ! Release local array of available components and list of selected
       ! components
-      DEALLOCATE(tide_components, kcomppos)
+      DEALLOCATE(tide_components, icomppos)
       
    END SUBROUTINE tide_init_components