diff --git a/experiment/meteo_france_SCM_study/abstract_study.py b/experiment/meteo_france_SCM_study/abstract_study.py index 4abb0cf4a76d5ad789e58323a41aed04448bf00e..a23316fe65043789eb686b07782d37f8cc532a20 100644 --- a/experiment/meteo_france_SCM_study/abstract_study.py +++ b/experiment/meteo_france_SCM_study/abstract_study.py @@ -202,7 +202,11 @@ class AbstractStudy(object): @property def variable_name(self): - return self.variable_class.NAME + return self.variable_class.NAME + ' (in {})'.format(self.variable_unit) + + @property + def variable_unit(self): + return self.variable_class.UNIT @property def relative_path(self) -> str: diff --git a/experiment/meteo_france_SCM_study/abstract_variable.py b/experiment/meteo_france_SCM_study/abstract_variable.py index 31b50bfc3b928736101492fd91f9d3007421c85b..bcd5b1b7d77c0fef9c73a72d620a758e3bcd1afe 100644 --- a/experiment/meteo_france_SCM_study/abstract_variable.py +++ b/experiment/meteo_france_SCM_study/abstract_variable.py @@ -7,6 +7,7 @@ class AbstractVariable(object): """ NAME = '' + UNIT = '' def __init__(self, dataset, altitude): self.dataset = dataset diff --git a/experiment/meteo_france_SCM_study/crocus/crocus_variables.py b/experiment/meteo_france_SCM_study/crocus/crocus_variables.py index 9cdac46db011c00cc425fa3864060627e913c272..3bc06074e14098bf451cb211210351d86964141c 100644 --- a/experiment/meteo_france_SCM_study/crocus/crocus_variables.py +++ b/experiment/meteo_france_SCM_study/crocus/crocus_variables.py @@ -29,16 +29,16 @@ class CrocusVariable(AbstractVariable): class CrocusSweVariable(CrocusVariable): NAME = 'Snow Water Equivalent' + UNIT = 'kg/m2 or mm' def __init__(self, dataset, altitude): - # Units are kg m-2 super().__init__(dataset, altitude, 'SNOWSWE') class CrocusDepthVariable(CrocusVariable): NAME = 'Snow Depth' + UNIT = 'm' def __init__(self, dataset, altitude): - # Units are m super().__init__(dataset, altitude, "SNOWDEPTH") diff --git a/experiment/meteo_france_SCM_study/safran/safran_variable.py b/experiment/meteo_france_SCM_study/safran/safran_variable.py index 4e3e2e270aec438e72d73ed0ab17778fb56bcdd4..87a7a1d789c92fd3c86d5f3b7b4e7962608e1d77 100644 --- a/experiment/meteo_france_SCM_study/safran/safran_variable.py +++ b/experiment/meteo_france_SCM_study/safran/safran_variable.py @@ -22,6 +22,7 @@ class SafranSnowfallVariable(AbstractVariable): """ NAME = 'Snowfall' + UNIT = 'kg/m2 or mm' def __init__(self, dataset, altitude, nb_consecutive_days_of_snowfall=1, keyword='Snowf'): super().__init__(dataset, altitude)