Skip to content

Commit e96ba99

Browse files
committed
Fix up docs and CHANGELOG
1 parent ffc3e79 commit e96ba99

6 files changed

Lines changed: 19 additions & 7 deletions

File tree

changelog/161.deprecation.md

Lines changed: 0 additions & 2 deletions
This file was deleted.

changelog/161.feature.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Added [TBD CEDS source ID] data.
1+
Added CEDS-CMIP-2024-11-25 and CEDS-CMIP-2024-11-25-supplemental data.

docs/dataset-overviews/anthropogenic-slcf-co2-emissions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ The source ID that identifies the dataset to use in the different phases of CMIP
3434
For the testing of CMIP7, you will need data from the following source IDs:
3535

3636
- [CEDS-CMIP-2024-10-21](https://aims2.llnl.gov/search?project=input4MIPs&versionType=all&&activeFacets=%7B%22source_id%22%3A%22CEDS-CMIP-2024-10-21%22%7D)
37-
- [CEDS-CMIP-2024-11-30](https://aims2.llnl.gov/search?project=input4MIPs&versionType=all&&activeFacets=%7B%22source_id%22%3A%22CEDS-CMIP-2024-11-30%22%7D).
37+
- [CEDS-CMIP-2024-11-25](https://aims2.llnl.gov/search?project=input4MIPs&versionType=all&&activeFacets=%7B%22source_id%22%3A%22CEDS-CMIP-2024-11-25%22%7D).
3838

3939
Retrieving and only using valid data will require some care.
4040
Please make sure you read the guidance given at the start of this Summary section

docs/dataset-overviews/cmip7_phases_source_ids.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
forcing_int_id,forcing,cmip7_phase,source_id_stub,source_id_stub_ignore,source_id,ok_if_not_latest
2-
1,Anthropogenic short-lived climate forcer (SLCF) and CO<sub>2</sub> emissions,testing,CEDS-CMIP,supplemental,"CEDS-CMIP-2024-10-21;CEDS-CMIP-2024-11-30",True
2+
1,Anthropogenic short-lived climate forcer (SLCF) and CO<sub>2</sub> emissions,testing,CEDS-CMIP,supplemental,"CEDS-CMIP-2024-10-21;CEDS-CMIP-2024-11-25",True
33
1,Anthropogenic short-lived climate forcer (SLCF) and CO<sub>2</sub> emissions,ar7_fast_track,CEDS-CMIP,supplemental,,False
44
1,Anthropogenic short-lived climate forcer (SLCF) and CO<sub>2</sub> emissions,cmip7,CEDS-CMIP,supplemental,,False
55
2,Open biomass burning emissions,testing,DRES-CMIP-BB4CMIP7,,DRES-CMIP-BB4CMIP7-1-0,False

docs/dataset-overviews/fill-out-auto-generated-sections.py

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,19 @@ def get_cmip7_phase_source_id_summary(cmip7_phase: str) -> tuple[str, ...]:
9191
out.append(f"1. *{row.forcing}:* No data available for this phase yet")
9292
continue
9393

94+
if ";" in row.source_id:
95+
source_ids = row.source_id.split(";")
96+
else:
97+
source_ids = [row.source_id]
98+
99+
# Make sure all source IDs are in the DB
100+
missing_from_db = [
101+
sid for sid in source_ids if sid not in db_source["source_id"].tolist()
102+
]
103+
if missing_from_db:
104+
msg = f"These source IDs are not in our database: {missing_from_db}"
105+
raise ValueError(msg)
106+
94107
# Check status in the database
95108
db_source_id_stub_rows = db_source[
96109
db_source["source_id"].str.contains(row.source_id_stub)
@@ -264,11 +277,12 @@ def get_cmip7_phases_source_id_summary_for_forcing(forcing: str) -> tuple[str, .
264277

265278
if ";" in row.source_id:
266279
# Multiple source IDs
280+
source_ids = row.source_id.split(";")
267281
source_id_sep = "\n- "
268282
source_id_str = source_id_sep.join(
269283
[
270284
f"[{sid}](https://aims2.llnl.gov/search?project=input4MIPs&versionType=all&&activeFacets=%7B%22source_id%22%3A%22{sid}%22%7D)"
271-
for sid in row.source_id.split(";")
285+
for sid in source_ids
272286
]
273287
)
274288
out.append(

docs/dataset-overviews/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ If you have any feedback, please add it to the [relevant GitHub discussion](http
3535

3636
#### Source IDs for use in this phase
3737

38-
1. *Anthropogenic short-lived climate forcer (SLCF) and CO<sub>2</sub> emissions:* [CEDS-CMIP-2024-10-21;CEDS-CMIP-2024-11-30](https://aims2.llnl.gov/search?project=input4MIPs&versionType=all&&activeFacets=%7B%22source_id%22%3A%22CEDS-CMIP-2024-10-21;CEDS-CMIP-2024-11-30%22%7D)
38+
1. *Anthropogenic short-lived climate forcer (SLCF) and CO<sub>2</sub> emissions:* [CEDS-CMIP-2024-10-21;CEDS-CMIP-2024-11-25](https://aims2.llnl.gov/search?project=input4MIPs&versionType=all&&activeFacets=%7B%22source_id%22%3A%22CEDS-CMIP-2024-10-21;CEDS-CMIP-2024-11-25%22%7D)
3939
1. *Open biomass burning emissions:* [DRES-CMIP-BB4CMIP7-1-0](https://aims2.llnl.gov/search?project=input4MIPs&versionType=all&&activeFacets=%7B%22source_id%22%3A%22DRES-CMIP-BB4CMIP7-1-0%22%7D)
4040
1. *Land use:* [UofMD-landState-3-0](https://aims2.llnl.gov/search?project=input4MIPs&versionType=all&&activeFacets=%7B%22source_id%22%3A%22UofMD-landState-3-0%22%7D)
4141
1. *Greenhouse gas concentrations:* [CR-CMIP-0-3-0](https://aims2.llnl.gov/search?project=input4MIPs&versionType=all&&activeFacets=%7B%22source_id%22%3A%22CR-CMIP-0-3-0%22%7D)

0 commit comments

Comments
 (0)