From 8106df752a2a559a6a27962fd6a60d2e7f674359 Mon Sep 17 00:00:00 2001
From: Bob Yantosca <yantosca@seas.harvard.edu>
Date: Thu, 1 Feb 2024 12:11:03 -0500
Subject: [PATCH 1/2] Bug fix: file_regrid.py now uses "DELP_DRY" in GCHP
 output files

gcpy/file_regrid.py
- Fixed a logic error that caused GCHP output files to use the wrong
  file name for delta dry pressure ("DELPDRY" instead of "DELP_DRY").

CHANGELOG.md
- Updated accordingly

Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
---
 CHANGELOG.md        | 1 +
 gcpy/file_regrid.py | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8512c556..dbb19c54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Fixed
 - CS inquiry functions in `gcpy/cstools.py` now work properly for `xr.Dataset` and `xr.DataArray` objects
 - Prevent an import error by using `seaborn-v0_8-darkgrid` in`gcpy/benchmark/modules/benchmark_models_vs_obs.py`
+- `gcpy/file_regrid.py` now creates GCHP files with `DELP_DRY` instead of `DELPDRY`
 
 ## [1.4.2] - 2024-01-26
 ### Added
diff --git a/gcpy/file_regrid.py b/gcpy/file_regrid.py
index 474d7b7d..5d4dbb23 100644
--- a/gcpy/file_regrid.py
+++ b/gcpy/file_regrid.py
@@ -1100,10 +1100,11 @@ def rename_restart_variables(
         # ==============================================================
         if towards_gchp:
             for var in dset.data_vars.keys():
-                if "Met_DELPDRY" in var:
-                    old_to_new[var] = "DELP_DRY"
                 if var.startswith("Met_"):
-                    old_to_new[var] = var.replace("Met_", "")
+                    if "DELPDRY" in var:
+                        old_to_new[var] = "DELP_DRY"
+                    else:
+                        old_to_new[var] = var.replace("Met_", "")
                 if var.startswith("Chem_"):
                     old_to_new[var] = var.replace("Chem_", "")
                 if var.startswith("SpeciesRst_"):
@@ -1117,7 +1118,7 @@ def rename_restart_variables(
         # checkpoint -> classic/diagnostic
         # ==============================================================
         for var in dset.data_vars.keys():
-            if var == "DELP_DRY":
+            if var == "DELP_DRY" or var == "DELPDRY":
                 old_to_new[var] = "Met_DELPDRY"
             if var == "BXHEIGHT":
                 old_to_new[var] = "Met_BXHEIGHT"

From af5846fe436332aa366d7a5933641622fa6a46cb Mon Sep 17 00:00:00 2001
From: Bob Yantosca <yantosca@seas.harvard.edu>
Date: Thu, 1 Feb 2024 12:24:01 -0500
Subject: [PATCH 2/2] Remove "runs" YAML tags from .github/workflows/codeql.yml

This was causing the CodeQL GitHub Action not to run properly.

Signed-off-by: Bob Yantosca <yantosca@seas.harvard.edu>
---
 .github/workflows/codeql.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index a6164e82..75649061 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -80,8 +80,3 @@ jobs:
       uses: github/codeql-action/analyze@v2
       with:
         category: "/language:${{matrix.language}}"
-
-# Use Node.js version 20 to avoid deprecation warnings
-runs:
-  using: 'node20'
-  main: 'main.js'