Skip to content

Commit

Permalink
Fix up docs and CHANGELOG
Browse files Browse the repository at this point in the history
  • Loading branch information
znichollscr committed Dec 4, 2024
1 parent ffc3e79 commit e96ba99
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 7 deletions.
2 changes: 0 additions & 2 deletions changelog/161.deprecation.md

This file was deleted.

2 changes: 1 addition & 1 deletion changelog/161.feature.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Added [TBD CEDS source ID] data.
Added CEDS-CMIP-2024-11-25 and CEDS-CMIP-2024-11-25-supplemental data.
2 changes: 1 addition & 1 deletion docs/dataset-overviews/anthropogenic-slcf-co2-emissions.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ The source ID that identifies the dataset to use in the different phases of CMIP
For the testing of CMIP7, you will need data from the following source IDs:

- [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)
- [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).
- [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).

Retrieving and only using valid data will require some care.
Please make sure you read the guidance given at the start of this Summary section
Expand Down
2 changes: 1 addition & 1 deletion docs/dataset-overviews/cmip7_phases_source_ids.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
forcing_int_id,forcing,cmip7_phase,source_id_stub,source_id_stub_ignore,source_id,ok_if_not_latest
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
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
1,Anthropogenic short-lived climate forcer (SLCF) and CO<sub>2</sub> emissions,ar7_fast_track,CEDS-CMIP,supplemental,,False
1,Anthropogenic short-lived climate forcer (SLCF) and CO<sub>2</sub> emissions,cmip7,CEDS-CMIP,supplemental,,False
2,Open biomass burning emissions,testing,DRES-CMIP-BB4CMIP7,,DRES-CMIP-BB4CMIP7-1-0,False
Expand Down
16 changes: 15 additions & 1 deletion docs/dataset-overviews/fill-out-auto-generated-sections.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,19 @@ def get_cmip7_phase_source_id_summary(cmip7_phase: str) -> tuple[str, ...]:
out.append(f"1. *{row.forcing}:* No data available for this phase yet")
continue

if ";" in row.source_id:
source_ids = row.source_id.split(";")
else:
source_ids = [row.source_id]

# Make sure all source IDs are in the DB
missing_from_db = [
sid for sid in source_ids if sid not in db_source["source_id"].tolist()
]
if missing_from_db:
msg = f"These source IDs are not in our database: {missing_from_db}"
raise ValueError(msg)

# Check status in the database
db_source_id_stub_rows = db_source[
db_source["source_id"].str.contains(row.source_id_stub)
Expand Down Expand Up @@ -264,11 +277,12 @@ def get_cmip7_phases_source_id_summary_for_forcing(forcing: str) -> tuple[str, .

if ";" in row.source_id:
# Multiple source IDs
source_ids = row.source_id.split(";")
source_id_sep = "\n- "
source_id_str = source_id_sep.join(
[
f"[{sid}](https://aims2.llnl.gov/search?project=input4MIPs&versionType=all&&activeFacets=%7B%22source_id%22%3A%22{sid}%22%7D)"
for sid in row.source_id.split(";")
for sid in source_ids
]
)
out.append(
Expand Down
2 changes: 1 addition & 1 deletion docs/dataset-overviews/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ If you have any feedback, please add it to the [relevant GitHub discussion](http

#### Source IDs for use in this phase

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)
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)
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)
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)
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)
Expand Down

0 comments on commit e96ba99

Please sign in to comment.