diff --git a/da/analysis/country_dictionary.dat b/da/analysis/country_dictionary.dat index 3c2e1a6609912379c82e76cbb41eed85ce436655..50c22831ffc1a1efcfecf962dada2cbe82b331e8 100644 Binary files a/da/analysis/country_dictionary.dat and b/da/analysis/country_dictionary.dat differ diff --git a/da/analysis/summarize_obs.py b/da/analysis/summarize_obs.py index eab412eb0b0f1eac2fc8c4531839be46f4a99543..5950412545c1a71d9445e7bb47b37fcbbb8f0f83 100755 --- a/da/analysis/summarize_obs.py +++ b/da/analysis/summarize_obs.py @@ -44,7 +44,7 @@ def nice_alt(cls): return string.strip('%10.1f masl' % round(cls, -1)) -def summarize_obs(dacycle, printfmt='html'): +def summarize_obs(analysisdir, printfmt='html'): """*************************************************************************************** Call example: diff --git a/da/analysis/tools_country.py b/da/analysis/tools_country.py index 1624ec83922f3b1ab6a601549af0a6f51026bfb9..9d523242ba6bf305a2c693b572322c32daf8ce1f 100755 --- a/da/analysis/tools_country.py +++ b/da/analysis/tools_country.py @@ -25,6 +25,9 @@ by oceans, sea, or open water. The aggregation will thus work best on arrays tha import sys import cPickle import os +sys.path.append('../../') +rootdir = os.getcwd().split('da/')[0] +analysisdir = os.path.join(rootdir, 'da/analysis') from numpy import sum, array try: @@ -136,12 +139,12 @@ def get_countrydict(): countrydict = countryinfo('Test') - file = os.path.join('country_dictionary.dat') + file = os.path.join(analysisdir,'country_dictionary.dat') try: countrydict = cPickle.load(open(file, 'rb')) except: - db = dbf.Dbf(os.path.join('GRIDCTRY.DBF')) + db = dbf.Dbf(os.path.join(analysisdir,'GRIDCTRY.DBF')) countrydict = {} for n, rec in enumerate(db):