Commit 3d6ee65f authored by Javier Vegas-Regidor's avatar Javier Vegas-Regidor
Browse files

Fixed to work with conda envs

parent 7fc69265
......@@ -277,9 +277,9 @@ class Cmorizer(object):
Log.info('Unpacking... ')
# remap on regular Gauss grid
if grid == 'SH':
Utils.cdo.splitparam(input=['-sp2gpl {0}'.format(full_file), gribfile + '_'], options='-f nc4')
Utils.cdo.splitparam(input='-sp2gpl {0}'.format(full_file), output=gribfile + '_', options='-f nc4')
else:
Utils.cdo.splitparam(input=[full_file, gribfile + '_'], options='-R -f nc4')
Utils.cdo.splitparam(input=full_file, output=gribfile + '_', options='-R -f nc4')
# total precipitation (remove negative values)
Utils.cdo.setcode(228,
input='-setmisstoc,0 -setvrange,0,Inf -add {0}_{{142,143}}.128.nc'.format(gribfile),
......
......@@ -20,6 +20,7 @@ from earthdiagnostics.utils import TempFile, Utils
from earthdiagnostics.variable import VariableManager
from work_manager import WorkManager
from distutils.spawn import find_executable
class EarthDiags(object):
......@@ -101,6 +102,8 @@ class EarthDiags(object):
Utils.cdo.debug = True
Utils.nco.debug = False # This is due to a bug in nco. Must change when it's solved
Utils.cdo.CDO = find_executable('cdo')
if args.logfilepath:
Log.set_file(bscearth.utils.path.expand_path(args.logfilepath))
......
......@@ -25,7 +25,7 @@ setup(
url='http://www.bsc.es/projects/earthsciences/autosubmit/',
keywords=['climate', 'weather', 'diagnostic'],
setup_requires=['pyproj'],
install_requires=['numpy', 'netCDF4', 'bscearth.utils', 'cdo', 'nco>=0.0.3', 'iris>=1.12.0', 'coverage',
install_requires=['numpy', 'netCDF4', 'bscearth.utils', 'cdo>=1.3.4', 'nco>=0.0.3', 'iris>=1.12.0', 'coverage',
'pygrib', 'openpyxl', 'mock', 'futures', 'cf_units', 'cfunits', 'xxhash'],
packages=find_packages(),
include_package_data=True,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment