Skip to content
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
30cf5df
initial creation of CI using replay ICs
NeilBarton-NOAA Jul 2, 2024
4b3ae39
change name
NeilBarton-NOAA Jul 2, 2024
fe2054e
making an S2SWA case
NeilBarton-NOAA Jul 2, 2024
7b7ee9b
Merge remote-tracking branch 'origin/develop' into gefs_replay_ci
NeilBarton-NOAA Jul 22, 2024
225d280
Merge remote-tracking branch 'origin/develop' into gefs_replay_ci
NeilBarton-NOAA Jul 23, 2024
b17765e
start of CI for GEFS replays # Please enter the commit message for your
NeilBarton-NOAA Jul 24, 2024
675cb77
Merge branch 'develop' into gefs_replay_ci
NeilBarton-NOAA Jul 24, 2024
e49dbcf
removing shell check errors
NeilBarton-NOAA Jul 24, 2024
ec4becc
Merge branch 'gefs_replay_ci' of https://github.com/NeilBarton-NOAA/g…
NeilBarton-NOAA Jul 24, 2024
b69d653
fixes for wave post processing
NeilBarton-NOAA Jul 24, 2024
084d744
Merge branch 'NOAA-EMC:develop' into gefs_replay_ci
NeilBarton-NOAA Aug 13, 2024
a4bb8f3
Merge remote-tracking branch 'origin/develop' into gefs_replay_ci
NeilBarton-NOAA Aug 13, 2024
4ff31fd
add BREAKPOINTS variable
NeilBarton-NOAA Aug 13, 2024
97b92ee
fix shell checks
NeilBarton-NOAA Aug 14, 2024
713f41d
edit defult config.efc to be close to re-forecasting
NeilBarton-NOAA Aug 14, 2024
af31d2f
Fix bug in variable check
EricSinsky-NOAA Aug 15, 2024
cec7b81
Add more settings to GEFS replay CI test
EricSinsky-NOAA Aug 15, 2024
4aaca9a
Add atmos variables requested for reforeacst
EricSinsky-NOAA Aug 15, 2024
11e1957
Reorganize TSNOWP in paramlist
EricSinsky-NOAA Aug 15, 2024
a005e5f
Extract ice variables from history file instead
EricSinsky-NOAA Aug 15, 2024
2dd9a7e
Fix typo
EricSinsky-NOAA Aug 15, 2024
b132408
Update TCDC variable to correct name
EricSinsky-NOAA Aug 15, 2024
3d9455b
Merge pull request #7 from EricSinsky-NOAA/gefs_replay_ci_pr
NeilBarton-NOAA Aug 20, 2024
447224c
Merge branch 'NOAA-EMC:develop' into gefs_replay_ci
NeilBarton-NOAA Aug 20, 2024
c6b7eaa
edits to stage_ic for replay perturbations
NeilBarton-NOAA Aug 21, 2024
51aa2dd
adding icsdir to pr CI yaml
NeilBarton-NOAA Aug 21, 2024
a641591
Merge branch 'NOAA-EMC:develop' into gefs_replay_ci
NeilBarton-NOAA Aug 26, 2024
4985361
Fix ensstat failures
EricSinsky-NOAA Aug 27, 2024
8eaef27
updates for products
NeilBarton-NOAA Aug 28, 2024
2e7241f
Add shellcheck disable and skip f000 for ocn/ice
EricSinsky-NOAA Aug 28, 2024
ddc544d
Revert "Fix ensstat failures"
EricSinsky-NOAA Aug 28, 2024
40515ca
Merge remote-tracking branch 'nb/gefs_replay_ci' into gefs_replay_ci_pr
EricSinsky-NOAA Aug 28, 2024
3d16fb7
Merge pull request #8 from EricSinsky-NOAA/gefs_replay_ci_pr
NeilBarton-NOAA Aug 28, 2024
5f37ce8
Merge remote-tracking branch 'nb/gefs_replay_ci' into gefs_replay_ci_pr
EricSinsky-NOAA Aug 28, 2024
9e84240
Move shellcheck disable
EricSinsky-NOAA Aug 28, 2024
fa25984
Remove shellcheck disable
EricSinsky-NOAA Aug 28, 2024
23564f1
Add double quotes in ocnice_extractvars
EricSinsky-NOAA Sep 3, 2024
2176326
Merge branch 'develop' into gefs_replay_ci
NeilBarton-NOAA Sep 10, 2024
e99b3f4
Merge branch 'NOAA-EMC:develop' into gefs_replay_ci
NeilBarton-NOAA Sep 12, 2024
154e72f
updates for new MOM6 100 input file
NeilBarton-NOAA Sep 12, 2024
57ce47b
Update workflow/rocoto/gefs_tasks.py
NeilBarton-NOAA Sep 12, 2024
b62e4ca
fix archiving until archiving PR is ready
NeilBarton-NOAA Sep 16, 2024
d393a13
Merge branch 'gefs_replay_ci' of https://github.com/NeilBarton-NOAA/g…
NeilBarton-NOAA Sep 16, 2024
8c875a9
Merge branch 'develop' into gefs_replay_ci
NeilBarton-NOAA Sep 16, 2024
a87fa6c
change back to ufs.top edits
NeilBarton-NOAA Sep 16, 2024
058ba52
Merge branch 'gefs_replay_ci' of https://github.com/NeilBarton-NOAA/g…
NeilBarton-NOAA Sep 16, 2024
3e74753
Update scripts/exgfs_wave_post_pnt.sh
NeilBarton-NOAA Sep 16, 2024
830d904
Update parm/archive/gefs_arcdir.yaml.j2
NeilBarton-NOAA Sep 17, 2024
c938275
add comments for coarse grained restarts
NeilBarton-NOAA Sep 17, 2024
f51fed8
Merge branch 'gefs_replay_ci' of https://github.com/NeilBarton-NOAA/g…
NeilBarton-NOAA Sep 17, 2024
c842090
Make archive job work with replay run
EricSinsky-NOAA Sep 19, 2024
0802ef1
Add Foundation SST to group-a products
EricSinsky-NOAA Sep 19, 2024
12e940c
Modify gefs_arcdir yaml
EricSinsky-NOAA Sep 19, 2024
66c7117
Fix gefs_arcdir yaml
EricSinsky-NOAA Sep 19, 2024
69fccdd
updates for stage_ic
NeilBarton-NOAA Sep 19, 2024
d93d094
Merge branch 'develop' into gefs_replay_ci
NeilBarton-NOAA Sep 19, 2024
5695faa
Merge branch 'develop' into gefs_replay_ci
NeilBarton-NOAA Sep 23, 2024
b0d0cd4
Merge remote-tracking branch 'EMC/develop' into gefs_replay_ci
EricSinsky-NOAA Sep 26, 2024
1c54982
point to CI ICs
NeilBarton-NOAA Sep 27, 2024
f918cc6
Merge branch 'gefs_replay_ci' of https://github.com/NeilBarton-NOAA/g…
NeilBarton-NOAA Sep 27, 2024
922eadf
fix C48_S2SWA_gefs CI error and added HPC_ACCOUNT
NeilBarton-NOAA Oct 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/cases/pr/C48_S2SWA_gefs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ arguments:
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
idate: 2021032312
edate: 2021032312
yaml: {{ HOMEgfs }}/ci/cases/yamls/gefs_ci_defaults.yaml
yaml: {{ HOMEgfs }}/ci/cases/yamls/gefs_defaults_ci.yaml

skip_ci_on_hosts:
- wcoss2
19 changes: 19 additions & 0 deletions ci/cases/pr/C96_S2SWA_gefs_replay_ics.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
experiment:
system: gefs
mode: forecast-only

arguments:
pslot: {{ 'pslot' | getenv }}
app: S2SWA
resdetatmos: 96
resdetocean: 1.0
resensatmos: 96
nens: 2
gfs_cyc: 1
start: warm
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
idate: 2020110100
edate: 2020110100
yaml: {{ HOMEgfs }}/ci/cases/yamls/gefs_replay_ci.yaml

7 changes: 7 additions & 0 deletions ci/cases/yamls/gefs_replay_ci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
defaults:
!INC {{ HOMEgfs }}/parm/config/gefs/yaml/defaults.yaml
base:
REPLAY_ICS: "YES"
Comment thread
WalterKolczynski-NOAA marked this conversation as resolved.
FCST_BREAKPOINTS: ""
BASE_CPLIC: {{ 'TOPICDIR' | getenv }}/REPLAY_ICs/CI
Comment thread
KateFriedman-NOAA marked this conversation as resolved.
Outdated

2 changes: 1 addition & 1 deletion jobs/JGLOBAL_WAVE_POST_PNT
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export WAV_MOD_TAG=${RUN}wave${waveMEMB}

export CFP_VERBOSE=1

export FHMAX_WAV_PNT=${FHMAX_WAV}
export FHMAX_WAV_PNT=$(( FHMAX_WAV - OFFSET_START_HOUR ))
export DOSPC_WAV='YES' # Spectral post
export DOBLL_WAV='YES' # Bulletin post
export DOBNDPNT_WAV='NO' #not boundary points
Expand Down
22 changes: 11 additions & 11 deletions parm/config/gefs/config.base
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,15 @@ export FHOUT_ICE=3
# GFS cycle info
export gfs_cyc=@gfs_cyc@ # 0: no GFS cycle, 1: 00Z only, 2: 00Z and 12Z only, 4: all 4 cycles.

# set variables needed for use with REPLAY ICs
export REPLAY_ICS=@REPLAY_ICS@
if [[ "${REPLAY_ICS:-NO}" == "YES" ]]; then
export OFFSET_START_HOUR=$(( assim_freq / 2 ))
else
export OFFSET_START_HOUR=0
fi


# GFS output and frequency
export FHMIN_GFS=0
export FHMAX_GFS="@FHMAX_GFS@"
Expand All @@ -239,7 +248,7 @@ export FHMAX_HF_GFS=@FHMAX_HF_GFS@
export FHOUT_HF_GFS=1
export FHOUT_OCN_GFS=6
export FHOUT_ICE_GFS=6
export FHMIN_WAV=0
export FHMIN_WAV=${OFFSET_START_HOUR:-0}
export FHOUT_WAV=3
export FHMAX_HF_WAV=120
export FHOUT_HF_WAV=1
Expand Down Expand Up @@ -292,19 +301,10 @@ export NMEM_ENS=@NMEM_ENS@
export ENSMEM=${ENSMEM:-"000"}
export MEMDIR="mem${ENSMEM}"

# initialize ocean ensemble members with perturbations
# if true, only occurs for members greater than zero
export REPLAY_ICS=@REPLAY_ICS@
if [[ "${REPLAY_ICS:-NO}" == "YES" ]]; then
export OFFSET_START_HOUR=$(( assim_freq / 2 ))
else
export OFFSET_START_HOUR=0
fi

export DOIAU="NO" # While we are not doing IAU, we may want to warm start w/ IAU in the future
# Check if cycle is cold starting
if [[ "${EXP_WARM_START}" = ".false." ]]; then
export IAU_FHROT=${OFFSET_START_HOUR}
export OFFSET_START_HOUR=$(( assim_freq / 2 ))
Comment thread
EricSinsky-NOAA marked this conversation as resolved.
Outdated
else
if [[ "${DOIAU}" = "YES" ]]; then
export IAU_FHROT=3
Expand Down
2 changes: 1 addition & 1 deletion parm/config/gefs/config.ufs
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ if [[ "${skip_mom6}" == "false" ]]; then
MOM6_RESTART_SETTING='r'
MOM6_RIVER_RUNOFF='False'
eps_imesh="2.5e-1"
TOPOEDITS="ufs.topo_edits_011818.nc"
TOPOEDITS="topo_edits_011818.nc"
Comment thread
NeilBarton-NOAA marked this conversation as resolved.
Outdated
if [[ ${RUN} == "gfs" || "${RUN}" == "gefs" ]]; then
MOM6_DIAG_COORD_DEF_Z_FILE="interpolate_zgrid_40L.nc"
MOM6_DIAG_MISVAL="-1e34"
Expand Down
4 changes: 3 additions & 1 deletion scripts/exgfs_wave_post_pnt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,9 @@ source "${USHgfs}/preamble.sh"
ww3_outp_spec.inp.tmpl > ww3_outp.inp

${NLN} mod_def.$waveuoutpGRD mod_def.ww3
HMS="${cyc}0000"
#export OFFSET_START_HOUR=$( printf "%02d" ${half_assim} )
sec=$( printf "%02d" $(( cyc + OFFSET_START_HOUR )) )
HMS="${sec}0000"
Comment thread
NeilBarton-NOAA marked this conversation as resolved.
Outdated
if [[ -f "${COMIN_WAVE_HISTORY}/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${PDY}.${HMS}" ]]; then
${NLN} "${COMIN_WAVE_HISTORY}/${WAV_MOD_TAG}.out_pnt.${waveuoutpGRD}.${PDY}.${HMS}" \
"./out_pnt.${waveuoutpGRD}"
Expand Down
8 changes: 5 additions & 3 deletions workflow/rocoto/gefs_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -383,10 +383,12 @@ def atmos_ensstat(self):

def wavepostsbs(self):
deps = []
dtg_prefix = "@Y@m@d.@H0000"
offset = str(self._configs['base']['OFFSET_START_HOUR']).zfill(2) + ":00:00"
Comment thread
NeilBarton-NOAA marked this conversation as resolved.
Outdated
for wave_grid in self._configs['wavepostsbs']['waveGRD'].split():
wave_hist_path = self._template_to_rocoto_cycstring(self._base["COM_WAVE_HISTORY_TMPL"], {'MEMDIR': 'mem#member#'})
data = f'{wave_hist_path}/gefswave.out_grd.{wave_grid}.@Y@m@d.@H0000'
dep_dict = {'type': 'data', 'data': data}
wave_hist_path = self._template_to_rocoto_cycstring(self._base["COM_WAVE_HISTORY_TMPL"], {'MEMDIR': 'mem#member#'}) + '/'
data = [wave_hist_path, f"gefswave.out_grd.{wave_grid}.@Y@m@d.@H0000"]
dep_dict = {'type': 'data', 'data': data, 'offset': [None, offset]}
deps.append(rocoto.add_dependency(dep_dict))
dependencies = rocoto.create_dependency(dep_condition='and', dep=deps)

Comment thread
NeilBarton-NOAA marked this conversation as resolved.
Outdated
Expand Down