From 78cdbc466366b433bb91728a94a6b711cad98fbf Mon Sep 17 00:00:00 2001 From: "Walter.Kolczynski" Date: Wed, 20 Nov 2024 12:14:23 -0600 Subject: [PATCH] Add stage ic version file, update versions Adds a new vesion file for IC directories. Unlike other version files, this one uses an associative array instead of different variables. With the version file in place, the versions are updated on most of the directories to switch to the relocated wave restarts. Refs: #3109 --- parm/config/gefs/config.stage_ic | 10 ++++++---- parm/config/gfs/config.stage_ic | 9 ++++++--- versions/ic.ver | 22 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 versions/ic.ver diff --git a/parm/config/gefs/config.stage_ic b/parm/config/gefs/config.stage_ic index 92c6bb2a9b..5822f2e794 100644 --- a/parm/config/gefs/config.stage_ic +++ b/parm/config/gefs/config.stage_ic @@ -12,12 +12,11 @@ export BASE_IC="@BASE_IC@" # Platform home for staged ICs export STAGE_IC_YAML_TMPL="${PARMgfs}/stage/master_gefs.yaml.j2" -# Set ICSDIR +source "${HOMEgfs}/versions/ic.ver" +# Set ICSDIR (if not defined) if [[ -z "${ICSDIR}" ]] ; then - ic_ver="20240610" - if (( NMEM_ENS > 0 )) ; then ensic="${CASE_ENS}" fi @@ -26,7 +25,10 @@ if [[ -z "${ICSDIR}" ]] ; then ocnic="mx${OCNRES}" fi - export ICSDIR="${BASE_IC}/${CASE}${ensic:-}${ocnic:-}/${ic_ver}" + dir_name="${CASE}${ensic:-}${ocnic:-}" + ic_ver="${ic_versions[${dir_name}]}" + + export ICSDIR="${BASE_IC}/${dir_name}/${ic_ver}" fi diff --git a/parm/config/gfs/config.stage_ic b/parm/config/gfs/config.stage_ic index d0113fac63..f30e402c93 100644 --- a/parm/config/gfs/config.stage_ic +++ b/parm/config/gfs/config.stage_ic @@ -12,11 +12,11 @@ export BASE_IC="@BASE_IC@" # Platform home for staged ICs export STAGE_IC_YAML_TMPL="${PARMgfs}/stage/master_gfs.yaml.j2" +source "${HOMEgfs}/versions/ic.ver" + # Set ICSDIR (if not defined) if [[ -z "${ICSDIR}" ]] ; then - ic_ver="20240610" - if (( NMEM_ENS > 0 )) ; then ensic="${CASE_ENS}" fi @@ -25,7 +25,10 @@ if [[ -z "${ICSDIR}" ]] ; then ocnic="mx${OCNRES}" fi - export ICSDIR="${BASE_IC}/${CASE}${ensic:-}${ocnic:-}/${ic_ver}" + dir_name="${CASE}${ensic:-}${ocnic:-}" + ic_ver="${ic_versions[${dir_name}]}" + + export ICSDIR="${BASE_IC}/${dir_name}/${ic_ver}" fi diff --git a/versions/ic.ver b/versions/ic.ver new file mode 100644 index 0000000000..c18f69f51d --- /dev/null +++ b/versions/ic.ver @@ -0,0 +1,22 @@ +#!/bin/bash +# Fix file subfolder versions + +#shellcheck disable=SC2034 +declare -A ic_versions + +ic_versions['C48']=20241120 +ic_versions['C48mx500']=20241120 +ic_versions['C48C48mx500']=20241120 + +ic_versions['C96']=20241120 +ic_versions['C96C48']=20241120 +ic_versions['C96mx100']=20240610 + +ic_versions['C384C192']=20240610 +ic_versions['C384mx025']=20241120 + +ic_versions['C768']=20241120 +ic_versions['C768mx025']=20241120 + +ic_versions['C1152']=20241120 +ic_versions['C1152mx025']=20241120