From c48c7b1196bc939fc5aa95bc47f3a3433d04a227 Mon Sep 17 00:00:00 2001 From: Javier Vegas-Regidor Date: Wed, 22 Apr 2020 16:50:19 +0200 Subject: [PATCH] Fix cmorized check at startup --- earthdiagnostics/data_convention.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/earthdiagnostics/data_convention.py b/earthdiagnostics/data_convention.py index e618aa19..d21a2956 100644 --- a/earthdiagnostics/data_convention.py +++ b/earthdiagnostics/data_convention.py @@ -422,10 +422,11 @@ class DataConvention(object): var_path = self.get_file_path( startdate, member, domain, var, cmor_var, chunk, frequency=freq ) - if os.path.isfile(var_path): - current_count += 1 - if current_count >= self.config.cmor.min_cmorized_vars: - break + for path in (var_path, var_path.replace('/original_files/', '/')): + if os.path.isfile(path): + current_count += 1 + if current_count >= self.config.cmor.min_cmorized_vars: + break return current_count def is_cmorized(self, startdate, member, chunk, domain): @@ -985,7 +986,9 @@ class Cmor3Convention(DataConvention): """ startdate_path = self.get_startdate_path(startdate) if not os.path.isdir(startdate_path): - return False + startdate_path = startdate_path.replace('/original_files/', '/') + if not os.path.isdir(startdate_path): + return False count = 0 member_path = os.path.join(startdate_path, self.get_member_str(member)) if not os.path.isdir(member_path): -- GitLab