Merge pull request #179 from PCMDI/update-ozone-nitrogen-deposition

Update ozone and nitrogen delivery information

Author: znichollscr

.github/workflows/ci.yaml

@@ -71,3 +71,16 @@ jobs:
           which pip
           pip install 'input4mips-validation[locked]'
           python scripts/load-cvs-with-input4mips-validation.py
+          
+  urls:
+    if: ${{ !github.event.pull_request.draft }}
+    runs-on: "ubuntu-latest"
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - name: check-urls-are-valid
+        uses: lycheeverse/lychee-action@v2
+        with:
+          # Exclude local links
+          # Not sure why LUH site fails, it works locally.
+          args: "--exclude 'file://' --exclude '^https://luh\\.umd\\.edu/$' ."

CVs/input4MIPs_source_id.json

@@ -73,7 +73,7 @@
     },
     "DRES-CMIP-BB4CMIP7-1-0":{
         "contact":"Margreet.vanMarle@Deltares.nl;Guido.vanderWerf@wur.nl",
-        "further_info_url":"http://www.globalfiredata.org",
+        "further_info_url":"https://www.globalfiredata.org",
         "institution_id":"DRES",
         "license_id":"CC BY 4.0",
         "mip_era":"CMIP6Plus",

Database/input4MIPs_db_file_entries.json

@@ -0,0 +1 @@
+Updated expected delivery dates for ozone and nitrogen deposition forcing.

changelog/179.docs.md

@@ -0,0 +1,2 @@
+- Fixed up internal handling of data set information and names.
+- Added checks that URLs are live to the CI.

changelog/179.trivial.md

@@ -99,7 +99,7 @@ If you are working elsewhere, you may need to modify the paths slightly.
 
     - are the source IDs for the dataset up to date?
       E.g. do we need to update the source IDs to be used for the various CMIP7 phases in
-      `docs/dataset-overviews/cmip7_phases_source_ids.csv`?
+      `docs/dataset-info/cmip7-phases-source-ids.json`?
     - did the revision history come through correctly? If not, there is an issue.
 
 1. Commit everything

docs/contributing.md

@@ -57,14 +57,14 @@ <h4>
     </tr>
     <tr>
       <td>2</td>
-      <td><b><a href='http://www.globalfiredata.org' target='_blank'>Open biomass burning emissions</a></b></br>Internal docs: <a href='../dataset-overviews/open-biomass-burning-emissions' target='_blank'>here</a></td>
+      <td><b><a href='https://www.globalfiredata.org' target='_blank'>Open biomass burning emissions</a></b></br>Internal docs: <a href='../dataset-overviews/open-biomass-burning-emissions' target='_blank'>here</a></td>
       <td>DRES-CMIP-BB4CMIP7-1-0</td>
       <td>Preliminary dataset available</td>
       <td>Available: <a href='https://aims2.llnl.gov/search?project=input4MIPs&versionType=all&activeFacets=%7B%22source_id%22%3A%22DRES-CMIP-BB4CMIP7-1-0%22%7D' target='_blank'>DRES-CMIP-BB4CMIP7-1-0 (1750-01 to 2022-12)</a></td>
     </tr>
     <tr>
       <td>3</td>
-      <td><b><a href='http://luh.umd.edu' target='_blank'>Land use</a></b></br>Internal docs: <a href='../dataset-overviews/land-use' target='_blank'>here</a></td>
+      <td><b><a href='https://luh.umd.edu' target='_blank'>Land use</a></b></br>Internal docs: <a href='../dataset-overviews/land-use' target='_blank'>here</a></td>
       <td>UofMD-landState-3-0</td>
       <td>Preliminary dataset available</td>
       <td>Available: <a href='https://aims2.llnl.gov/search?project=input4MIPs&versionType=all&activeFacets=%7B%22source_id%22%3A%22UofMD-landState-3-0%22%7D' target='_blank'>UofMD-landState-3-0 (0850 to 2024)</a></td>
@@ -81,7 +81,7 @@ <h4>
       <td><b>CO<sub>2</sub> isotopes</b></br>Internal docs: <a href='../dataset-overviews/co2-isotopes' target='_blank'>here</a></td>
       <td>TBD</td>
       <td>Data in preparation</td>
-      <td>Expected: January 2025</td>
+      <td>Expected: Unclear, waiting to hear from the data provider (please raise an issue if you need an updated on this dataset's status)</td>
     </tr>
     <tr>
       <td>6</td>
@@ -94,15 +94,15 @@ <h4>
       <td>7</td>
       <td><b>Ozone concentrations</b></br>Internal docs: <a href='../dataset-overviews/ozone' target='_blank'>here</a></td>
       <td>TBD</td>
-      <td>Depends on 1, 2, 4, 5 and 8</td>
-      <td>Expected: ~January 2025; 3 months after dependent datasets</td>
+      <td>Awaiting finalization of upstream forcings: solar, volcanic, GHG/ODS concentrations, SLCF emissions, land-use changes</td>
+      <td>Expected: piControl - end of March, historical - end of May.</td>
     </tr>
     <tr>
       <td>8</td>
       <td><b>Nitrogen deposition</b></br>Internal docs: <a href='../dataset-overviews/nitrogen-deposition' target='_blank'>here</a></td>
       <td>TBD</td>
-      <td>Depends on 1, 2, 4, 5 and 8</td>
-      <td>Expected: ~January 2025; 3 months after dependent datasets</td>
+      <td>Awaiting finalization of upstream forcings: solar, volcanic, GHG/ODS concentrations, SLCF emissions, land-use changes</td>
+      <td>Expected: piControl - end of March, historical - end of May.</td>
     </tr>
     <tr>
       <td>9</td>
@@ -115,7 +115,7 @@ <h4>
       <td>10</td>
       <td><b><a href='https://pcmdi.llnl.gov/mips/amip' target='_blank'>AMIP sea-surface temperature and sea-ice boundary forcing</a></b></br>Internal docs: <a href='../dataset-overviews/amip-sst-sea-ice-boundary-forcing' target='_blank'>here</a></td>
       <td>PCMDI-AMIP-1-1-9</td>
-      <td>Final v1 dataset available. v2 dataset awaiting HadISST v2.4 release </td>
+      <td>Final v1 dataset available. v2 dataset awaiting HadISST v2.4 release.</td>
       <td>Available: <a href='https://aims2.llnl.gov/search?project=input4MIPs&versionType=all&activeFacets=%7B%22source_id%22%3A%22PCMDI-AMIP-1-1-9%22%7D' target='_blank'>PCMDI-AMIP-1-1-9 (1870-01 to 2022-12)</a></td>
     </tr>
     <tr>