No commit message

No commit message

da/baseclasses/optimizer.py

@@ -324,7 +324,11 @@ class Optimizer(object):
             # Screen for outliers greather than 3x model-data mismatch, only apply if obs may be rejected
 
             res                         = self.obs[n]-self.Hx[n]
+<<<<<<< .mine
+            print 'res',res, self.obs[n],self.Hx[n]
+=======
             print 'res',self.obs[n],self.Hx[n]
+>>>>>>> .r1009
             if self.may_reject[n]:
                 threshold =  self.rejection_threshold*np.sqrt(self.R[n,n])
                 if np.abs(res) > threshold:

da/tools/pipeline.py

@@ -226,7 +226,6 @@ def SampleOneCycle(DaCycle,Samples,StateVector, ObservationOperator,lag):
         # Give each member a model sample by first copying all samples, and then selecting the data for Member #n
 
         members = StateVector.EnsembleMembers[lag]
-        #print members
 
 
 
@@ -241,6 +240,7 @@ def SampleOneCycle(DaCycle,Samples,StateVector, ObservationOperator,lag):
                 print 'sampled',n,Member,Sim.simulated
 
         StateVector.nobs       += Samples.getlength()
+        print 'StateVector.nobs',StateVector.nobs
 
         msg = "Added samples from the observation operator to each member of the StateVector" ; logging.debug(msg)