Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Free-forecast integration with chgres_cube and resolve know mode bugs #342

Merged
merged 46 commits into from
Jun 17, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
a7391d7
Update free-forecast mode chgres jobs for chgres_cube
KateFriedman-NOAA Jan 28, 2021
b251164
Add missing component subfolder to fcst dependency
KateFriedman-NOAA Jan 29, 2021
abdc133
Further init updates for free-forecast mode
KateFriedman-NOAA Feb 3, 2021
b414ea3
Merge remote-tracking branch 'upstream/develop' into issue178
KateFriedman-NOAA Feb 3, 2021
ed74d83
Adjustments for Orion, dependencies, and using DATA folder
KateFriedman-NOAA Feb 4, 2021
7a34968
Small adjustments from testing
KateFriedman-NOAA Feb 4, 2021
613a181
Adjusting from testing
KateFriedman-NOAA Feb 4, 2021
77d7408
Move GFSv16 version date and set C96 to use 4 threads
KateFriedman-NOAA Feb 9, 2021
10ed5f1
Add wave jobs to arch job dependencies
KateFriedman-NOAA Feb 9, 2021
1816067
Updates for archival, NSST, and v16 retros
KateFriedman-NOAA Feb 12, 2021
d32199c
Move getic/init settings from scripts to configs
KateFriedman-NOAA Mar 4, 2021
be0ed38
Consolidate/cleanup init config and script
KateFriedman-NOAA Mar 4, 2021
efdf917
Update in wave prep script and add ability to pull warm starts
KateFriedman-NOAA Mar 5, 2021
86b0345
Add pull of IAU increment files off HPSS for free-forecast
KateFriedman-NOAA Mar 8, 2021
364e46f
Add pull of gdas wave restart files in getic.sh if DO_WAVE=YES
KateFriedman-NOAA Mar 9, 2021
370e814
Merge remote-tracking branch 'upstream/develop' into issue178
KateFriedman-NOAA Mar 9, 2021
fcd720e
Remove unneeded UFS_UTILS symlinks in link_fv3gfs.sh
KateFriedman-NOAA Mar 9, 2021
4f7243b
Remove global_chgres exec from link_fv3gfs.sh; no longer exists from …
KateFriedman-NOAA Mar 9, 2021
5c77500
Add exit in init.sh when C768 v16 warm starts detected
KateFriedman-NOAA Mar 22, 2021
f35e609
Merge remote-tracking branch 'upstream/develop' into issue178
KateFriedman-NOAA Mar 22, 2021
48ea7ab
Low resolution resource adjustments
KateFriedman-NOAA Apr 12, 2021
6b6b9ed
getic and init job updates for v16 in ops
KateFriedman-NOAA Apr 12, 2021
5ec376b
Merge remote-tracking branch 'origin/develop' into issue178
KateFriedman-NOAA May 19, 2021
005d33d
Merge branch 'NOAA-EMC:develop' into issue178
KateFriedman-NOAA May 24, 2021
151e0b5
Correct if-statement syntax in config.init
KateFriedman-NOAA May 25, 2021
824ff72
Change UFS_UTILS version to feature branch for testing
KateFriedman-NOAA May 25, 2021
499f217
Resolve bug in wavepostpnt jobs when DOBLL_WAV=NO
KateFriedman-NOAA Jun 1, 2021
127723a
getic job updates to add OPS_RES variable and pull from operational t…
KateFriedman-NOAA Jun 1, 2021
e62cefb
Correct gdas operational tarball name in getic job script
KateFriedman-NOAA Jun 1, 2021
69ac287
Merge branch 'NOAA-EMC:develop' into issue178
KateFriedman-NOAA Jun 2, 2021
f0afb91
Change BDATE to GDATE in getic.sh
KateFriedman-NOAA Jun 2, 2021
e2ac587
Update WCOSS-Dell section of machine-setup.sh
KateFriedman-NOAA Jun 2, 2021
771782f
Replace Orion checks with hpssarch checks for getic job
KateFriedman-NOAA Jun 3, 2021
bfb0a33
Remove RUN_CCPP option, force CCPP now
KateFriedman-NOAA Jun 3, 2021
fe448ff
Set DO_WAVE to NO
KateFriedman-NOAA Jun 3, 2021
1cdc2a4
Add cmake module load to Hera block in machine-setup.sh
KateFriedman-NOAA Jun 8, 2021
898a43f
Adjust getic/init job scripts
KateFriedman-NOAA Jun 8, 2021
4c858c0
Adjust comments in getic job script
KateFriedman-NOAA Jun 8, 2021
b52d2f0
Update UFS_UTILS checkout to ufs_utils_1_4_0 tag
KateFriedman-NOAA Jun 8, 2021
18970c7
Disconnect archive job in workflow from HPSS access check
KateFriedman-NOAA Jun 9, 2021
30aefb1
Update/fix pull of v14/v15 pgrb2 anl files in getic job
KateFriedman-NOAA Jun 10, 2021
db18627
Increase init job walltime to 30 mins from 15 mins
KateFriedman-NOAA Jun 10, 2021
37e7c2e
Add OPS_RES variable to init script
KateFriedman-NOAA Jun 10, 2021
65ff48e
Add v16 pgb anl pull to getic script
KateFriedman-NOAA Jun 10, 2021
921838f
Remove old compile command from build_fv3.sh
KateFriedman-NOAA Jun 16, 2021
fba8cef
Remove wave restart pull in getic script
KateFriedman-NOAA Jun 16, 2021
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
6 changes: 2 additions & 4 deletions env/HERA.env
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,9 @@ elif [ $step = "epos" ]; then
[[ $NTHREADS_EPOS -gt $nth_max ]] && export NTHREADS_EPOS=$nth_max
export APRUN_EPOS="$launcher"

elif [ $step = "fv3ic" ]; then
elif [ $step = "init" ]; then

export NTHREADS_CHGRES=${nth_chgres:-$npe_node_max}
[[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
export APRUN_CHGRES="time"
export APRUN="$launcher"

elif [ $step = "postsnd" ]; then

Expand Down
6 changes: 2 additions & 4 deletions env/JET.env
Original file line number Diff line number Diff line change
Expand Up @@ -179,11 +179,9 @@ elif [ $step = "epos" ]; then
[[ $NTHREADS_EPOS -gt $nth_max ]] && export NTHREADS_EPOS=$nth_max
export APRUN_EPOS="$launcher ${npe_epos:-$PBS_NP}"

elif [ $step = "fv3ic" ]; then
elif [ $step = "init" ]; then

export NTHREADS_CHGRES=${nth_chgres:-$npe_node_max}
[[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
export APRUN_CHGRES="time"
export APRUN="$launcher"

elif [ $step = "postsnd" ]; then

Expand Down
6 changes: 2 additions & 4 deletions env/ORION.env
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,9 @@ elif [ $step = "epos" ]; then
[[ $NTHREADS_EPOS -gt $nth_max ]] && export NTHREADS_EPOS=$nth_max
export APRUN_EPOS="$launcher"

elif [ $step = "fv3ic" ]; then
elif [ $step = "init" ]; then

export NTHREADS_CHGRES=${nth_chgres:-$npe_node_max}
[[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
export APRUN_CHGRES="time"
export APRUN="$launcher"

elif [ $step = "postsnd" ]; then

Expand Down
6 changes: 2 additions & 4 deletions env/WCOSS_C.env
Original file line number Diff line number Diff line change
Expand Up @@ -198,11 +198,9 @@ elif [ $step = "epos" ]; then
[[ $NTHREADS_EPOS -gt $nth_max ]] && export NTHREADS_EPOS=$nth_max
export APRUN_EPOS="$launcher -j 1 -n $npe_epos -N $npe_node_epos -d $NTHREADS_EPOS -cc depth"

elif [ $step = "fv3ic" ]; then
elif [ $step = "init" ]; then

export NTHREADS_CHGRES=${nth_chgres:-$npe_node_max}
[[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
export APRUN_CHGRES="$launcher -j 1 -n 1 -N 1 -d $NTHREADS_CHGRES -cc depth"
export APRUN="$launcher"

elif [ $step = "vrfy" ]; then

Expand Down
6 changes: 2 additions & 4 deletions env/WCOSS_DELL_P3.env
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,9 @@ elif [ $step = "epos" ]; then
[[ $NTHREADS_EPOS -gt $nth_max ]] && export NTHREADS_EPOS=$nth_max
export APRUN_EPOS="$launcher ${npe_epos:-$PBS_NP}"

elif [ $step = "fv3ic" ]; then
elif [ $step = "init" ]; then

export NTHREADS_CHGRES=${nth_chgres:-$npe_node_max}
[[ $NTHREADS_CHGRES -gt $npe_node_max ]] && export NTHREADS_CHGRES=$npe_node_max
export APRUN_CHGRES="time"
export APRUN="mpirun"

elif [ $step = "postsnd" ]; then

Expand Down
4 changes: 4 additions & 0 deletions jobs/JGLOBAL_WAVE_PREP
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ else
if [ ! -L $ROTDIR/${WAVECUR_DID}.${RPDY} ]; then # Check if symlink already exists in ROTDIR
$NLN $DMPDIR/${WAVECUR_DID}.${RPDY} $ROTDIR/${WAVECUR_DID}.${RPDY}
fi
BRPDY=`$NDATE -24 ${RPDY}00 | cut -c1-8`
if [ ! -L $ROTDIR/${WAVECUR_DID}.${BRPDY} ]; then # Check if symlink already exists in ROTDIR
$NLN $DMPDIR/${WAVECUR_DID}.${BRPDY} $ROTDIR/${WAVECUR_DID}.${BRPDY}
fi
if [ ! -L $ROTDIR/${CDUMP}.${PDY}/${cyc}/atmos/${WAVICEFILE} ]; then # Check if symlink already exists in ROTDIR
$NLN $DMPDIR/$CDUMP.${PDY}/$cyc/${WAVICEFILE} $ROTDIR/$CDUMP.${PDY}/$cyc/atmos/${WAVICEFILE}
fi
Expand Down
8 changes: 7 additions & 1 deletion jobs/rocoto/arch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,13 @@ if [ $CDUMP = "gfs" ]; then

#for targrp in gfs_flux gfs_netcdf/nemsio gfs_pgrb2b; do
if [ ${SAVEFCSTNEMSIO:-"YES"} = "YES" ]; then
for targrp in gfs_flux gfs_${format}a gfs_${format}b gfs_pgrb2b; do
if [ $MODE = "cycled" ]; then
targrp_list=`gfs_flux gfs_${format}a gfs_${format}b gfs_pgrb2b`
elif [ $MODE = "free" ]; then
targrp_list=`gfs_flux gfs_${format}b gfs_pgrb2b`
fi
#for targrp in gfs_flux gfs_${format}a gfs_${format}b gfs_pgrb2b; do
for targrp in $targrp_list; do
htar -P -cvf $ATARDIR/$CDATE/${targrp}.tar `cat $ARCH_LIST/${targrp}.txt`
status=$?
if [ $status -ne 0 -a $CDATE -ge $firstday ]; then
Expand Down
69 changes: 0 additions & 69 deletions jobs/rocoto/fv3ic.sh

This file was deleted.

Loading