From d060a1af97aa59a58009d7db96eb9b62efa3a2db Mon Sep 17 00:00:00 2001 From: David Huber <69919478+DavidHuber-NOAA@users.noreply.github.com> Date: Thu, 13 Feb 2025 16:05:06 +0000 Subject: [PATCH] Fix memory unsetting on Gaea (#3325) Memory requests are not valid on Gaea, so the variable must be unset when running the setup scripts there. This fixes memory unsetting when variables like `memory_gdas` are set in config.resources. Resolves #3322 --- parm/config/gfs/config.resources.GAEAC5 | 5 +---- parm/config/gfs/config.resources.GAEAC6 | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/parm/config/gfs/config.resources.GAEAC5 b/parm/config/gfs/config.resources.GAEAC5 index 525773f036..9ae57c99f3 100644 --- a/parm/config/gfs/config.resources.GAEAC5 +++ b/parm/config/gfs/config.resources.GAEAC5 @@ -5,7 +5,4 @@ export FI_VERBS_PREFER_XRC=0 unset memory -# shellcheck disable=SC2312 -for mem_var in $(env | grep '^memory_' | cut -d= -f1); do - unset "${mem_var}" -done +unset "memory_${RUN}" diff --git a/parm/config/gfs/config.resources.GAEAC6 b/parm/config/gfs/config.resources.GAEAC6 index 7fc6388159..66ea86ec9b 100644 --- a/parm/config/gfs/config.resources.GAEAC6 +++ b/parm/config/gfs/config.resources.GAEAC6 @@ -3,7 +3,4 @@ # GaeaC6-specific job resources unset memory -# shellcheck disable=SC2312 -for mem_var in $(env | grep '^memory_' | cut -d= -f1); do - unset "${mem_var}" -done +unset "memory_${RUN}"