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

Add unstructured grid for HR3/GFS #2230

Merged
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
97c2f2f
update code to a version that has unstructured grid features
JessicaMeixner-NOAA Jun 1, 2023
56ecf61
commit local changes from a few weeks ago
JessicaMeixner-NOAA Aug 1, 2023
a2b029e
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Aug 1, 2023
3f7d768
updates to get wave prep to run
JessicaMeixner-NOAA Aug 2, 2023
41828a2
change name of unstructured grid to be short enough for ww3
JessicaMeixner-NOAA Aug 2, 2023
c6a2117
update to s2s default
JessicaMeixner-NOAA Aug 10, 2023
6ee292d
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Aug 15, 2023
363f22a
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Aug 21, 2023
2bb3403
Merge branch 'NOAA-EMC:develop' into feature/unstructuredwave
JessicaMeixner-NOAA Aug 30, 2023
a5455f9
Merge branch 'NOAA-EMC:develop' into feature/unstructuredwave
JessicaMeixner-NOAA Sep 10, 2023
cba06b8
update to latest ufs weather model
JessicaMeixner-NOAA Sep 10, 2023
4d12bca
Merge branch 'NOAA-EMC:develop' into feature/unstructuredwave
JessicaMeixner-NOAA Sep 26, 2023
db78367
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Oct 27, 2023
f589da6
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Oct 31, 2023
672ca07
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Oct 31, 2023
90bea44
update version of ufs to have 7.0.4 of scotch on RDHPCS
JessicaMeixner-NOAA Oct 31, 2023
a739bf4
update commit hash of ufs-weather-model
JessicaMeixner-NOAA Nov 4, 2023
3c3c944
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Nov 4, 2023
46f5027
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Nov 7, 2023
04e8a04
updates for build
JessicaMeixner-NOAA Nov 8, 2023
2af2930
temp file
JessicaMeixner-NOAA Nov 8, 2023
1a2e782
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Nov 14, 2023
b390d43
updates for new unstructured grids
JessicaMeixner-NOAA Nov 15, 2023
23cc539
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Nov 15, 2023
acf0bf8
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Nov 16, 2023
1b3083f
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Nov 28, 2023
2214448
use UFS that has scotch 7.0.4 on WCOSS2
JessicaMeixner-NOAA Nov 28, 2023
5e48d67
temporary files added
JessicaMeixner-NOAA Dec 11, 2023
91ffd18
updates to run with C768 on wcoss2
JessicaMeixner-NOAA Dec 11, 2023
f537bb5
updates for wave configuration
JessicaMeixner-NOAA Dec 11, 2023
71341ff
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Dec 22, 2023
ee53c0a
update ufs model to code that was used in previous commit
JessicaMeixner-NOAA Dec 22, 2023
c189425
orion temp update
JessicaMeixner-NOAA Jan 3, 2024
6e15e10
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Jan 3, 2024
5ef97ea
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Jan 9, 2024
c729c07
updates
JessicaMeixner-NOAA Jan 10, 2024
457db36
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Jan 10, 2024
e7137d5
revert bypass of wave IC
JessicaMeixner-NOAA Jan 11, 2024
f6fc9ea
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Jan 16, 2024
3bfeafb
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredwave
JessicaMeixner-NOAA Jan 16, 2024
7b840b2
clean up for PR
JessicaMeixner-NOAA Jan 16, 2024
69dd261
attempt to fix shellcheck
JessicaMeixner-NOAA Jan 16, 2024
903ab13
shell check updates round 2
JessicaMeixner-NOAA Jan 16, 2024
223e49d
shell check round 3
JessicaMeixner-NOAA Jan 16, 2024
384a15e
update for shellcheck
JessicaMeixner-NOAA Jan 16, 2024
f3937f9
more shell check update attempts
JessicaMeixner-NOAA Jan 16, 2024
27e86c1
revert two files so that existing tests will work
JessicaMeixner-NOAA Jan 17, 2024
dc9932e
since tests only go up to C384, setting C768/C1152 to desired unstruc…
JessicaMeixner-NOAA Jan 17, 2024
bf6fe05
Merge branch 'NOAA-EMC:develop' into feature/unstructuredwavePR
JessicaMeixner-NOAA Jan 18, 2024
3d30ca4
Update scripts/exgfs_wave_init.sh
JessicaMeixner-NOAA Jan 18, 2024
df2a08a
Update scripts/exgfs_wave_init.sh
JessicaMeixner-NOAA Jan 18, 2024
0237687
Update scripts/exgfs_wave_init.sh
JessicaMeixner-NOAA Jan 18, 2024
3a17970
Update sorc/build_ufs.sh
JessicaMeixner-NOAA Jan 18, 2024
d606a48
Merge branch 'NOAA-EMC:develop' into feature/unstructuredwavePR
JessicaMeixner-NOAA Jan 19, 2024
f4a7377
fix reason of ci test failures
JessicaMeixner-NOAA Jan 19, 2024
2d7def5
Merge branch 'NOAA-EMC:develop' into feature/unstructuredwavePR
JessicaMeixner-NOAA Jan 19, 2024
42e7e00
lower task count so it runs out of box on hera
JessicaMeixner-NOAA Feb 9, 2024
9bfb15a
Merge remote-tracking branch 'EMC/develop' into feature/unstructuredw…
JessicaMeixner-NOAA Feb 9, 2024
98812ff
update build for unstructured waves
JessicaMeixner-NOAA Feb 9, 2024
99e17ed
all gfs wave grids need to be unstructured since we build with -w
JessicaMeixner-NOAA Feb 9, 2024
09fe8d5
Merge branch 'NOAA-EMC:develop' into feature/unstructuredwavePR
JessicaMeixner-NOAA Feb 12, 2024
176a511
Merge branch 'NOAA-EMC:develop' into feature/unstructuredwavePR
JessicaMeixner-NOAA Feb 13, 2024
f8ff6fa
Merge branch 'NOAA-EMC:develop' into feature/unstructuredwavePR
JessicaMeixner-NOAA Feb 13, 2024
23d91aa
Merge branch 'NOAA-EMC:develop' into feature/unstructuredwavePR
JessicaMeixner-NOAA Feb 14, 2024
5e5ce61
increased memory was required on wcoss2 for scout runs
JessicaMeixner-NOAA Feb 14, 2024
ec12026
update to HR3 ICs
JessicaMeixner-NOAA Feb 14, 2024
b32e46f
Update shell-based CI scripts
WalterKolczynski-NOAA Feb 14, 2024
fc546d9
updating ugwd fix file
JessicaMeixner-NOAA Feb 15, 2024
e836e44
Merge branch 'feature/unstructuredwavePR' of github.com:JessicaMeixne…
JessicaMeixner-NOAA Feb 15, 2024
799d942
Merge branch 'NOAA-EMC:develop' into feature/unstructuredwavePR
JessicaMeixner-NOAA Feb 15, 2024
d75d915
Merge branch 'NOAA-EMC:develop' into feature/unstructuredwavePR
JessicaMeixner-NOAA Feb 15, 2024
1514906
hera.intl to hera in gdas build all
JessicaMeixner-NOAA Feb 15, 2024
7c06061
fix typo, to turn off C48mx500_3DVarAOWCDA tests
JessicaMeixner-NOAA Feb 15, 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
Prev Previous commit
Next Next commit
updates for new unstructured grids
JessicaMeixner-NOAA committed Nov 15, 2023

Verified

This commit was signed with the committer’s verified signature.
frapell Franco Pellegrini
commit b390d43ef7ed779888b0d7b877105d8b98c3c99e
6 changes: 4 additions & 2 deletions parm/config/gfs/config.base.emc.dyn
Original file line number Diff line number Diff line change
@@ -41,7 +41,8 @@ export PACKAGEROOT="@PACKAGEROOT@" # TODO: set via prod_envir in Ops
export COMROOT="@COMROOT@" # TODO: set via prod_envir in Ops
export COMINsyn="@COMINsyn@"
export DMPDIR="@DMPDIR@"
export BASE_CPLIC="@BASE_CPLIC@"
#export BASE_CPLIC="@BASE_CPLIC@"
export BASE_CPLIC="/lfs/h2/emc/couple/noscrub/jessica.meixner/HR3/IC"

# USER specific paths
export HOMEDIR="@HOMEDIR@"
@@ -184,6 +185,7 @@ case "${CASE}" in
"C768" | "C1152")
export OCNRES=025
export waveGRD='mx025'
export waveGRD='uglo_20km'
;;
*)
echo "FATAL ERROR: Unrecognized CASE ${CASE}, ABORT!"
@@ -265,7 +267,7 @@ export FHMAX_GFS_12=120
export FHMAX_GFS_18=120
current_fhmax_var=FHMAX_GFS_${cyc}; declare -x FHMAX_GFS=${!current_fhmax_var}

export FHOUT_GFS=6 # Must be 6 for S2S until #1629 is addressed; 3 for ops
export FHOUT_GFS=3 # Must be 6 for S2S until #1629 is addressed; 3 for ops
export FHMAX_HF_GFS=0
export FHOUT_HF_GFS=1
if (( gfs_cyc != 0 )); then
8 changes: 4 additions & 4 deletions parm/config/gfs/config.stage_ic
Original file line number Diff line number Diff line change
@@ -21,10 +21,10 @@ case "${CASE}" in
export CPL_WAVIC=GEFSwave20210528v2_refactored
;;
"C768")
export CPL_ATMIC=HR2_refactored
export CPL_ICEIC=HR1_refactored
export CPL_OCNIC=HR1_refactored
export CPL_WAVIC=HR1_refactored
export CPL_ATMIC=TestHR23_768
export CPL_ICEIC=TestHR23_768
export CPL_OCNIC=TestHR23_768
export CPL_WAVIC=TestHR23_768
;;
"C1152")
export CPL_ATMIC=HR2_C1152_refactored
15 changes: 14 additions & 1 deletion parm/config/gfs/config.ufs
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ if [ $# -le 1 ]; then
echo "--fv3 C48|C96|C192|C384|C768|C1152|C3072"
echo "--mom6 500|100|025"
echo "--cice6 500|100|025"
echo "--ww3 gnh_10m;aoc_9km;gsh_15m|gwes_30m|glo_025|glo_200|glo_500|mx025|uglo_100km"
echo "--ww3 gnh_10m;aoc_9km;gsh_15m|gwes_30m|glo_025|glo_200|glo_500|mx025|uglo_100km|uglo_20km|uglo_15km|uglo_m1g16"

exit 1

@@ -410,6 +410,19 @@ if [[ "${skip_ww3}" == "false" ]]; then
;;
"uglo_100km")
ntasks_ww3=40
nthreads_ww3=1
;;
"uglo_20km")
ntasks_ww3=500
nthreads_ww3=1
;;
"uglo_15km")
ntasks_ww3=900
nthreads_ww3=1
;;
"uglo_m1g16")
ntasks_ww3=900
nthreads_ww3=1
;;
*)
echo "FATAL ERROR: Unsupported WW3 resolution = ${ww3_res}, ABORT!"
20 changes: 19 additions & 1 deletion parm/config/gfs/config.wave
Original file line number Diff line number Diff line change
@@ -86,7 +86,25 @@ case "${waveGRD}" in
export wavepostGRD=''
export waveuoutpGRD=${waveGRD}
;;
*)
"uglo_20km")
#unstructured 20km grid
export waveinterpGRD='glo_15mxt'
export wavepostGRD=''
export waveuoutpGRD=${waveGRD}
;;
"uglo_15km")
#unstructured 15km grid
export waveinterpGRD='glo_15mxt'
export wavepostGRD=''
export waveuoutpGRD=${waveGRD}
;;
"uglo_m1v16")
#unstructured m1v16 grid
export waveinterpGRD='glo_15mxt'
export wavepostGRD=''
export waveuoutpGRD=${waveGRD}
;;
*)
echo "FATAL ERROR: No grid specific wave config values exist for ${waveGRD}. Aborting."
exit 1
;;
2 changes: 1 addition & 1 deletion parm/ufs/fv3/diag_table
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"fv3_history", 0, "hours", 1, "hours", "time"
"fv3_history2d", 0, "hours", 1, "hours", "time"
"ocn%4yr%2mo%2dy%2hr", 6, "hours", 1, "hours", "time", 6, "hours", "1901 1 1 0 0 0"
"ocn%4yr%2mo%2dy%2hr", 3, "hours", 1, "hours", "time", 3, "hours", "1901 1 1 0 0 0"
"ocn_daily%4yr%2mo%2dy", 1, "days", 1, "days", "time", 1, "days", "1901 1 1 0 0 0"

##############
8 changes: 4 additions & 4 deletions scripts/exglobal_stage_ic.sh
Original file line number Diff line number Diff line change
@@ -100,10 +100,10 @@ for MEMDIR in "${MEMDIR_ARRAY[@]}"; do
for grdID in ${waveGRD}; do # TODO: check if this is a bash array; if so adjust
src="${BASE_CPLIC}/${CPL_WAVIC}/${PDY}${cyc}/${MEMDIR}/wave/${PDY}.${cyc}0000.restart.${grdID}"
tgt="${COM_WAVE_RESTART}/${PDY}.${cyc}0000.restart.${grdID}"
${NCP} "${src}" "${tgt}"
rc=$?
((rc != 0)) && error_message "${src}" "${tgt}" "${rc}"
err=$((err + rc))
#${NCP} "${src}" "${tgt}"
#rc=$?
#((rc != 0)) && error_message "${src}" "${tgt}" "${rc}"
#err=$((err + rc))
done
fi

2 changes: 1 addition & 1 deletion workflow/coupled48.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
APP=S2SW
PSLOT=s2swc48un01
BASEDIR=/work2/noaa/marine/jmeixner/HR3/unstruc
BASEDIR=/lfs/h2/emc/couple/noscrub/jessica.meixner/HR3/unstruc01
CDUMP=gfs #gfs or gefs
CONFIGDIR=$BASEDIR/global-workflow/parm/config/${CDUMP}
IDATE=2021032312
26 changes: 26 additions & 0 deletions workflow/coupled768.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
APP=S2SW
PSLOT=u20kmt03
BASEDIR=/lfs/h2/emc/couple/noscrub/jessica.meixner/HR3/unstruc01
CDUMP=gfs #gfs or gefs
CONFIGDIR=$BASEDIR/global-workflow/parm/config/${CDUMP}
IDATE=2019120300
EDATE=${IDATE}
RES=768
GFS_CYC=1
COMROT=$BASEDIR/$PSLOT/COMROOT
EXPDIR=$BASEDIR/$PSLOT/EXPDIR

echo "Set Up Modules:"
echo "source gw_setup.sh"
echo "set +u"

echo " "
echo "Set up script"
echo ./setup_expt.py ${CDUMP} forecast-only --app $APP --pslot $PSLOT --configdir $CONFIGDIR --idate $IDATE --edate $EDATE --res $RES --gfs_cyc $GFS_CYC --comrot $COMROT --expdir $EXPDIR

echo " "
echo "setup workflow after any changes:"
echo "./setup_xml.py $EXPDIR/$PSLOT"

echo " "
echo "cat $EXPDIR/$PSLOT/$PSLOT.crontab"