Commit d55e8cae authored by Peters, Wouter's avatar Peters, Wouter
Browse files

name of Data in obs object changed from MrData to Data

parent 38750053
......@@ -86,12 +86,12 @@ class Optimizer(object):
self.X_prime = self.X_prime - self.x[:,np.newaxis] # make into a deviation matrix
self.obs[:] = StateVector.EnsembleMembers[-1][0].ModelSample.MrData.getvalues('obs')
self.Hx[:] = StateVector.EnsembleMembers[-1][0].ModelSample.MrData.getvalues('simulated')
self.obs[:] = StateVector.EnsembleMembers[-1][0].ModelSample.Data.getvalues('obs')
self.Hx[:] = StateVector.EnsembleMembers[-1][0].ModelSample.Data.getvalues('simulated')
for m,mem in enumerate(StateVector.EnsembleMembers[-1]):
self.HX_prime[:,m] = mem.ModelSample.MrData.getvalues('simulated')
self.HX_prime[:,m] = mem.ModelSample.Data.getvalues('simulated')
self.HX_prime = self.HX_prime - self.Hx[:,np.newaxis] # make a deviation matrix
......@@ -244,7 +244,7 @@ if __name__ == "__main__":
dummy = samples.AddSimulations('/Users/peters/tmp/test_da/output/20050305/samples.000.nc')
nobs = len(samples.MrData)
nobs = len(samples.Data)
dims = ( int(DaCycle.da_settings['time.nlag']),
int(DaCycle.da_settings['forecast.nmembers']),
int(DaCycle.DaSystem.da_settings['nparameters']),
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment