Commit 42a6148d authored by Antoine Berchet's avatar Antoine Berchet
Browse files

Merge branch 'devel' of gitlab.in2p3.fr:satinv/cif into devel

parents 3ef36277 5b2ee188
...@@ -81,7 +81,7 @@ datavect: ...@@ -81,7 +81,7 @@ datavect:
zmax: 100 zmax: 100
fluxes: fluxes:
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: AEMISSIONS.%Y%m%d%H.3.nc file: 'AEMISSIONS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
parameters: parameters:
CH4: CH4:
...@@ -110,7 +110,7 @@ datavect: ...@@ -110,7 +110,7 @@ datavect:
latcond: latcond:
comp_type: latcond comp_type: latcond
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: BOUN_CONCS.%Y%m%d%H.3.nc file: 'BOUN_CONCS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
plugin: plugin:
name: CHIMERE name: CHIMERE
...@@ -118,7 +118,7 @@ datavect: ...@@ -118,7 +118,7 @@ datavect:
version: icbc version: icbc
meteo: meteo:
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: METEO.%Y%m%d%H.3.nc file: 'METEO.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
plugin: plugin:
name: CHIMERE name: CHIMERE
...@@ -126,7 +126,7 @@ datavect: ...@@ -126,7 +126,7 @@ datavect:
topcond: topcond:
comp_type: topcond comp_type: topcond
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: BOUN_CONCS.%Y%m%d%H.3.nc file: 'BOUN_CONCS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
plugin: plugin:
name: CHIMERE name: CHIMERE
......
...@@ -81,7 +81,7 @@ datavect: ...@@ -81,7 +81,7 @@ datavect:
zmax: 100 zmax: 100
fluxes: fluxes:
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: AEMISSIONS.%Y%m%d%H.3.nc file: 'AEMISSIONS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
parameters: parameters:
CH4: CH4:
...@@ -110,7 +110,7 @@ datavect: ...@@ -110,7 +110,7 @@ datavect:
latcond: latcond:
comp_type: latcond comp_type: latcond
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: BOUN_CONCS.%Y%m%d%H.3.nc file: 'BOUN_CONCS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
plugin: plugin:
name: CHIMERE name: CHIMERE
...@@ -118,7 +118,7 @@ datavect: ...@@ -118,7 +118,7 @@ datavect:
version: icbc version: icbc
meteo: meteo:
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: METEO.%Y%m%d%H.3.nc file: 'METEO.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
plugin: plugin:
name: CHIMERE name: CHIMERE
...@@ -126,7 +126,7 @@ datavect: ...@@ -126,7 +126,7 @@ datavect:
topcond: topcond:
comp_type: topcond comp_type: topcond
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: BOUN_CONCS.%Y%m%d%H.3.nc file: 'BOUN_CONCS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
plugin: plugin:
name: CHIMERE name: CHIMERE
......
...@@ -81,7 +81,7 @@ datavect: ...@@ -81,7 +81,7 @@ datavect:
zmax: 100 zmax: 100
fluxes: fluxes:
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: AEMISSIONS.%Y%m%d%H.3.nc file: 'AEMISSIONS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
parameters: parameters:
CH4: CH4:
...@@ -110,7 +110,7 @@ datavect: ...@@ -110,7 +110,7 @@ datavect:
latcond: latcond:
comp_type: latcond comp_type: latcond
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: BOUN_CONCS.%Y%m%d%H.3.nc file: 'BOUN_CONCS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
plugin: plugin:
name: CHIMERE name: CHIMERE
...@@ -118,7 +118,7 @@ datavect: ...@@ -118,7 +118,7 @@ datavect:
version: icbc version: icbc
meteo: meteo:
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: METEO.%Y%m%d%H.3.nc file: 'METEO.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
plugin: plugin:
name: CHIMERE name: CHIMERE
...@@ -126,7 +126,7 @@ datavect: ...@@ -126,7 +126,7 @@ datavect:
topcond: topcond:
comp_type: topcond comp_type: topcond
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: BOUN_CONCS.%Y%m%d%H.3.nc file: 'BOUN_CONCS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
plugin: plugin:
name: CHIMERE name: CHIMERE
......
...@@ -81,7 +81,7 @@ datavect: ...@@ -81,7 +81,7 @@ datavect:
zmax: 100 zmax: 100
fluxes: fluxes:
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: AEMISSIONS.%Y%m%d%H.3.nc file: 'AEMISSIONS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
parameters: parameters:
CH4: CH4:
...@@ -110,7 +110,7 @@ datavect: ...@@ -110,7 +110,7 @@ datavect:
latcond: latcond:
comp_type: latcond comp_type: latcond
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: BOUN_CONCS.%Y%m%d%H.3.nc file: 'BOUN_CONCS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
plugin: plugin:
name: CHIMERE name: CHIMERE
...@@ -118,7 +118,7 @@ datavect: ...@@ -118,7 +118,7 @@ datavect:
version: icbc version: icbc
meteo: meteo:
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: METEO.%Y%m%d%H.3.nc file: 'METEO.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
plugin: plugin:
name: CHIMERE name: CHIMERE
...@@ -126,7 +126,7 @@ datavect: ...@@ -126,7 +126,7 @@ datavect:
topcond: topcond:
comp_type: topcond comp_type: topcond
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: BOUN_CONCS.%Y%m%d%H.3.nc file: 'BOUN_CONCS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
plugin: plugin:
name: CHIMERE name: CHIMERE
......
...@@ -70,7 +70,7 @@ datavect: ...@@ -70,7 +70,7 @@ datavect:
biofluxes: biofluxes:
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
emis_type: bio emis_type: bio
file: BEMISSIONS.%Y%m%d%H.3.nc file: 'BEMISSIONS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
parameters: parameters:
C5H8: C5H8:
...@@ -86,7 +86,7 @@ datavect: ...@@ -86,7 +86,7 @@ datavect:
pmax: 200 pmax: 200
repgrid: /tmp/PYCIF_DATA_TEST/CHIMERE/domains repgrid: /tmp/PYCIF_DATA_TEST/CHIMERE/domains
emis_type: bio emis_type: bio
file: BEMISSIONS.201502%d%H.24.nc file: 'BEMISSIONS.201502%d%H.24.nc'
file_freq: 24H file_freq: 24H
plugin: plugin:
name: CHIMERE name: CHIMERE
...@@ -116,7 +116,7 @@ datavect: ...@@ -116,7 +116,7 @@ datavect:
zmax: 100 zmax: 100
fluxes: fluxes:
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: AEMISSIONS.%Y%m%d%H.3.nc file: 'AEMISSIONS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
parameters: parameters:
CH4: CH4:
...@@ -147,16 +147,16 @@ datavect: ...@@ -147,16 +147,16 @@ datavect:
vresol: vpixels vresol: vpixels
CO: CO:
bands_lat: bands_lat:
- 46 - 45
- 47 - 47
- 50 - 50
- 53 - 54
bands_lon: bands_lon:
- -1 - -2
- 0 - 0
- 3 - 3
- 6 - 6
- 7.5 - 8
err: 1 err: 1
file_freq: 3H file_freq: 3H
hcorrelations: hcorrelations:
...@@ -213,7 +213,7 @@ datavect: ...@@ -213,7 +213,7 @@ datavect:
NO2: NO2:
dir: /tmp/PYCIF_DATA_TEST/RAW/EMISSIONS/EDGARV5/TOTAL dir: /tmp/PYCIF_DATA_TEST/RAW/EMISSIONS/EDGARV5/TOTAL
err: 1 err: 1
file: v50_N2O_%Y.0.1x0.1.nc file: 'v50_N2O_%Y.0.1x0.1.nc'
hresol: hpixels hresol: hpixels
plugin: plugin:
name: EDGAR name: EDGAR
...@@ -265,12 +265,12 @@ datavect: ...@@ -265,12 +265,12 @@ datavect:
latcond: latcond:
comp_type: latcond comp_type: latcond
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: BOUN_CONCS.%Y%m%d%H.3.nc file: 'BOUN_CONCS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
parameters: parameters:
CH4: CH4:
dir: /tmp/PYCIF_DATA_TEST//RAW//ECMWF/europe160/%Y/%m/ dir: '/tmp/PYCIF_DATA_TEST//RAW//ECMWF/europe160/%Y/%m/'
file: macc.160europe.%Y%m%d0000%H.grb2 file: 'macc.160europe.%Y%m%d0000%H.grb2'
is_lbc: true is_lbc: true
nlev: 40 nlev: 40
plugin: plugin:
...@@ -291,7 +291,7 @@ datavect: ...@@ -291,7 +291,7 @@ datavect:
- 45 - 45
- 47 - 47
- 52 - 52
- 53 - 54
bands_lon: bands_lon:
- -1.5 - -1.5
- 0 - 0
...@@ -341,7 +341,7 @@ datavect: ...@@ -341,7 +341,7 @@ datavect:
version: icbc version: icbc
meteo: meteo:
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: METEO.%Y%m%d%H.3.nc file: 'METEO.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
plugin: plugin:
name: CHIMERE name: CHIMERE
...@@ -354,7 +354,7 @@ datavect: ...@@ -354,7 +354,7 @@ datavect:
cropstrato: true cropstrato: true
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
extend_surf: false extend_surf: false
file: monitor_OMIQA4ECV_NO2_ACADOK.%Y%m%d.9H.nc file: 'monitor_OMIQA4ECV_NO2_ACADOK.%Y%m%d.9H.nc'
fill_strato: true fill_strato: true
formula: 2 formula: 2
molmass: 10 molmass: 10
...@@ -363,8 +363,8 @@ datavect: ...@@ -363,8 +363,8 @@ datavect:
stratosphere: stratosphere:
parameters: parameters:
NO2: NO2:
dir: /tmp/PYCIF_DATA_TEST//RAW//ECMWF/europe160/%Y/%m/ dir: '/tmp/PYCIF_DATA_TEST//RAW//ECMWF/europe160/%Y/%m/'
file: macc.160europe.%Y%m%d0000%H.grb2 file: 'macc.160europe.%Y%m%d0000%H.grb2'
plugin: plugin:
name: ECMWF name: ECMWF
type: fields type: fields
...@@ -377,7 +377,7 @@ datavect: ...@@ -377,7 +377,7 @@ datavect:
topcond: topcond:
comp_type: topcond comp_type: topcond
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: BOUN_CONCS.%Y%m%d%H.3.nc file: 'BOUN_CONCS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
plugin: plugin:
name: CHIMERE name: CHIMERE
......
...@@ -70,7 +70,7 @@ datavect: ...@@ -70,7 +70,7 @@ datavect:
biofluxes: biofluxes:
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
emis_type: bio emis_type: bio
file: BEMISSIONS.%Y%m%d%H.3.nc file: 'BEMISSIONS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
parameters: parameters:
C5H8: C5H8:
...@@ -86,7 +86,7 @@ datavect: ...@@ -86,7 +86,7 @@ datavect:
pmax: 200 pmax: 200
repgrid: /tmp/PYCIF_DATA_TEST/CHIMERE/domains repgrid: /tmp/PYCIF_DATA_TEST/CHIMERE/domains
emis_type: bio emis_type: bio
file: BEMISSIONS.201502%d%H.24.nc file: 'BEMISSIONS.201502%d%H.24.nc'
file_freq: 24H file_freq: 24H
plugin: plugin:
name: CHIMERE name: CHIMERE
...@@ -116,7 +116,7 @@ datavect: ...@@ -116,7 +116,7 @@ datavect:
zmax: 100 zmax: 100
fluxes: fluxes:
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: AEMISSIONS.%Y%m%d%H.3.nc file: 'AEMISSIONS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
parameters: parameters:
CH4: CH4:
...@@ -147,16 +147,16 @@ datavect: ...@@ -147,16 +147,16 @@ datavect:
vresol: vpixels vresol: vpixels
CO: CO:
bands_lat: bands_lat:
- 46 - 45
- 47 - 47
- 50 - 50
- 53 - 54
bands_lon: bands_lon:
- -1 - -2
- 0 - 0
- 3 - 3
- 6 - 6
- 7.5 - 8
err: 1 err: 1
file_freq: 3H file_freq: 3H
hcorrelations: hcorrelations:
...@@ -213,7 +213,7 @@ datavect: ...@@ -213,7 +213,7 @@ datavect:
NO2: NO2:
dir: /tmp/PYCIF_DATA_TEST/RAW/EMISSIONS/EDGARV5/TOTAL dir: /tmp/PYCIF_DATA_TEST/RAW/EMISSIONS/EDGARV5/TOTAL
err: 1 err: 1
file: v50_N2O_%Y.0.1x0.1.nc file: 'v50_N2O_%Y.0.1x0.1.nc'
hresol: hpixels hresol: hpixels
plugin: plugin:
name: EDGAR name: EDGAR
...@@ -265,12 +265,12 @@ datavect: ...@@ -265,12 +265,12 @@ datavect:
latcond: latcond:
comp_type: latcond comp_type: latcond
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: BOUN_CONCS.%Y%m%d%H.3.nc file: 'BOUN_CONCS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
parameters: parameters:
CH4: CH4:
dir: /tmp/PYCIF_DATA_TEST//RAW//ECMWF/europe160/%Y/%m/ dir: '/tmp/PYCIF_DATA_TEST//RAW//ECMWF/europe160/%Y/%m/'
file: macc.160europe.%Y%m%d0000%H.grb2 file: 'macc.160europe.%Y%m%d0000%H.grb2'
is_lbc: true is_lbc: true
nlev: 40 nlev: 40
plugin: plugin:
...@@ -291,7 +291,7 @@ datavect: ...@@ -291,7 +291,7 @@ datavect:
- 45 - 45
- 47 - 47
- 52 - 52
- 53 - 54
bands_lon: bands_lon:
- -1.5 - -1.5
- 0 - 0
...@@ -341,7 +341,7 @@ datavect: ...@@ -341,7 +341,7 @@ datavect:
version: icbc version: icbc
meteo: meteo:
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: METEO.%Y%m%d%H.3.nc file: 'METEO.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
plugin: plugin:
name: CHIMERE name: CHIMERE
...@@ -354,7 +354,7 @@ datavect: ...@@ -354,7 +354,7 @@ datavect:
cropstrato: true cropstrato: true
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
extend_surf: false extend_surf: false
file: monitor_OMIQA4ECV_NO2_ACADOK.%Y%m%d.9H.nc file: 'monitor_OMIQA4ECV_NO2_ACADOK.%Y%m%d.9H.nc'
fill_strato: true fill_strato: true
formula: 2 formula: 2
molmass: 10 molmass: 10
...@@ -363,8 +363,8 @@ datavect: ...@@ -363,8 +363,8 @@ datavect:
stratosphere: stratosphere:
parameters: parameters:
NO2: NO2:
dir: /tmp/PYCIF_DATA_TEST//RAW//ECMWF/europe160/%Y/%m/ dir: '/tmp/PYCIF_DATA_TEST//RAW//ECMWF/europe160/%Y/%m/'
file: macc.160europe.%Y%m%d0000%H.grb2 file: 'macc.160europe.%Y%m%d0000%H.grb2'
plugin: plugin:
name: ECMWF name: ECMWF
type: fields type: fields
...@@ -377,7 +377,7 @@ datavect: ...@@ -377,7 +377,7 @@ datavect:
topcond: topcond:
comp_type: topcond comp_type: topcond
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
file: BOUN_CONCS.%Y%m%d%H.3.nc file: 'BOUN_CONCS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
plugin: plugin:
name: CHIMERE name: CHIMERE
......
...@@ -70,7 +70,7 @@ datavect: ...@@ -70,7 +70,7 @@ datavect:
biofluxes: biofluxes:
dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK dir: /tmp/PYCIF_DATA_TEST/CHIMERE/ACADOK
emis_type: bio emis_type: bio
file: BEMISSIONS.%Y%m%d%H.3.nc file: 'BEMISSIONS.%Y%m%d%H.3.nc'
file_freq: 3H file_freq: 3H
parameters: parameters:
C5H8: C5H8:
...@@ -86,7 +86,7 @@ datavect: ...@@ -86,7 +86,7 @@ datavect:
pmax: 200 pmax: 200