Skip to content

Commit d2ea528

Browse files
committed
Accept framework and ACTRIS vocabulary
1 parent 768d254 commit d2ea528

File tree

12 files changed

+172
-142
lines changed

12 files changed

+172
-142
lines changed

configurations/actris.conf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
[ACTRIS]
2-
network = actris/actris
2+
framework = actris/actris
3+
species = nitrogen dioxide mass concentration
34
resolution = hourly
45
start_date = 20180101
56
end_date = 20190101
@@ -9,4 +10,4 @@ report_type = standard
910
report_summary = True
1011
report_stations = False
1112
report_filename = PROVIDENTIA_Report
12-
report_title = Report
13+
report_title = Report

configurations/actris_vre.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[ACTRIS]
2-
network = actris/actris
3-
species = sconco3
2+
framework = actris/actris
3+
species = ozone mass concentration
44
resolution = hourly
55
start_date = 20180101
66
end_date = 20190101

configurations/actris_vre_cams.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[ACTRIS-CAMS]
2-
network = actris/actris
3-
species = sconcno2
2+
framework = actris/actris
3+
species = nitrogen dioxide mass concentration
44
resolution = hourly
55
experiments = cams_forecast_ensemble
66
domain = regional
546 Bytes
Binary file not shown.
553 Bytes
Binary file not shown.
517 Bytes
Binary file not shown.

docs/build/html/ACTRIS-download.html

Lines changed: 44 additions & 46 deletions
Large diffs are not rendered by default.

docs/build/html/_sources/ACTRIS-download.md.txt

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ These are the available species:
118118
* `deposition vanadium mass flux`
119119
* `deposition zinc mass flux`
120120

121-
> Providentia can only read species in GHOST format. The mapping is provided in the [GHOST–ACTIRS species mapping](#ghostactris-species-mapping) section.
121+
Providentia can understand the ACTRIS vocabulary for some species and an error will be thrown for those who can be mapped to multiple GHOST species (e.g. aerosol particle optical depth). The mapping is provided in the [GHOST–ACTRIS species mapping](#ghostactris-species-mapping) section.
122122

123123
### Available resolutions
124124

@@ -143,52 +143,52 @@ observations_data_label = Ozone Mass Concentration
143143

144144
## GHOST–ACTRIS species mapping
145145

146-
Here is the mapping between GHOST variable names and the ACTRIS vocabulary:
146+
Here is the mapping between GHOST variable names and the ACTRIS vocabulary. The species that have an asterisk at the end can only be passed to the configuration file using the BSC conventions (name to the left).
147147

148148
```
149-
absco370: aerosol particle light absorption coefficient
150-
absco467: aerosol particle light absorption coefficient
151-
absco470: aerosol particle light absorption coefficient
152-
absco520: aerosol particle light absorption coefficient
153-
absco522: aerosol particle light absorption coefficient
154-
absco525: aerosol particle light absorption coefficient
155-
absco528: aerosol particle light absorption coefficient
156-
absco530: aerosol particle light absorption coefficient
157-
absco550: aerosol particle light absorption coefficient
158-
absco565: aerosol particle light absorption coefficient
159-
absco590: aerosol particle light absorption coefficient
160-
absco637: aerosol particle light absorption coefficient
161-
absco652: aerosol particle light absorption coefficient
162-
absco660: aerosol particle light absorption coefficient
163-
absco670: aerosol particle light absorption coefficient
164-
absco880: aerosol particle light absorption coefficient
165-
absco950: aerosol particle light absorption coefficient
149+
absco370: aerosol particle light absorption coefficient*
150+
absco467: aerosol particle light absorption coefficient*
151+
absco470: aerosol particle light absorption coefficient*
152+
absco520: aerosol particle light absorption coefficient*
153+
absco522: aerosol particle light absorption coefficient*
154+
absco525: aerosol particle light absorption coefficient*
155+
absco528: aerosol particle light absorption coefficient*
156+
absco530: aerosol particle light absorption coefficient*
157+
absco550: aerosol particle light absorption coefficient*
158+
absco565: aerosol particle light absorption coefficient*
159+
absco590: aerosol particle light absorption coefficient*
160+
absco637: aerosol particle light absorption coefficient*
161+
absco652: aerosol particle light absorption coefficient*
162+
absco660: aerosol particle light absorption coefficient*
163+
absco670: aerosol particle light absorption coefficient*
164+
absco880: aerosol particle light absorption coefficient*
165+
absco950: aerosol particle light absorption coefficient*
166166
acprec: precipitation depth
167-
lbsco450: aerosol particle light hemispheric backscatter coefficient
168-
lbsco520: aerosol particle light hemispheric backscatter coefficient
169-
lbsco525: aerosol particle light hemispheric backscatter coefficient
170-
lbsco530: aerosol particle light hemispheric backscatter coefficient
171-
lbsco532: aerosol particle light hemispheric backscatter coefficient
172-
lbsco550: aerosol particle light hemispheric backscatter coefficient
173-
lbsco635: aerosol particle light hemispheric backscatter coefficient
174-
lbsco700: aerosol particle light hemispheric backscatter coefficient
175-
lbsco850: aerosol particle light hemispheric backscatter coefficient
176-
lsco450: aerosol particle light scattering coefficient
177-
lsco520: aerosol particle light scattering coefficient
178-
lsco525: aerosol particle light scattering coefficient
179-
lsco530: aerosol particle light scattering coefficient
180-
lsco532: aerosol particle light scattering coefficient
181-
lsco550: aerosol particle light scattering coefficient
182-
lsco635: aerosol particle light scattering coefficient
183-
lsco700: aerosol particle light scattering coefficient
184-
lsco850: aerosol particle light scattering coefficient
185-
od1020aero: aerosol particle optical depth
186-
od380aero: aerosol particle optical depth
187-
od440aero: aerosol particle optical depth
188-
od500aero: aerosol particle optical depth
189-
od550aero: aerosol particle optical depth
190-
od675aero: aerosol particle optical depth
191-
od870aero: aerosol particle optical depth
167+
lbsco450: aerosol particle light hemispheric backscatter coefficient*
168+
lbsco520: aerosol particle light hemispheric backscatter coefficient*
169+
lbsco525: aerosol particle light hemispheric backscatter coefficient*
170+
lbsco530: aerosol particle light hemispheric backscatter coefficient*
171+
lbsco532: aerosol particle light hemispheric backscatter coefficient*
172+
lbsco550: aerosol particle light hemispheric backscatter coefficient*
173+
lbsco635: aerosol particle light hemispheric backscatter coefficient*
174+
lbsco700: aerosol particle light hemispheric backscatter coefficient*
175+
lbsco850: aerosol particle light hemispheric backscatter coefficient*
176+
lsco450: aerosol particle light scattering coefficient*
177+
lsco520: aerosol particle light scattering coefficient*
178+
lsco525: aerosol particle light scattering coefficient*
179+
lsco530: aerosol particle light scattering coefficient*
180+
lsco532: aerosol particle light scattering coefficient*
181+
lsco550: aerosol particle light scattering coefficient*
182+
lsco635: aerosol particle light scattering coefficient*
183+
lsco700: aerosol particle light scattering coefficient*
184+
lsco850: aerosol particle light scattering coefficient*
185+
od1020aero: aerosol particle optical depth*
186+
od380aero: aerosol particle optical depth*
187+
od440aero: aerosol particle optical depth*
188+
od500aero: aerosol particle optical depth*
189+
od550aero: aerosol particle optical depth*
190+
od675aero: aerosol particle optical depth*
191+
od870aero: aerosol particle optical depth*
192192
precal: precipitation aluminium mass concentration
193193
precas: precipitation arsenic mass concentration
194194
precca: precipitation calcium mass concentration

docs/build/html/searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/source/ACTRIS-download.md

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ These are the available species:
118118
* `deposition vanadium mass flux`
119119
* `deposition zinc mass flux`
120120

121-
> Providentia can only read species in GHOST format. The mapping is provided in the [GHOST–ACTIRS species mapping](#ghostactris-species-mapping) section.
121+
Providentia can understand the ACTRIS vocabulary for some species and an error will be thrown for those who can be mapped to multiple GHOST species (e.g. aerosol particle optical depth). The mapping is provided in the [GHOST–ACTRIS species mapping](#ghostactris-species-mapping) section.
122122

123123
### Available resolutions
124124

@@ -143,52 +143,52 @@ observations_data_label = Ozone Mass Concentration
143143

144144
## GHOST–ACTRIS species mapping
145145

146-
Here is the mapping between GHOST variable names and the ACTRIS vocabulary:
146+
Here is the mapping between GHOST variable names and the ACTRIS vocabulary. The species that have an asterisk at the end can only be passed to the configuration file using the BSC conventions (name to the left).
147147

148148
```
149-
absco370: aerosol particle light absorption coefficient
150-
absco467: aerosol particle light absorption coefficient
151-
absco470: aerosol particle light absorption coefficient
152-
absco520: aerosol particle light absorption coefficient
153-
absco522: aerosol particle light absorption coefficient
154-
absco525: aerosol particle light absorption coefficient
155-
absco528: aerosol particle light absorption coefficient
156-
absco530: aerosol particle light absorption coefficient
157-
absco550: aerosol particle light absorption coefficient
158-
absco565: aerosol particle light absorption coefficient
159-
absco590: aerosol particle light absorption coefficient
160-
absco637: aerosol particle light absorption coefficient
161-
absco652: aerosol particle light absorption coefficient
162-
absco660: aerosol particle light absorption coefficient
163-
absco670: aerosol particle light absorption coefficient
164-
absco880: aerosol particle light absorption coefficient
165-
absco950: aerosol particle light absorption coefficient
149+
absco370: aerosol particle light absorption coefficient*
150+
absco467: aerosol particle light absorption coefficient*
151+
absco470: aerosol particle light absorption coefficient*
152+
absco520: aerosol particle light absorption coefficient*
153+
absco522: aerosol particle light absorption coefficient*
154+
absco525: aerosol particle light absorption coefficient*
155+
absco528: aerosol particle light absorption coefficient*
156+
absco530: aerosol particle light absorption coefficient*
157+
absco550: aerosol particle light absorption coefficient*
158+
absco565: aerosol particle light absorption coefficient*
159+
absco590: aerosol particle light absorption coefficient*
160+
absco637: aerosol particle light absorption coefficient*
161+
absco652: aerosol particle light absorption coefficient*
162+
absco660: aerosol particle light absorption coefficient*
163+
absco670: aerosol particle light absorption coefficient*
164+
absco880: aerosol particle light absorption coefficient*
165+
absco950: aerosol particle light absorption coefficient*
166166
acprec: precipitation depth
167-
lbsco450: aerosol particle light hemispheric backscatter coefficient
168-
lbsco520: aerosol particle light hemispheric backscatter coefficient
169-
lbsco525: aerosol particle light hemispheric backscatter coefficient
170-
lbsco530: aerosol particle light hemispheric backscatter coefficient
171-
lbsco532: aerosol particle light hemispheric backscatter coefficient
172-
lbsco550: aerosol particle light hemispheric backscatter coefficient
173-
lbsco635: aerosol particle light hemispheric backscatter coefficient
174-
lbsco700: aerosol particle light hemispheric backscatter coefficient
175-
lbsco850: aerosol particle light hemispheric backscatter coefficient
176-
lsco450: aerosol particle light scattering coefficient
177-
lsco520: aerosol particle light scattering coefficient
178-
lsco525: aerosol particle light scattering coefficient
179-
lsco530: aerosol particle light scattering coefficient
180-
lsco532: aerosol particle light scattering coefficient
181-
lsco550: aerosol particle light scattering coefficient
182-
lsco635: aerosol particle light scattering coefficient
183-
lsco700: aerosol particle light scattering coefficient
184-
lsco850: aerosol particle light scattering coefficient
185-
od1020aero: aerosol particle optical depth
186-
od380aero: aerosol particle optical depth
187-
od440aero: aerosol particle optical depth
188-
od500aero: aerosol particle optical depth
189-
od550aero: aerosol particle optical depth
190-
od675aero: aerosol particle optical depth
191-
od870aero: aerosol particle optical depth
167+
lbsco450: aerosol particle light hemispheric backscatter coefficient*
168+
lbsco520: aerosol particle light hemispheric backscatter coefficient*
169+
lbsco525: aerosol particle light hemispheric backscatter coefficient*
170+
lbsco530: aerosol particle light hemispheric backscatter coefficient*
171+
lbsco532: aerosol particle light hemispheric backscatter coefficient*
172+
lbsco550: aerosol particle light hemispheric backscatter coefficient*
173+
lbsco635: aerosol particle light hemispheric backscatter coefficient*
174+
lbsco700: aerosol particle light hemispheric backscatter coefficient*
175+
lbsco850: aerosol particle light hemispheric backscatter coefficient*
176+
lsco450: aerosol particle light scattering coefficient*
177+
lsco520: aerosol particle light scattering coefficient*
178+
lsco525: aerosol particle light scattering coefficient*
179+
lsco530: aerosol particle light scattering coefficient*
180+
lsco532: aerosol particle light scattering coefficient*
181+
lsco550: aerosol particle light scattering coefficient*
182+
lsco635: aerosol particle light scattering coefficient*
183+
lsco700: aerosol particle light scattering coefficient*
184+
lsco850: aerosol particle light scattering coefficient*
185+
od1020aero: aerosol particle optical depth*
186+
od380aero: aerosol particle optical depth*
187+
od440aero: aerosol particle optical depth*
188+
od500aero: aerosol particle optical depth*
189+
od550aero: aerosol particle optical depth*
190+
od675aero: aerosol particle optical depth*
191+
od870aero: aerosol particle optical depth*
192192
precal: precipitation aluminium mass concentration
193193
precas: precipitation arsenic mass concentration
194194
precca: precipitation calcium mass concentration

0 commit comments

Comments
 (0)