Changeset 4128

Timestamp:

2013-10-24T22:45:19+02:00 (11 years ago)

Author:

andrewryan

Message:

some minor changes to namelist parser and c4comb.F90

Location:

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/TOOLS/OBSTOOLS

Files:

• OOO/ooo/nml.py (modified) (5 diffs)
• OOO/ooo/test_nml.py (modified) (3 diffs)
• src/c4comb.F90 (modified) (1 diff)

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/TOOLS/OBSTOOLS/OOO/ooo/nml.py

@@ -154 +154 @@
 __version__ = "0.1.0"
 import re
+from numbers import Number
 
 def reader(path):
@@ -341 +342 @@
     """
     if isinstance(data, list):
-        if same_type(data):
+        if all_numeric(data):
             delim = " "
         else:
@@ -350 +351 @@
     return text
 
+def all_numeric(inputs):
+    # Checks all list entries are numbers
+    flag = True
+    for input in inputs:
+        if not isinstance(input, Number):
+            flag = False
+            break
+    return flag
+
 def numeric(word):
     # Tests input string is numeric data
@@ -375 +385 @@
         flag = False
     return flag
+
+def quote(word):
+    if not quoted(word):
+        word = "'%s'" % (word,)
+    return word
 
 def convert(word):
@@ -383 +398 @@
             result = "%s" % (word,)
         else:
-            result = "'%s'" % (word,)
+            result = quote(word)
     elif isinstance(word, bool):
         if word:

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/TOOLS/OBSTOOLS/OOO/ooo/test_nml.py

@@ -173 +173 @@
         self.num = 10
         self.mixed_list = ["foo.nc", -1, True]
+        self.mixed_str_list = map(nml.quote, ["foo.nc", "-1", ".TRUE."])
 
     def test_should_format_mixed_list(self):
@@ -186 +187 @@
     def test_should_format_character_list(self):
         data = nml.tostring(self.char_list)
-        result = "'a.nc' 'b.nc' 'c.nc'"
+        result = "'a.nc', 'b.nc', 'c.nc'"
         self.assertEqual(data, result)
 
@@ -213 +214 @@
             self.assertEqual(case, input)
 
+    def test_should_treat_mixed_numeric_character_data_as_character(self):
+        case = nml.tostring(self.mixed_str_list)
+        result = "'foo.nc', '-1', '.TRUE.'"
+        self.assertEqual(case, result)
+
 class TestUpdateNamelist(unittest.TestCase):
     def setUp(self):

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/TOOLS/OBSTOOLS/src/c4comb.F90

@@ -465 +465 @@
       CALL chkerr( nf90_put_att(ncid, nf90_global,'institution',    trim(ins_str)),cpname, __LINE__)
       CALL chkerr( nf90_put_att(ncid, nf90_global,'validity_time',  trim(val_str)),cpname, __LINE__)
-      CALL chkerr( nf90_put_att(ncid, nf90_global,'best_estimate_description', 'analysis produced 2 days behind real time'),cpname, __LINE__)
+      CALL chkerr( nf90_put_att(ncid, nf90_global,'best_estimate_description', &
+                              &       'analysis produced 2 days behind real time'),cpname, __LINE__)
       CALL chkerr( nf90_put_att(ncid, nf90_global,'time_interp', 'daily average fields'),cpname, __LINE__)
       WRITE(*,*) 'Succesfully put global attributes '