Skip to content

Fix bug that made preprocessor with fx files fail in rare cases #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattiarighi merged 2 commits into from
Jun 22, 2020
Merged

Fix bug that made preprocessor with fx files fail in rare cases #670

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f873ac1
Fixed #448
schlunma Jun 8, 2020
a3e4994
Fix bug when reading custom variables
Jun 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions esmvalcore/cmor/table.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ def get_variable(self, table, short_name, derived=False):

if var_info:
mip_info = self.get_table(table)
var_info.copy()
var_info = var_info.copy()
if mip_info:
var_info.frequency = mip_info.frequency
return var_info
Expand Down Expand Up @@ -773,8 +773,8 @@ def _read_coordinate(self, value):

def _read_variable(self, short_name, frequency):
var = super()._read_variable(short_name, frequency)
var.modeling_realm = None
var.frequency = None
var.modeling_realm = None
return var


Expand Down Expand Up @@ -872,7 +872,7 @@ def _read_table_file(self, table_file, table=None):
self.coords[value] = self._read_coordinate(value)
continue
elif key == 'variable_entry':
table[value] = self._read_variable(value, None)
table[value] = self._read_variable(value, '')
continue
if not self._read_line():
return
Expand Down