Changeset 4132 for branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/TOOLS/OBSTOOLS

Timestamp:

2013-10-25T12:57:37+02:00 (11 years ago)

Author:

andrewryan

Message:

renamed namoff to namooo to further reduce confusion with OFF_SRC, documentation, quick script, example namelist and data module have been updated and tested to reflect this change

Location:

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/TOOLS/OBSTOOLS/OOO/ooo

Files:

• locator.py (modified) (4 diffs)
• ooo.py (modified) (3 diffs)

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

@@ -7 +7 @@
     >>> namobs = observations(date, types=["profbfiles"])
 
-    >>> namoff, namcl4 = forecasts(date, types=["forecast", "persistence"], lead_times=[12, 36, 60])
+    >>> namooo, namcl4 = forecasts(date, types=["forecast", "persistence"], lead_times=[12, 36, 60])
 """
 
@@ -86 +86 @@
     :param lead_times: A list of lead_times to search for
 
-    :returns: tuple of namelist data, (namoff, namcl4)
+    :returns: tuple of namelist data, (namooo, namcl4)
     """
-    namoff = {}
+    namooo = {}
     namcl4 = {}
     if types is None: types = []
@@ -115 +115 @@
         cl4_vars += len(files) * [type]
 
-    # Namoff
-    namoff["ooo_files"] = ooo_files
-    namoff["nn_ooo_idx"] = nn_ooo_idx
+    # Namoo
+    namooo["ooo_files"] = ooo_files
+    namooo["nn_ooo_idx"] = nn_ooo_idx
 
     # Namcl4
@@ -123 +123 @@
     namcl4["cl4_fcst_idx"] = cl4_fcst_idx
 
-    return namoff, namcl4
+    return namooo, namcl4
 
 def field(date, type=None, lead_time=None):

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

@@ -43 +43 @@
     types = args.forecast_types
     lead_times = args.lead_times
-    namoff, namcl4 = locator.forecasts(date=date,
+    namooo, namcl4 = locator.forecasts(date=date,
                                        types=types,
                                        lead_times=lead_times)
@@ -51 +51 @@
     sublists = nml.namelists(text)
 
-    # namoff
-    if "namoff" not in sublists:
+    # namooo
+    if "namooo" not in sublists:
         # Attach boilerplate
-        text += nml.new("namoff")
-    text = nml.update("namoff", text, data=namoff)
+        text += nml.new("namooo")
+    text = nml.update("namooo", text, data=namooo)
 
     # namcl4
@@ -68 +68 @@
     namcl4["cl4_sys"] = "FOAM"
     namcl4["cl4_cfg"] = "orca025"
-    namcl4["cl4_vn"] = "1.0"
+    namcl4["cl4_vn"] = "'1.0'"
     namcl4["cl4_prefix"] = "class4"
     namcl4["cl4_contact"] = "example@example.com"