Changeset 1444 in lmdz_wrf for trunk

Timestamp:

Feb 12, 2017, 7:30:16 PM (8 years ago)

Author:

lfita

Message:

Re-coding `Str_Bool' using lists and adding 'Yes', 'No'
Fixing \dj{}, \DJ{} in `ASCII_to'

File:

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

trunk/tools/generic_tools.py

@@ -242 +242 @@
     fname = 'Str_Bool'
 
-    if val == 'True' or val == 'true' or val == '1' or val == 'yes' or val == 'T' or val == 't': 
+    truelist = ['True', 'true', '1', 'Yes', 'yes', 'T', 't'] 
+    falselist = ['False', 'false', '0', 'No', 'no', 'F', 'f']
+
+    if searchInlist(truelist,val): 
         boolv = True
-        boolv = True
-    elif val == 'False' or val == 'false' or val == '0' or val== 'no' or val == 'F' or val == 'f':
+    elif searchInlist(falselist, val):
         boolv = False
     else:
@@ -9575 +9577 @@
       'Ä·': '\\c{k}', 'ÄŒ': '\\c{l}', 'ņ': '\\c{n}', 'ŗ': '\\c{r}', 'ş': '\\c{s}',     \
       'Å£': '\\c{t}',                                                                 \
-      'ł': '\\l{}', 'Þ': '\\o{}', 'đ': '\\dj', 'ß': '\\ss{}',                        \
+      'ł': '\\l{}', 'Þ': '\\o{}', 'đ': '\\dj{}', 'ß': '\\ss{}',                      \
       'Ê': '\\ae{}', 'œ': '\\oe{}',                                                  \
       'Á': "\\'A", 'É': "\\'E", 'Í': "\\'I", 'Ó': "\\'O", 'Ú': "\\'U",               \
@@ -9601 +9603 @@
 ': '\\c{N}', 'Ŗ': '\\c{R}', 'Ş': '\\c{S}',     \
       'Å¢': '\\c{T}',                                                                 \
-      'Ł': '\\L{}', 'Ø': '\\O{}', 'Đ': '\\DJ',                                       \
+      'Ł': '\\L{}', 'Ø': '\\O{}', 'Đ': '\\DJ{}',                                     \
       'Æ': '\\AE{}', 'Œ': '\\OE{}',                                                  \
       # '¡': '!`, '¿': '¿`'