Merge PR #339 (Remove gcpy/benchmark/modules/species_database.yml)

This merge brings PR #339 (Remove the default gcpy/benchmark/modules/species_database.yml file, by @yantosca) into the GCPy 1.6.0 development stream. This PR removes the species_database.yml file from within the GCPy repo. This is no longer necessary, as benchmarking routines can now read this from a directory specified in the benchmark YAML config files. Signed-off-by: Bob Yantosca <[email protected]>
geoschem · Sep 12, 2024 · cfe6b55 · cfe6b55
2 parents ebb19ee + 96c8684
commit cfe6b55
Show file tree

Hide file tree

Showing 8 changed files with 95 additions and 4,720 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Added brackets around `exempt-issue-labels` list in `.github/workflows/stale.yml`
 - Now flag differences greater than +/- 10% in benchmark timing table outputs
 
+### Removed
+- Removed `gcpy/benchmark/modules/species_database.yml` file and corresponding code pointing to this
+
 ## [1.5.0] - 2024-05-29
 ### Added
 - Script `gcpy/benchmark/modules/benchmark_utils.py`, with common benchmark utility functions

diff --git a/gcpy/benchmark/modules/benchmark_drydep.py b/gcpy/benchmark/modules/benchmark_drydep.py
@@ -31,7 +31,7 @@ def make_benchmark_drydep_plots(
         n_job=-1,
         time_mean=False,
         varlist=None,
-        spcdb_dir=os.path.join(os.path.dirname(__file__), "..", "..")
+        spcdb_dir=None,
 ):
     """
     Creates six-panel comparison plots (PDF format) from GEOS-Chem
@@ -82,14 +82,18 @@ def make_benchmark_drydep_plots(
             Default value: -1
         spcdb_dir: str
             Directory of species_datbase.yml file
-            Default value: Directory of GCPy code repository
+            Default value: None
         time_mean : bool
             Determines if we should average the datasets over time
             Default value: False
         varlist: list of str
             List of variables to plot.  If varlist is None, then
             all common variables in Ref & Dev will be plotted.
     """
+    # Make sure the species database folder is passed
+    if spcdb_dir is None:
+        msg = "The spcdb_dir argument has not been specified!"
+        raise ValueError(msg)
 
     # Create directory for plots (if it doesn't exist)
     dst = make_output_dir(