Changeset 2758 in lmdz_wrf for trunk/tools

Timestamp:

Nov 13, 2019, 4:34:16 PM (5 years ago)

Author:

lfita

Message:

Fixing `begend_spoaces'

File:

• trunk/tools/generic_tools.py (modified) (2 diffs)

trunk/tools/generic_tools.py

@@ -618 +618 @@
 
     Tspace = True
+    Nchars = len(newstring)
     newstring2 = ''
-    for ic in range(Nchars-2,-1,-1):
+    for ic in range(Nchars-1,-1,-1):
         if Tspace:
             if newstring[ic:ic+1] == ' ':
@@ -17393 +17394 @@
 
             stvalues = list_listKs(values, stKs)
+            if type(stvalues[icrit]) != type(stv):
+                print errormsg
+                print '  ' + fname + ": types of values for '" + stcrit + "' in " +  \
+                  "list ", type(stvalues[icrit]), 'and provided one', type(stv),     \
+                  'do not coincide !!'
+                quit(-1)
+
             if not searchInlist(availvals, stvalues[icrit]):
                 availvals.append(stvalues[icrit])
             print "'" + stvalues[icrit] + "'", "'"+ stv+ "'", type(stvalues[icrit]), type(stv), stvalues[icrit] == stv
-            if stvalues[icrit] == stv:
-                stations[Nst] = stvalues
-                Nst = Nst + 1
+            print begend_spaces(stvalues[icrit]), begend_spaces(stv), begend_spaces(stvalues[icrit]) == begend_spaces(stv)
+            if type(stvalues[icrit]) == type('S') or type(stvalues[icrit]) ==        \
+              type(unicode('S')):
+                if begend_spaces(stvalues[icrit]) == begend_spaces(stv):
+                    stations[Nst] = stvalues
+                    Nst = Nst + 1
+            else:
+                if stvalues[icrit] == stv:
+                    stations[Nst] = stvalues
+                    Nst = Nst + 1
 
     if Nst == 0: