diff --git a/da/baseclasses/optimizer.py b/da/baseclasses/optimizer.py index 79dd949020d5e9980cd3a3a30da396bfa115255d..2ae8529643e9430969706e1e3d68480c5b2ad2d3 100755 --- a/da/baseclasses/optimizer.py +++ b/da/baseclasses/optimizer.py @@ -340,7 +340,7 @@ class Optimizer(object): savedict['dims'] = dimstate+dimobs savedict['values'] = data.tolist() savedict['comment'] = 'Kalman gain matrix of all obs and state vector elements' - dummy = f.AddData(savedict) + #dummy = f.AddData(savedict) dummy = f.close() msg = 'Diagnostics file closed ' ; logging.debug(msg) @@ -359,7 +359,7 @@ class Optimizer(object): # Screen for flagged observations (for instance site not found, or no sample written from model) if self.flags[n] != 0: - msg = 'Skipping observation %d because of flag value %d'%(n,self.flags[n]) ; logging.debug(msg) + msg = 'Skipping observation (%s,%s) because of flag value %d'%(self.sitecode[n],self.obs_ids[n],self.flags[n]) ; logging.debug(msg) continue @@ -370,7 +370,7 @@ class Optimizer(object): if self.may_reject[n]: threshold = self.rejection_threshold*np.sqrt(self.R[n,n]) if np.abs(res) > threshold: - msg = 'Rejecting observation %d because residual (%f) exceeds threshold (%f)'%(n,res,threshold) ; logging.debug(msg) + msg = 'Rejecting observation (%s,%s) because residual (%f) exceeds threshold (%f)'%(self.sitecode[n],self.obs_ids[n],res,threshold) ; logging.debug(msg) self.flags[n] = 2 continue @@ -381,9 +381,9 @@ class Optimizer(object): if self.may_localize[n]: dummy = self.Localize(n) - msg = 'Localized observation %d'%(n,) ; logging.debug(msg) + msg = 'Localized observation %s'%(self.obs_ids[n],) ; logging.debug(msg) else: - msg = 'Not allowed to Localize observation %d'%(n,) ; logging.debug(msg) + msg = 'Not allowed to Localize observation %s'%(self.obs_ids[n],) ; logging.debug(msg) alpha = np.double(1.0)/(np.double(1.0)+np.sqrt( (self.R[n,n])/self.HPHR[n,n] ) )