Changeset 1027

Timestamp:

05/06/17 20:03:36 (4 years ago)

Author:

mjuckes

Message:

cand

Location:

CMIP6dreqbuild/trunk/src/framework/ingest

Files:

• expts.py (modified) (4 diffs)
• utils_wb.py (modified) (1 diff)

CMIP6dreqbuild/trunk/src/framework/ingest/expts.py

@@ -2 +2 @@
 import os
 import json, re, collections, string
-from dreqPy import dreq
-
+import sys
+##sys.path.append( <path to dirFoo> )
+sys.path.insert(0, '../dreqPy/' )
+##from dreqPy import dreq
+import dreq
 
 import exptMaps as em
@@ -56 +59 @@
     cc = {}
     self.alias = {}
+    self.edesc = {}
     self.dn = []
     self.mip = {}
@@ -63 +67 @@
       if r[0] != '':
        en = r[2]
+       des = r[5]
+       self.edesc[en] = des
        self.experiment = en
        if en.strip() not in [ 'N/A', 'n/a', '', ' ']:
@@ -292 +298 @@
 json.dump( {'info':{'title':'Updating experiment names in data request'}, 'maps':ee}, oo, indent=4, sort_keys=True )
 oo.close()
+oo = open( 'exptDesc.json', 'w' )
+json.dump( {'info':{'title':'Updating experiment descriptions from ESDOC'}, 'maps':xc.es.edesc}, oo, indent=4, sort_keys=True )
+oo.close()
 
 

CMIP6dreqbuild/trunk/src/framework/ingest/utils_wb.py

@@ -22 +22 @@
           ss = ss.replace( u'\u2026', '...' )
           ss = ss.replace( u'\u25e6', 'o' )
+          ss = ss.replace( u'\xfc', 'u' )
+          ss = ss.replace( u'\xad', '-' )
+          ss = ss.replace( u'\xb1', '+-' )
+          ss = ss.replace( u'\xb2', '2' )
+          ss = ss.replace( u'\xb0', 'o' )
           ss = ss.replace( u'\xb2', '2' )
           ss = ss.replace( u'\xb3', '3' )