Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
d52977d
update fix for wave
JessicaMeixner-NOAA Jan 22, 2025
26765f6
do not copy temp files to COM as they are not needed
JessicaMeixner-NOAA Jan 24, 2025
ac141b6
remove un-used COMOUT_WAVE_PREP in JGLOBAL_WAVE_POST_SBS
JessicaMeixner-NOAA Jan 24, 2025
9ac3313
change name of restart variables
JessicaMeixner-NOAA Jan 24, 2025
02ca6ae
update ic date
JessicaMeixner-NOAA Jan 27, 2025
5b97753
Merge remote-tracking branch 'EMC/develop' into fixhighrestest
JessicaMeixner-NOAA Jan 27, 2025
754f0b0
Merge remote-tracking branch 'EMC/develop' into fixhighrestest
JessicaMeixner-NOAA Jan 28, 2025
3342450
changes requested by NCO for v16 adding to develop
JessicaMeixner-NOAA Jan 29, 2025
e54d216
Merge remote-tracking branch 'EMC/develop' into fixhighrestest
JessicaMeixner-NOAA Jan 29, 2025
a06de0f
add environment variable for fcst job for hercules/orion
JessicaMeixner-NOAA Jan 29, 2025
a9d8f7e
update WW3 IC error handling
JessicaMeixner-NOAA Jan 30, 2025
ee352fe
remove loop in JGLOBAL_WAVE_POST_SBS
JessicaMeixner-NOAA Jan 30, 2025
583e2fb
Merge branch 'NOAA-EMC:develop' into fixhighrestest
JessicaMeixner-NOAA Feb 5, 2025
300f8f0
update ufs weather model hash
JessicaMeixner-NOAA Feb 5, 2025
02210bf
updating script for shell check
JessicaMeixner-NOAA Feb 6, 2025
bbd9bd8
add fv3 output variable to model_configure
JessicaMeixner-NOAA Feb 7, 2025
df709ba
Merge branch 'NOAA-EMC:develop' into fixhighrestest
JessicaMeixner-NOAA Feb 11, 2025
5bb8f70
point to ww3 with point updates
JessicaMeixner-NOAA Feb 11, 2025
f65f51e
adding .nc to ush/forecast_postdet.sh in the point output name for ne…
Feb 11, 2025
48091ee
update ww3
JessicaMeixner-NOAA Feb 11, 2025
682b4c2
update ww3
JessicaMeixner-NOAA Feb 12, 2025
58102cd
modified the exgfs_wave_post_pnt.sh; config.resources; wave_tar.sh to…
AliS-Noaa Feb 12, 2025
5bb31c3
Merge branch 'pointopt' of github.com:AliS-Noaa/global-workflow into …
AliS-Noaa Feb 12, 2025
6af9b87
modified the raw point output name for the netcdf file
AliS-Noaa Feb 13, 2025
62aebc6
modified exgfs_wave_post_pnt.sh; ww3_outp.in; wave_tar.sh to be compa…
AliS-Noaa Feb 14, 2025
58a8c3e
changing the wave_tar.sh and template ww3_outp to work with the retri…
AliS-Noaa Feb 21, 2025
ce18247
using DTPNT_WAV for time step in the wave_pnt script
AliS-Noaa Feb 21, 2025
7eba140
Merge remote-tracking branch 'origin/pointopt' into optoutp
AliS-Noaa Feb 25, 2025
735dbd7
pointing to AliS ufs_model and WW3
AliS-Noaa Feb 25, 2025
ffdf632
Merge branch 'NOAA-EMC:develop' into optoutp
AliS-Noaa Feb 25, 2025
dc842ce
Merge branch 'NOAA-EMC:develop' into optoutp
AliS-Noaa Mar 13, 2025
296a5e5
Merge branch 'NOAA-EMC:develop' into optoutp
AliS-Noaa Mar 14, 2025
2b89980
Merge branch 'NOAA-EMC:develop' into optoutp
AliS-Noaa Mar 17, 2025
2a92809
minor shel warning resolved and the prefix is templated in the spec.i…
AliS-Noaa Mar 17, 2025
d6c8bb5
Merge remote-tracking branch 'EMC/develop' into optoutp
AliS-Noaa Mar 17, 2025
8ee2df4
correcting RUNwave
AliS-Noaa Mar 17, 2025
ac7fcd6
bring env/ changes from feature/rename_wave
aerorahul Mar 18, 2025
f609f7b
bring changes from feature/rename_wave relevant to wave_init and fore…
aerorahul Mar 18, 2025
f862487
bring changes from workflow/ of branch feature/rename_wave relevant t…
aerorahul Mar 18, 2025
2e19ccc
wip for sbs job
aerorahul Mar 18, 2025
f45c723
got post sbs job to run successfully w/ MPMD
aerorahul Mar 21, 2025
e01f017
Merge branch 'develop' into feature/rename_wave_rm
aerorahul Mar 21, 2025
ff0a9e6
Merge branch 'develop' into feature/rename_wave_rm
aerorahul Mar 21, 2025
ea20c39
bring from WKs branch
aerorahul Mar 21, 2025
6a9faf5
update wavepostpnt job for renamed wave files in COM
aerorahul Mar 24, 2025
42d83e2
Merge branch 'develop' into feature/rename_wave_rm
aerorahul Mar 24, 2025
96783ac
update wave gempak ex script
aerorahul Mar 25, 2025
b336c23
loop over forecast hours for wave gempak jobs
aerorahul Mar 25, 2025
d165e1b
take more changes from Walters gfs_tasks.py
aerorahul Mar 25, 2025
b762ad2
Merge branch 'develop' into feature/rename_wave_rm
aerorahul Mar 25, 2025
7c4038d
fix mpmd call in wave init
aerorahul Mar 25, 2025
d7d1536
Merge branch 'develop' into feature/rename_wave_rm
aerorahul Mar 26, 2025
3d72d1e
fix issues in the wave gempak scripts that came up during testing
aerorahul Mar 27, 2025
c19023a
wavepostpnt and wavepostbndpnt do not work w/ CFP on wcoss. disable …
aerorahul Mar 27, 2025
06e027f
Merge branch 'develop' into feature/rename_wave_rm
aerorahul Mar 27, 2025
6e3e6d1
updates from Wen Meng for post product updates associated with UPP up…
JessicaMeixner-NOAA Mar 28, 2025
db3e567
update model
JessicaMeixner-NOAA Mar 28, 2025
6fe4331
Merge branch 'NOAA-EMC:develop' into updateWW320250327
JessicaMeixner-NOAA Mar 28, 2025
cbd5ae3
update ufs and update ww3 namelist
JessicaMeixner-NOAA Mar 28, 2025
696c0f0
Merge remote-tracking branch 'AS/optoutp' into updateUFStopofww320250328
JessicaMeixner-NOAA Mar 28, 2025
4b21b70
Merge branch 'develop' into feature/rename_wave_rm
aerorahul Mar 31, 2025
09c52a5
update ufs to develop from 20250328
JessicaMeixner-NOAA Mar 31, 2025
6a598ea
Merge remote-tracking branch 'EMC/develop' into updateWW320250327
JessicaMeixner-NOAA Mar 31, 2025
ebad7c5
Merge branch 'NOAA-EMC:develop' into optoutp
AliS-Noaa Mar 31, 2025
892a9d2
if-else on seperate lines
aerorahul Mar 31, 2025
fa35a5b
disable USE_CFP on other platforms for wavepostpnt and wavebndpnt jobs
aerorahul Mar 31, 2025
f3ad91c
Merge branch 'develop' into feature/rename_wave_rm
aerorahul Mar 31, 2025
524482b
Resolved merge conflicts and completed merge from AR/feature/rename_w…
AliS-Noaa Apr 1, 2025
2864788
Merge branch 'NOAA-EMC:develop' into updateWW320250401
AliS-Noaa Apr 1, 2025
c2da28f
Merge remote-tracking branch 'origin/updateWW320250401' into optoutp
AliS-Noaa Apr 1, 2025
e639a24
USE_CFP should not be turned off for wavepostpnt and wavecndpnt jobs
aerorahul Apr 1, 2025
861dead
on WCOSS2, CFP_MP was not defined, so USE_CFP must be NO for wavepost…
aerorahul Apr 1, 2025
235297d
Merge branch 'develop' into feature/rename_wave_rm
aerorahul Apr 1, 2025
23c21d8
update gdas|gfs wave.yaml.j2 to get correct filenames
aerorahul Apr 1, 2025
e0d702c
Merge branch 'develop' into feature/rename_wave_rm
aerorahul Apr 1, 2025
3c35bed
Merge remote-tracking branch 'refs/remotes/origin/feature/rename_wave…
aerorahul Apr 1, 2025
a696c45
adding .nc to the error comment in line 22
AliS-Noaa Apr 2, 2025
ee6a615
Merge remote-tracking branch 'EMC/develop' into updateWW320250327
JessicaMeixner-NOAA Apr 2, 2025
a648bde
update IC versions
JessicaMeixner-NOAA Apr 2, 2025
5871235
Merge remote-tracking branch 'AR/feature/rename_wave_rm' into optoutp…
AliS-Noaa Apr 2, 2025
d6cdd0d
fix arch_tars errors
aerorahul Apr 2, 2025
e89d5d9
add wavepostbndpntbll to the USE_CFP=NO list on WCOSS
aerorahul Apr 2, 2025
8d71447
apply reviewer comment
aerorahul Apr 2, 2025
acd2d3d
Merge remote-tracking branch 'AR/feature/rename_wave_rm' into optoutp…
AliS-Noaa Apr 2, 2025
6caf9d0
file counting is changed to be compatible with the new $ID
AliS-Noaa Apr 3, 2025
5ff7ddf
Merge branch 'NOAA-EMC:develop' into optoutp20250401
AliS-Noaa Apr 3, 2025
5d11d00
disable C96C48_ufs_hybatmDA test on GaeaC6. this test does not run s…
aerorahul Apr 3, 2025
ec7efe9
Merge remote-tracking branch 'AS/optoutp20250401' into updateWW320250327
JessicaMeixner-NOAA Apr 3, 2025
8fa8155
Merge remote-tracking branch 'EMC/develop' into updateWW320250327
JessicaMeixner-NOAA Apr 3, 2025
b4357ca
Merge branch 'NOAA-EMC:develop' into updateWW320250327
JessicaMeixner-NOAA Apr 4, 2025
6baf1eb
remove variable not being used & being flagged in checks
JessicaMeixner-NOAA Apr 4, 2025
ab25ffb
Merge branch 'NOAA-EMC:develop' into updateWW320250327
JessicaMeixner-NOAA Apr 4, 2025
65ff8f5
turn on C48_S2SW_extended test on wcoss2 as requested
JessicaMeixner-NOAA Apr 4, 2025
ec5f5f9
Merge branch 'NOAA-EMC:develop' into updateWW320250327
JessicaMeixner-NOAA Apr 4, 2025
9a8f4bb
first round of attempts to address reviewer concerns, more work needed
JessicaMeixner-NOAA Apr 7, 2025
1ec5d71
Merge branch 'NOAA-EMC:develop' into updateWW320250327
JessicaMeixner-NOAA Apr 7, 2025
e2ff7e0
cherry pick changes from patch/3528 and overlay them on updateWW32025…
aerorahul Apr 7, 2025
259a91f
Merge pull request #14 from aerorahul/patch/3528-jm
JessicaMeixner-NOAA Apr 7, 2025
08e903a
remove no cfp for points for wcoss2
JessicaMeixner-NOAA Apr 8, 2025
4c829fd
Merge branch 'NOAA-EMC:develop' into updateWW320250327
JessicaMeixner-NOAA Apr 8, 2025
2fef1ee
Merge branch 'NOAA-EMC:develop' into updateWW320250327
JessicaMeixner-NOAA Apr 8, 2025
3a6e3b2
possible fixes for exgfs_wave_prdgen_bulls
JessicaMeixner-NOAA Apr 9, 2025
d392c58
possible fixes for exgfs_wave_prdgen_gridded.sh
JessicaMeixner-NOAA Apr 9, 2025
0b2693a
Merge branch 'NOAA-EMC:develop' into updateWW320250327
JessicaMeixner-NOAA Apr 9, 2025
16c0e71
Merge branch 'NOAA-EMC:develop' into updateWW320250327
JessicaMeixner-NOAA Apr 9, 2025
e4d857d
turn off test
JessicaMeixner-NOAA Apr 10, 2025
61b8887
Update ush/wave_tar.sh
JessicaMeixner-NOAA Apr 10, 2025
69f85ba
Merge branch 'NOAA-EMC:develop' into updateWW320250327
JessicaMeixner-NOAA Apr 10, 2025
2ae27f9
Update scripts/exgfs_wave_post_pnt.sh
JessicaMeixner-NOAA Apr 10, 2025
7ebbcb2
turn off C96C48_ufs_hybatmDA on hera/wcoss2
JessicaMeixner-NOAA Apr 11, 2025
e971e51
Merge branch 'NOAA-EMC:develop' into updateWW320250327
JessicaMeixner-NOAA Apr 11, 2025
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/C48mx500_3DVarAOWCDA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ arguments:
resdetocean: 5.0
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C48mx500/20250218
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C48mx500/20250327
idate: 2021032418
edate: 2021032500
nens: 0
Expand Down
2 changes: 1 addition & 1 deletion ci/cases/pr/C48mx500_hybAOWCDA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ arguments:
resdetocean: 5.0
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C48mx500/20241120
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C48mx500/20250327
idate: 2021032418
edate: 2021032500
nens: 2
Expand Down
2 changes: 1 addition & 1 deletion ci/cases/pr/C96C48_hybatmDA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ arguments:
resensatmos: 48
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20241120
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
idate: 2021122018
edate: 2021122106
nens: 2
Expand Down
2 changes: 1 addition & 1 deletion ci/cases/pr/C96C48_hybatmaerosnowDA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ arguments:
resensatmos: 48
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20241120
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
idate: 2021122012
edate: 2021122100
nens: 2
Expand Down
4 changes: 3 additions & 1 deletion ci/cases/pr/C96C48_ufs_hybatmDA.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ arguments:
resensatmos: 48
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20241120
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
idate: 2024022318
edate: 2024022406
nens: 2
Expand All @@ -24,3 +24,5 @@ skip_ci_on_hosts:
- orion
- hercules
- awsepicglobalworkflow
- hera
- wcoss2
2 changes: 1 addition & 1 deletion ci/cases/pr/C96_atm3DVar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ arguments:
resdetatmos: 96
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20241120
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
idate: 2021122018
edate: 2021122106
nens: 0
Expand Down
2 changes: 1 addition & 1 deletion ci/cases/pr/C96_atm3DVar_extended.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ arguments:
resdetatmos: 96
comroot: {{ 'RUNTESTS' | getenv }}/COMROOT
expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20241120
icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20250327
idate: 2021122018
edate: 2021122118
nens: 0
Expand Down
4 changes: 0 additions & 4 deletions env/WCOSS2.env
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,6 @@ elif [[ "${step}" = "prep_emissions" ]]; then
elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then

export USE_CFP="YES"
if [[ "${step}" = "wavepostpnt" ]] || [[ "${step}" = "wavepostbndpnt" ]] || \
[[ "${step}" = "wavepostbndpntbll" ]]; then
export USE_CFP="NO"
fi
export wavempexec="${launcher} -np"
export wave_mpmd=${mpmd_opt}

Expand Down
12 changes: 6 additions & 6 deletions parm/config/gfs/config.resources
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,8 @@ case ${step} in
# The wavepost*pnt* jobs are I/O heavy and do not scale well to large nodes.
# Limit the number of tasks/node to 40.
"wavepostbndpnt")
Comment thread
DavidHuber-NOAA marked this conversation as resolved.
walltime="03:00:00"
ntasks=240
walltime="00:30:00"
ntasks=1
threads_per_task=1
tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
export is_exclusive=True
Expand All @@ -222,8 +222,8 @@ case ${step} in
;;

"wavepostbndpntbll")
walltime="01:00:00"
ntasks=448
walltime="00:10:00"
ntasks=2
threads_per_task=1
tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
export is_exclusive=True
Expand All @@ -235,8 +235,8 @@ case ${step} in
;;

"wavepostpnt")
walltime="04:00:00"
ntasks=200
walltime="00:35:00"
ntasks=3
Comment thread
aerorahul marked this conversation as resolved.
threads_per_task=1
tasks_per_node=$(( max_tasks_per_node / threads_per_task ))
export is_exclusive=True
Expand Down
1 change: 1 addition & 0 deletions parm/product/gfs.anl.paramlist.a.txt
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ HLCY:3000-0 m above ground
ICAHT:max wind
ICAHT:tropopause
ICETK:surface
ICETMP:surface
ICMR:50 mb
ICMR:1000 mb
ICMR:100 mb
Expand Down
2 changes: 2 additions & 0 deletions parm/product/gfs.f000.paramlist.a.txt
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,9 @@ HPBL:surface
ICAHT:max wind
ICAHT:tropopause
ICEC:surface
ICEG:10 m above mean sea level
ICETK:surface
ICETMP:surface
ICMR:50 mb
ICMR:1000 mb
ICMR:100 mb
Expand Down
2 changes: 2 additions & 0 deletions parm/product/gfs.fFFF.paramlist.a.txt
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,9 @@ HPBL:surface
ICAHT:max wind
ICAHT:tropopause
ICEC:surface
ICEG:10 m above mean sea level
ICETK:surface
ICETMP:surface
ICSEV:100 mb
ICSEV:150 mb
ICSEV:200 mb
Expand Down
2 changes: 1 addition & 1 deletion parm/wave/ww3_outp_bull.inp.tmpl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$ WAVEWATCH III Point output post-processing
$ ------------------------------------------
TIME DT 999
TIME DT 999 1 PREFIX
$
POINT
-1
Expand Down
2 changes: 1 addition & 1 deletion parm/wave/ww3_outp_spec.inp.tmpl
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
$ WAVEWATCH III Point output post-processing
$ ------------------------------------------
TIME DT 999
TIME DT 999 1 PREFIX
$
POINT
-1
Expand Down
8 changes: 1 addition & 7 deletions scripts/exgfs_wave_post_gridded_sbs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
#
# UNIX Script Documentation Block
# Script name: exgfs_wave_post_gridded_sbs.sh
# Script description: Creates output products from binary WW3 data
# Script description: Creates output products from gridded binary WW3 data
#
# Author: Jose-Henrique Alves Org: NCEP/EMC Date: 2019-12-06
# Abstract: This script is the postprocessor for the wave component in GFS.
# This version runs side-by-side with the GFS fcst step.
# It executes several scripts forpreparing and creating output data
Expand All @@ -15,11 +14,6 @@
# wave_grib2_sbs.sh : generates GRIB2 files.
# wave_grid_interp_ush.sh : interpolates data from new grids to old grids
#
# Script history log:
# 2019-12-06 J-Henrique Alves: First Version adapted from HTolman post.sh 2007
# 2020-06-10 J-Henrique Alves: Porting to R&D machine Hera
# 2020-07-31 Jessica Meixner: Removing points, now gridded data only
#
# COM inputs:
#
# Attributes:
Expand Down
Loading