diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 684f121341e24b837b644b54cb7e14ed4fd0cdbf..ee51183fcbd18e3694e8395423d6e3ddba4acfde 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -24,7 +24,7 @@ test: - git submodule update --init --recursive - conda env update -f environment.yml -n earthdiagnostics3 python=3.7 - source activate earthdiagnostics3 - - rm -r ../diagonals + - rm -r ../diagonals || exit_code=$? - git clone https://earth.bsc.es/gitlab/es/diagonals.git ../diagonals - pip install ../diagonals - pip install .[develop] diff --git a/earthdiagnostics/data_convention.py b/earthdiagnostics/data_convention.py index 0ac704f0afaca48b479290c1707628e2f4090751..eb137782b01ff5a9be15ca5a95173381258a411b 100644 --- a/earthdiagnostics/data_convention.py +++ b/earthdiagnostics/data_convention.py @@ -887,7 +887,7 @@ class Cmor3Convention(DataConvention): versions = os.listdir(os.path.dirname(folder_path)) versions.sort(reverse=True) self.config.cmor.version = versions[0] - fodler_path = folder_path.replace('/latest/', f'/{versions[0]}/') + folder_path = folder_path.replace('/latest/', f'/{versions[0]}/') return folder_path diff --git a/earthdiagnostics/general/timemean.py b/earthdiagnostics/general/timemean.py index a55310acbdf969ebd0ec680ad11bd9fec8cbde20..0dafc6ef8de40fa9736500e888a0794299a1b4b5 100644 --- a/earthdiagnostics/general/timemean.py +++ b/earthdiagnostics/general/timemean.py @@ -6,6 +6,7 @@ import iris.analysis import iris.exceptions import numpy as np +from bscearth.utils.log import Log from earthdiagnostics.diagnostic import ( Diagnostic, @@ -158,6 +159,7 @@ class TimeMean(Diagnostic): def compute(self): """Run the diagnostic""" temp = TempFile.get() + Log.info('Load data') cube = iris.load_cube(self.variable_file.local_file) time_centered = [ coord @@ -169,7 +171,7 @@ class TimeMean(Diagnostic): iris.coord_categorisation.add_day_of_month(cube, "time") iris.coord_categorisation.add_month_number(cube, "time") iris.coord_categorisation.add_year(cube, "time") - + Log.info('Compute mean') cube = self.compute_mean(cube) cube.remove_coord("day_of_month") cube.remove_coord("month_number") @@ -179,7 +181,7 @@ class TimeMean(Diagnostic): cube.remove_coord(region_coord) except iris.exceptions.CoordinateNotFoundError: region_coord = None - + cube.data iris.save(cube, temp) if region_coord: handler = Utils.open_cdf(temp) diff --git a/src/mixdiags b/src/mixdiags deleted file mode 160000 index 199979700e38d3918a82bd2052855d46375e48ab..0000000000000000000000000000000000000000 --- a/src/mixdiags +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 199979700e38d3918a82bd2052855d46375e48ab