Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions pipt/loop/assimilation.py
Original file line number Diff line number Diff line change
Expand Up @@ -536,12 +536,12 @@ def post_process_forecast(self):
self.ensemble.pred_data[i][k] = np.zeros(
(len(self.ensemble.obs_data[i][k]), self.ensemble.ne))
for m in range(pred_data_tmp[i][k].shape[1]):
data_array = self.ensemble.compress(pred_data_tmp[i][k][:, m], vintage,
data_array = self.ensemble.compress_manager(pred_data_tmp[i][k][:, m], vintage,
self.ensemble.sparse_info['use_ensemble'])
self.ensemble.pred_data[i][k][:, m] = data_array
vintage = vintage + 1
if self.ensemble.sparse_info['use_ensemble']:
self.ensemble.compress()
self.ensemble.compress_manager()
self.ensemble.sparse_info['use_ensemble'] = None

# Extra option debug
Expand Down
6 changes: 3 additions & 3 deletions pipt/loop/ensemble.py
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ def _org_obs_data(self):
if self.sparse_info is not None and \
vintage < len(self.sparse_info['mask']) and \
len(data_array) == int(np.sum(self.sparse_info['mask'][vintage])):
data_array = self.compress(data_array, vintage, False)
data_array = self.compress_manager(data_array, vintage, False)
vintage = vintage + 1

# Save array in obs_data. If it is an array with single value (not list), then we convert it to a
Expand Down Expand Up @@ -321,7 +321,7 @@ def _org_obs_data(self):
if self.sparse_info is not None and \
vintage < len(self.sparse_info['mask']) and \
len(data_array) == int(np.sum(self.sparse_info['mask'][vintage])):
data_array = self.compress(data_array, vintage, False)
data_array = self.compress_manager(data_array, vintage, False)
vintage = vintage + 1

# Save array in obs_data. If it is an array with single value (not list), then we convert it to a
Expand Down Expand Up @@ -645,7 +645,7 @@ def save_temp_state_ml(self, ind_save):
self.temp_state[ind_save] = deepcopy(self.state)
np.savez('temp_state_ml', self.temp_state)

def compress(self, data=None, vintage=0, aug_coeff=None):
def compress_manager(self, data=None, vintage=0, aug_coeff=None):
"""
Compress the input data using wavelets.

Expand Down
4 changes: 2 additions & 2 deletions pipt/misc_tools/extract_tools.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ def organize_sparse_representation(info: Union[dict,list]) -> dict:

# Redefine all 'yes' and 'no' values to bool
for key, val in info.items():
if val == 'yes': info[key] == True
if val == 'no': info[key] == False
if val == 'yes': info[key] = True
if val == 'no': info[key] = False

# Intial dict
sparse = {}
Expand Down