Commit 104d01ab authored by Woude, Auke van der's avatar Woude, Auke van der
Browse files

Removed superfluous lines in emissionmodel

parent 20efcec2
......@@ -55,21 +55,15 @@ class EmisModel(object):
self.emisdir = dacycle.dasystem['datadir']
self.inputdir = dacycle.dasystem['inputdir']
self.proxyfile = dacycle.dasystem['emis.input.spatial']
self.tempfileo = dacycle.dasystem['emis.input.tempobs']
self.tempfilep = dacycle.dasystem['emis.input.tempprior']
self.btime = int(dacycle.dasystem['run.backtime'])
self.obsfile = dacycle.dasystem['obs.input.id']
self.nrspc = int(dacycle.dasystem['obs.spec.nr'])
self.species = dacycle.dasystem['obs.spec.name'].split(',')
self.nrcat = int(dacycle.dasystem['obs.cat.nr'])
self.nmembers = int(dacycle['da.optimizer.nmembers'])
self.pparam = dacycle.dasystem['emis.pparam']
self.paramfile = dacycle.dasystem['emis.paramfiles']
self.countries = [country.strip() for country in dacycle.dasystem['countries'].split(';')]
areafile = dacycle.dasystem['area.file']
self.area = nc.Dataset(areafile)['Area'][:]
self.stations2country = rc.read('/home/awoude/ffdas/RINGO/Data/station_countries.rc')
self.energy_use_per_country = energy_use_per_country
self.categories = categories
self.paramdict = rc.read(dacycle.dasystem['paramdict'])
......
......@@ -25,7 +25,8 @@ obs.sites.rc : ${datadir}/sites_weights2.rc
nffparameters : 24
nbioparameters : 6
nparameters : ${nffparameters} + ${nbioparameters}
paramdict : /projects/0/ctdas/RINGO/inversions/Data/paramdict.rc
paramdict : ${datadir}/paramdict.rc
! set fixed seed for random number generator, or use 0 if you want to use any random seed
random.seed : 4385
!file with prior estimate of scaling factors (statevector) and covariances
......@@ -44,8 +45,6 @@ obs.background : ${datadir}/background.nc
! input data for emission model
emis.input.spatial : spatial_data.nc
emis.input.tempobs : time_profiles_stations.nc
emis.input.tempprior : time_profiles_stations.nc
! Area of the gridboxes
area.file : ${datadir}/area.nc
......
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