Changeset 122 for IOIPSL/trunk/src/stringop.f90

Timestamp:

08/03/07 15:42:20 (17 years ago)

Author:

bellier

Message:

JB: some cleaning (-> fortran 90)

File:

• IOIPSL/trunk/src/stringop.f90 (modified) (1 diff)

IOIPSL/trunk/src/stringop.f90

@@ -76 +76 @@
 END FUNCTION findpos
 !===
-SUBROUTINE find_str (nb_str,str_tab,str_len_tab,str,pos)
+SUBROUTINE find_str (str_tab,str,pos)
 !---------------------------------------------------------------------
 !- This subroutine looks for a string in a table
 !---------------------------------------------------------------------
 !- INPUT
-!-   nb_str      : length of table
-!-   str_tab     : Table  of strings
-!-   str_len_tab : Table  of string-length
-!-   str         : Target we are looking for
+!-   str_tab  : Table  of strings
+!-   str      : Target we are looking for
 !- OUTPUT
-!-   pos         : -1 if str not found, else value in the table
-!---------------------------------------------------------------------
-  IMPLICIT NONE
-!-
-  INTEGER :: nb_str
-  CHARACTER(LEN=*),DIMENSION(nb_str) :: str_tab
-  INTEGER,DIMENSION(nb_str) :: str_len_tab
-  CHARACTER(LEN=*) :: str
-  INTEGER :: pos
-!-
-  INTEGER :: i,il
+!-   pos      : -1 if str not found, else value in the table
+!---------------------------------------------------------------------
+  IMPLICIT NONE
+!-
+  CHARACTER(LEN=*),DIMENSION(:),INTENT(in) :: str_tab
+  CHARACTER(LEN=*),INTENT(in) :: str
+  INTEGER,INTENT(out) :: pos
+!-
+  INTEGER :: nb_str,i
 !---------------------------------------------------------------------
   pos = -1
-  il = LEN_TRIM(str)
+  nb_str=SIZE(str_tab)
   IF ( nb_str > 0 ) THEN
     DO i=1,nb_str
-      IF (     (INDEX(str_tab(i),str(1:il)) > 0) &
-          .AND.(str_len_tab(i) == il) ) THEN
+      IF ( TRIM(str_tab(i)) == TRIM(str) ) THEN
         pos = i
         EXIT