From ecd7d7380ec486387e826557093a79d6f1ff8308 Mon Sep 17 00:00:00 2001 From: NeilBarton-NOAA Date: Wed, 7 Feb 2024 21:08:20 +0000 Subject: [PATCH] initial changes for EP5a ICs --- parm/config/gefs/config.stage_ic | 6 ++++++ parm/config/gefs/yaml/defaults.yaml | 2 ++ scripts/exglobal_stage_ic.sh | 23 +++++++++++++---------- workflow/rocoto/gefs_tasks.py | 15 ++++++++------- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/parm/config/gefs/config.stage_ic b/parm/config/gefs/config.stage_ic index e2bb0af2b8..b332ee1826 100644 --- a/parm/config/gefs/config.stage_ic +++ b/parm/config/gefs/config.stage_ic @@ -8,6 +8,12 @@ echo "BEGIN: config.stage_ic" source "${EXPDIR}/config.resources" stage_ic case "${CASE}" in + "C384") + export CPL_ATMIC="" + export CPL_ICEIC="" + export CPL_OCNIC="" + export CPL_WAVIC="" + ;; "C48") export CPL_ATMIC="gefs_test" export CPL_ICEIC="gefs_test" diff --git a/parm/config/gefs/yaml/defaults.yaml b/parm/config/gefs/yaml/defaults.yaml index 84dfcbf718..c128b3a920 100644 --- a/parm/config/gefs/yaml/defaults.yaml +++ b/parm/config/gefs/yaml/defaults.yaml @@ -5,3 +5,5 @@ base: DO_JEDILANDDA: "NO" DO_MERGENSST: "NO" FHMAX_GFS: 120 + BASE_CPLIC: "/scratch2/NCEPDEV/stmp3/Neil.Barton/ICs" + diff --git a/scripts/exglobal_stage_ic.sh b/scripts/exglobal_stage_ic.sh index 58b37f3114..0efc769149 100755 --- a/scripts/exglobal_stage_ic.sh +++ b/scripts/exglobal_stage_ic.sh @@ -77,8 +77,10 @@ for MEMDIR in "${MEMDIR_ARRAY[@]}"; do if [[ "${DO_OCN:-}" = "YES" ]]; then RUN=${rCDUMP} YMD=${gPDY} HH=${gcyc} generate_com COM_OCEAN_RESTART_PREV:COM_OCEAN_RESTART_TMPL [[ ! -d "${COM_OCEAN_RESTART_PREV}" ]] && mkdir -p "${COM_OCEAN_RESTART_PREV}" - src="${BASE_CPLIC}/${CPL_OCNIC:-}/${PDY}${cyc}/${MEMDIR}/ocean/${PDY}.${cyc}0000.MOM.res.nc" - tgt="${COM_OCEAN_RESTART_PREV}/${PDY}.${cyc}0000.MOM.res.nc" + #src="${BASE_CPLIC}/${CPL_OCNIC:-}/${PDY}${cyc}/${MEMDIR}/ocean/${PDY}.${cyc}0000.MOM.res.nc" + #tgt="${COM_OCEAN_RESTART_PREV}/${PDY}.${cyc}0000.MOM.res.nc" + src="${BASE_CPLIC}/${CPL_OCNIC:-}/${PDY}${cyc}/${MEMDIR}/ocean/ORAS5.mx${OCNRES}.ic.nc" + tgt="${COM_OCEAN_RESTART_PREV}/ORAS5.mx${OCNRES}.ic.nc" ${NCP} "${src}" "${tgt}" rc=$? ((rc != 0)) && error_message "${src}" "${tgt}" "${rc}" @@ -88,14 +90,15 @@ for MEMDIR in "${MEMDIR_ARRAY[@]}"; do # Nothing more to do for these resolutions ;; "025" ) - for nn in $(seq 1 3); do - src="${BASE_CPLIC}/${CPL_OCNIC:-}/${PDY}${cyc}/${MEMDIR}/ocean/${PDY}.${cyc}0000.MOM.res_${nn}.nc" - tgt="${COM_OCEAN_RESTART_PREV}/${PDY}.${cyc}0000.MOM.res_${nn}.nc" - ${NCP} "${src}" "${tgt}" - rc=$? - ((rc != 0)) && error_message "${src}" "${tgt}" "${rc}" - err=$((err + rc)) - done + # Nothing to do for ORAS5 initialization + #for nn in $(seq 1 3); do + # src="${BASE_CPLIC}/${CPL_OCNIC:-}/${PDY}${cyc}/${MEMDIR}/ocean/${PDY}.${cyc}0000.MOM.res_${nn}.nc" + # tgt="${COM_OCEAN_RESTART_PREV}/${PDY}.${cyc}0000.MOM.res_${nn}.nc" + # ${NCP} "${src}" "${tgt}" + # rc=$? + # ((rc != 0)) && error_message "${src}" "${tgt}" "${rc}" + # err=$((err + rc)) + #done ;; *) echo "FATAL ERROR: Unsupported ocean resolution ${OCNRES}" diff --git a/workflow/rocoto/gefs_tasks.py b/workflow/rocoto/gefs_tasks.py index 154383f627..8bb3712fc9 100644 --- a/workflow/rocoto/gefs_tasks.py +++ b/workflow/rocoto/gefs_tasks.py @@ -30,15 +30,16 @@ def stage_ic(self): if self.app_config.do_ocean: ocn_res = f"{self._base.get('OCNRES', '025'):03d}" prefix = f"{cpl_ic['BASE_CPLIC']}/{cpl_ic['CPL_OCNIC']}/@Y@m@d@H/mem000/ocean" - data = f"{prefix}/@Y@m@d.@H0000.MOM.res.nc" + #data = f"{prefix}/@Y@m@d.@H0000.MOM.res.nc" + data = f"{prefix}/ORAS5.mx{ocn_res}.ic.nc" dep_dict = {'type': 'data', 'data': data} deps.append(rocoto.add_dependency(dep_dict)) - if ocn_res in ['025']: - # 0.25 degree ocean model also has these additional restarts - for res in [f'res_{res_index}' for res_index in range(1, 4)]: - data = f"{prefix}/@Y@m@d.@H0000.MOM.{res}.nc" - dep_dict = {'type': 'data', 'data': data} - deps.append(rocoto.add_dependency(dep_dict)) + #if ocn_res in ['025']: + # # 0.25 degree ocean model also has these additional restarts + # for res in [f'res_{res_index}' for res_index in range(1, 4)]: + # data = f"{prefix}/@Y@m@d.@H0000.MOM.{res}.nc" + # dep_dict = {'type': 'data', 'data': data} + # deps.append(rocoto.add_dependency(dep_dict)) # Ice ICs if self.app_config.do_ice: