Skip to content
Snippets Groups Projects
Commit 9f784d79 authored by Peters, Wouter's avatar Peters, Wouter
Browse files

fixed bug where mean was left out of param values

parent b96af699
No related branches found
No related tags found
No related merge requests found
......@@ -80,7 +80,7 @@ class CtGriddedStateVector(StateVector):
cov = cov_ocn
else:
cov = f.GetVariable('covariance')
cov_sf = 0.75/np.sqrt(cov.diagonal().sum()) # this scaling factor makes the total variance close to the value of a single ecoregion
cov_sf = 10.0/np.sqrt(cov.diagonal().sum()) # this scaling factor makes the total variance close to the value of a single ecoregion
cov = cov*cov_sf
dummy = f.close()
......@@ -121,7 +121,8 @@ class CtGriddedStateVector(StateVector):
dims = 1 # start from 1.0 to account for the last parameter that scales Ice+Non-optimized, we have no covariance matrix for this though
for matrix in covariancematrixlist: dims += matrix.shape[0]
for matrix in covariancematrixlist:
dims += matrix.shape[0]
if dims != self.nparams:
msg = "The total dimension of the covariance matrices passed (%d) does not add up to the prescribed nparams (%d), exiting..."%(dims,self.nparams) ; logging.error(msg)
......@@ -196,7 +197,7 @@ class CtGriddedStateVector(StateVector):
for member in range(1,self.nmembers):
NewMember = self.GetNewMember(member)
NewMember.ParameterValues = dev_matrix[:,member-1]
NewMember.ParameterValues = dev_matrix[:,member-1] + NewMean
dummy = self.EnsembleMembers[lag-1].append(NewMember)
msg = '%d new ensemble members were added to the state vector # %d'%(self.nmembers,lag) ; logging.debug(msg)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment