Consolidate environment variables to single file

Author: fluidnumericsJoe

simulations/glorysv12-curvilinear/workflows/download_era5.sh

@@ -7,12 +7,14 @@
 #SBATCH --error=./spectre_era5-%A.out
 
 
-HOST_DATADIR=/group/tdgs/joe/spectre-150-ensembles/glorysv12-curvilinear-15year
+SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
+source $SCRIPT_DIR/env.sh
+
 ###############################################################################################
 # Run the script to download ERA5 data
 ###############################################################################################
-srun --container-image=ghcr.io/ocean-spectre/spectre-150-ensembles/spectre-utils:latest \
-     --container-mounts=$(pwd):/workspace,${HOST_DATADIR}:/data \
+srun --container-image=$SPECTRE_UTILS_IMG \
+     --container-mounts=${SCRIPT_DIR}/../:/workspace,${HOST_DATADIR}:/data \
      python /opt/spectre_utils/download_era5.py /workspace/etc/config.yaml
 
 ###############################################################################

simulations/glorysv12-curvilinear/workflows/download_glorysv12_raw.sh

@@ -7,11 +7,12 @@
 #SBATCH --error=./spectre_glorysv12_raw.out
 
 
-HOST_DATADIR=/group/tdgs/joe/spectre-150-ensembles/glorysv12-curvilinear-15year
+SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
+source $SCRIPT_DIR/env.sh
 
 ###############################################################################################
 # Run the script to download Glorysv12 data
 ###############################################################################################
-srun --container-image=ghcr.io/ocean-spectre/spectre-150-ensembles/spectre-utils:latest \
-     --container-mounts=$(pwd):/workspace,${HOST_DATADIR}:/data \
+srun --container-image=$SPECTRE_UTILS_IMG \
+     --container-mounts=${SCRIPT_DIR}/../:/workspace,${HOST_DATADIR}:/data \
      python /opt/spectre_utils/download_glorys12_raw.py /workspace/etc/config.yaml

simulations/glorysv12-curvilinear/workflows/env.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# Path where downloaded data is stored
+export HOST_DATADIR=/group/tdgs/joe/spectre-150-ensembles/glorysv12-curvilinear-15year
+export SPECTRE_UTILS_IMG="ghcr.io/ocean-spectre/spectre-ensembles/spectre-utils:sha-6120302"

simulations/glorysv12-curvilinear/workflows/galapagos_env.sh

@@ -7,10 +7,12 @@
 #SBATCH --error=./spectre_cheapaml.out
 
 
-HOST_DATADIR=/group/tdgs/joe/spectre-150-ensembles/glorysv12-curvilinear-15year
+SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
+source $SCRIPT_DIR/env.sh
+
 ###############################################################################################
 # Run the script to download make the cheapaml boundary conditions
 ###############################################################################################
-srun --container-image=ghcr.io/ocean-spectre/spectre-150-ensembles/spectre-utils:latest \
-     --container-mounts=$(pwd):/workspace,${HOST_DATADIR}:/data \
+srun --container-image=$SPECTRE_UTILS_IMG \
+     --container-mounts=${SCRIPT_DIR}/../:/workspace,${HOST_DATADIR}:/data \
      python /opt/spectre_utils/mk_cheapaml_conditions.py /workspace/etc/config.yaml

simulations/glorysv12-curvilinear/workflows/make_cheapaml_conditions.sh

@@ -9,13 +9,14 @@
 #SBATCH --error=./spectre_bcs.out
 
 
-HOST_DATADIR=/group/tdgs/joe/spectre-150-ensembles/glorysv12-curvilinear-15year
+SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
+source $SCRIPT_DIR/env.sh
 
 ###############################################################################################
 # Run the script to generate ocean boundary conditions
 ###############################################################################################
-srun --container-image=ghcr.io/ocean-spectre/spectre-150-ensembles/spectre-utils:latest \
-     --container-mounts=$(pwd):/workspace,${HOST_DATADIR}:/data \
+srun --container-image=$SPECTRE_UTILS_IMG \
+     --container-mounts=${SCRIPT_DIR}/../:/workspace,${HOST_DATADIR}:/data \
      python /opt/spectre_utils/mk_ocean_boundary_conditions.py /workspace/etc/config.yaml
 
 ###############################################################################

simulations/glorysv12-curvilinear/workflows/make_ocean_boundary_conditions.sh

@@ -7,12 +7,14 @@
 #SBATCH --error=./spectre_ics.out
 
 
-HOST_DATADIR=/group/tdgs/joe/spectre-150-ensembles/glorysv12-curvilinear-15year
+SCRIPT_DIR=$(dirname "$(readlink -f "$0")")
+source $SCRIPT_DIR/env.sh
+
 ###############################################################################################
 # Run the script to download ERA5 data
 ###############################################################################################
-srun --container-image=ghcr.io/ocean-spectre/spectre-150-ensembles/spectre-utils:latest \
-     --container-mounts=$(pwd):/workspace,${HOST_DATADIR}:/data \
+srun --container-image=$SPECTRE_UTILS_IMG \
+     --container-mounts=${SCRIPT_DIR}/../:/workspace,${HOST_DATADIR}:/data \
      python /opt/spectre_utils/mk_initial_conditions.py /workspace/etc/config.yaml
 
 ###############################################################################