Skip to content

Commit

Permalink
Update component versions
Browse files Browse the repository at this point in the history 
Updates the version of components except UFS and verify to the current tip
of their repsective develop branches.

Verify is not yet updated because we are currently on a branch that hasn't
been merged to develop yet in order to use the module/py environment fix.

GSI will still need to be updated further before use after the resolution
of NOAA-EMC/GSI/issues/348 and NOAA-EMC/GSI/issues/408

Refs: NOAA-EMC#761
  • Loading branch information
@WalterKolczynski-NOAA
WalterKolczynski-NOAA committed Jun 13, 2022
1 parent 59604d6 commit 0f8bb4c
Show file tree
Hide file tree
Showing 6 changed files with 67 additions and 29 deletions.
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ fix/wafs
parm/config/config.base
parm/gldas
parm/mon
parm/post/AEROSOL_LUTS.datoptics_luts_DUST.dat
parm/post/AEROSOL_LUTS.dat
parm/post/optics_luts_DUST.dat
parm/post/gtg.config.gfs
parm/post/gtg_imprintings.txt
parm/post/optics_luts_SALT.dat
Expand Down
8 changes: 5 additions & 3 deletions sorc/build_all.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,16 @@ function _usage() {
}

_build_ufs_opt=""
_ops_opt=""
_verbose_opt=""
# Reset option counter in case this script is sourced
OPTIND=1
while getopts ":a:c:hv" option; do
while getopts ":a:c:hov" option; do
case "${option}" in
a) _build_ufs_opt+="-a ${OPTARG} ";;
c) _partial_opt+="-c ${OPTARG} ";;
h) _usage;;
o) _ops_opt+="-o";;
# s) _build_ufs_opt+="-s ${OPTARG} ";;
v) _verbose_opt="-v";;
\?)
Expand Down Expand Up @@ -123,7 +125,7 @@ $Build_ufs_model && {
#------------------------------------
$Build_gsi && {
echo " .... Building gsi .... "
./build_gsi.sh $_verbose_opt > $logs_dir/build_gsi.log 2>&1
./build_gsi.sh $_ops_opt $_verbose_opt > $logs_dir/build_gsi.log 2>&1
rc=$?
if [[ $rc -ne 0 ]] ; then
echo "Fatal error in building gsi."
Expand All @@ -137,7 +139,7 @@ $Build_gsi && {
#------------------------------------
$Build_upp && {
echo " .... Building UPP .... "
./build_upp.sh $_verbose_opt > $logs_dir/build_upp.log 2>&1
./build_upp.sh $_ops_opt $_verbose_opt > $logs_dir/build_upp.log 2>&1
rc=$?
if [[ $rc -ne 0 ]] ; then
echo "Fatal error in building UPP."
Expand Down
24 changes: 20 additions & 4 deletions sorc/build_gsi.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,33 @@ set -eux
source ./machine-setup.sh > /dev/null 2>&1
cwd=$(pwd)

gsitarget=$target
[[ "$target" == wcoss_cray ]] && gsitarget=cray
OPTIND=1
while getopts ":dov" option; do
case "${option}" in
d) export BUILD_TYPE="DEBUG";;
o) _ops="YES";;
v) export BUILD_VERBOSE="YES";;
\?)
echo "[$BASH_SOURCE]: Unrecognized option: ${option}"
usage
;;
:)
echo "[$BASH_SOURCE]: ${option} requires an argument"
usage
;;
esac
done
shift $((OPTIND-1))

# Check final exec folder exists
if [ ! -d "../exec" ]; then
mkdir ../exec
fi

cd gsi.fd/ush/
./build_all_cmake.sh "PRODUCTION" "$cwd/gsi.fd"
##./build_all_cmake.sh "PRODUCTION" "$cwd/gsi.fd" "NCO" # use this line for pruned NCO install
export GSI_MODE="GFS"
export REGRESSION_TESTS="NO"
./build.sh "$cwd/gsi.fd"

exit

21 changes: 20 additions & 1 deletion sorc/build_upp.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,29 @@ set -eux
source ./machine-setup.sh > /dev/null 2>&1
cwd=$(pwd)

OPTIND=1
_opts=""
while getopts ":dov" option; do
case "${option}" in
d) export BUILD_TYPE="DEBUG";;
o) _opts+="-g";;
v) _opts+="-v";;
\?)
echo "[$BASH_SOURCE]: Unrecognized option: ${option}"
usage
;;
:)
echo "[$BASH_SOURCE]: ${option} requires an argument"
usage
;;
esac
done
shift $((OPTIND-1))

# Check final exec folder exists
if [ ! -d "../exec" ]; then
mkdir ../exec
fi

cd ufs_model.fd/FV3/upp/tests
./compile_upp.sh
./compile_upp.sh ${_opts}
8 changes: 4 additions & 4 deletions sorc/checkout.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,13 +131,13 @@ mkdir -p ${logdir}
# The checkout version should always be a speciifc commit (hash or tag), not a branch
errs=0
checkout "ufs_model.fd" "https://github.com/ufs-community/ufs-weather-model" "${ufs_model_hash:-Prototype-P8c}"; errs=$((errs + $?))
checkout "gsi.fd" "https://github.com/NOAA-EMC/GSI.git" "a62dec6" ; errs=$((errs + $?))
checkout "gldas.fd" "https://github.com/NOAA-EMC/GLDAS.git" "gldas_gfsv16_release.v.1.28.0" ; errs=$((errs + $?))
checkout "ufs_utils.fd" "https://github.com/ufs-community/UFS_UTILS.git" "04ad17e" ; errs=$((errs + $?))
checkout "gsi.fd" "https://github.com/NOAA-EMC/GSI.git" "1f6d3aa" ; errs=$((errs + $?))
checkout "gldas.fd" "https://github.com/NOAA-EMC/GLDAS.git" "e8b42da" ; errs=$((errs + $?))
checkout "ufs_utils.fd" "https://github.com/ufs-community/UFS_UTILS.git" "a2b0817" ; errs=$((errs + $?))
checkout "verif-global.fd" "https://github.com/NOAA-EMC/EMC_verif-global.git" "c267780" ; errs=$((errs + $?))

if [[ "${checkout_wafs:-NO}" == "YES" ]]; then
checkout "gfs_wafs.fd" "https://github.com/NOAA-EMC/EMC_gfs_wafs.git" "c2a29a6"; errs=$((errs + $?))
checkout "gfs_wafs.fd" "https://github.com/NOAA-EMC/EMC_gfs_wafs.git" "014a0b8"; errs=$((errs + $?))
fi

if [[ "${checkout_gtg:-NO}" == "YES" ]]; then
Expand Down
32 changes: 16 additions & 16 deletions sorc/link_workflow.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ cd ${pwd}/../parm/post ||exit 8
postxconfig-NT-GFS-GOES.txt postxconfig-NT-GFS-TWO.txt postxconfig-NT-GFS-WAFS-ANL.txt postxconfig-NT-GFS-WAFS.txt \
postxconfig-NT-GFS.txt postxconfig-NT-gefs-aerosol.txt postxconfig-NT-gefs-chem.txt params_grib2_tbl_new \
post_tag_gfs128 post_tag_gfs65 gtg.config.gfs gtg_imprintings.txt \
AEROSOL_LUTS.datoptics_luts_DUST.dat optics_luts_SALT.dat optics_luts_SOOT.dat optics_luts_SUSO.dat optics_luts_WASO.dat \
AEROSOL_LUTS.dat optics_luts_DUST.dat optics_luts_SALT.dat optics_luts_SOOT.dat optics_luts_SUSO.dat optics_luts_WASO.dat \
; do
$LINK ../../sorc/upp.fd/parm/$file .
done
Expand Down Expand Up @@ -176,36 +176,36 @@ cd ${pwd}/../fix ||exit 8
[[ -d gdas ]] && rm -rf gdas
mkdir -p gdas
cd gdas
$LINK ../../sorc/gsi.fd/util/Minimization_Monitor/nwprod/gdas.v1.0.0/fix/gdas_minmon_cost.txt .
$LINK ../../sorc/gsi.fd/util/Minimization_Monitor/nwprod/gdas.v1.0.0/fix/gdas_minmon_gnorm.txt .
$LINK ../../sorc/gsi.fd/util/Minimization_Monitor/nwprod/gdas/fix/gdas_minmon_cost.txt .
$LINK ../../sorc/gsi.fd/util/Minimization_Monitor/nwprod/gdas/fix/gdas_minmon_gnorm.txt .
$LINK ../../sorc/gsi.fd/util/Ozone_Monitor/nwprod/gdas_oznmon/fix/gdas_oznmon_base.tar .
$LINK ../../sorc/gsi.fd/util/Ozone_Monitor/nwprod/gdas_oznmon/fix/gdas_oznmon_satype.txt .
$LINK ../../sorc/gsi.fd/util/Radiance_Monitor/nwprod/gdas_radmon/fix/gdas_radmon_base.tar .
$LINK ../../sorc/gsi.fd/util/Radiance_Monitor/nwprod/gdas_radmon/fix/gdas_radmon_satype.txt .
$LINK ../../sorc/gsi.fd/util/Radiance_Monitor/nwprod/gdas_radmon/fix/gdas_radmon_scaninfo.txt .
cd ${pwd}/../jobs ||exit 8
$LINK ../sorc/gsi.fd/util/Minimization_Monitor/nwprod/gdas.v1.0.0/jobs/JGDAS_ATMOS_VMINMON .
$LINK ../sorc/gsi.fd/util/Minimization_Monitor/nwprod/gfs.v1.0.0/jobs/JGFS_ATMOS_VMINMON .
$LINK ../sorc/gsi.fd/util/Minimization_Monitor/nwprod/gdas/jobs/JGDAS_ATMOS_VMINMON .
$LINK ../sorc/gsi.fd/util/Minimization_Monitor/nwprod/gfs/jobs/JGFS_ATMOS_VMINMON .
$LINK ../sorc/gsi.fd/util/Ozone_Monitor/nwprod/gdas_oznmon/jobs/JGDAS_ATMOS_VERFOZN .
$LINK ../sorc/gsi.fd/util/Radiance_Monitor/nwprod/gdas_radmon/jobs/JGDAS_ATMOS_VERFRAD .
cd ${pwd}/../parm ||exit 8
[[ -d mon ]] && rm -rf mon
mkdir -p mon
cd mon
$LINK ../../sorc/gsi.fd/util/Radiance_Monitor/nwprod/gdas_radmon/parm/gdas_radmon.parm da_mon.parm
# $LINK ../../sorc/gsi.fd/util/Minimization_Monitor/nwprod/gdas.v1.0.0/parm/gdas_minmon.parm .
# $LINK ../../sorc/gsi.fd/util/Minimization_Monitor/nwprod/gfs.v1.0.0/parm/gfs_minmon.parm .
# $LINK ../../sorc/gsi.fd/util/Minimization_Monitor/nwprod/gdas/parm/gdas_minmon.parm .
# $LINK ../../sorc/gsi.fd/util/Minimization_Monitor/nwprod/gfs/parm/gfs_minmon.parm .
$LINK ../../sorc/gsi.fd/util/Ozone_Monitor/nwprod/gdas_oznmon/parm/gdas_oznmon.parm .
# $LINK ../../sorc/gsi.fd/util/Radiance_Monitor/nwprod/gdas_radmon/parm/gdas_radmon.parm .
# $LINK ../../sorc/gsi.fd/util/Radiance_Monitor/nwprod/gdas_radmon/parm/gdas_radmon.parm .
cd ${pwd}/../scripts ||exit 8
$LINK ../sorc/gsi.fd/util/Minimization_Monitor/nwprod/gdas.v1.0.0/scripts/exgdas_atmos_vminmon.sh .
$LINK ../sorc/gsi.fd/util/Minimization_Monitor/nwprod/gfs.v1.0.0/scripts/exgfs_atmos_vminmon.sh .
$LINK ../sorc/gsi.fd/util/Minimization_Monitor/nwprod/gdas/scripts/exgdas_atmos_vminmon.sh .
$LINK ../sorc/gsi.fd/util/Minimization_Monitor/nwprod/gfs/scripts/exgfs_atmos_vminmon.sh .
$LINK ../sorc/gsi.fd/util/Ozone_Monitor/nwprod/gdas_oznmon/scripts/exgdas_atmos_verfozn.sh .
$LINK ../sorc/gsi.fd/util/Radiance_Monitor/nwprod/gdas_radmon/scripts/exgdas_atmos_verfrad.sh .
cd ${pwd}/../ush ||exit 8
$LINK ../sorc/gsi.fd/util/Minimization_Monitor/nwprod/minmon_shared.v1.0.1/ush/minmon_xtrct_costs.pl .
$LINK ../sorc/gsi.fd/util/Minimization_Monitor/nwprod/minmon_shared.v1.0.1/ush/minmon_xtrct_gnorms.pl .
$LINK ../sorc/gsi.fd/util/Minimization_Monitor/nwprod/minmon_shared.v1.0.1/ush/minmon_xtrct_reduct.pl .
$LINK ../sorc/gsi.fd/util/Minimization_Monitor/nwprod/minmon_shared/ush/minmon_xtrct_costs.pl .
$LINK ../sorc/gsi.fd/util/Minimization_Monitor/nwprod/minmon_shared/ush/minmon_xtrct_gnorms.pl .
$LINK ../sorc/gsi.fd/util/Minimization_Monitor/nwprod/minmon_shared/ush/minmon_xtrct_reduct.pl .
$LINK ../sorc/gsi.fd/util/Ozone_Monitor/nwprod/oznmon_shared/ush/ozn_xtrct.sh .
$LINK ../sorc/gsi.fd/util/Radiance_Monitor/nwprod/radmon_shared/ush/radmon_ck_stdout.sh .
$LINK ../sorc/gsi.fd/util/Radiance_Monitor/nwprod/radmon_shared/ush/radmon_err_rpt.sh .
Expand Down Expand Up @@ -258,11 +258,11 @@ for ufs_utilsexe in \
done

for gsiexe in calc_analysis.x calc_increment_ens_ncio.x calc_increment_ens.x \
getsfcensmeanp.x getsigensmeanp_smooth.x getsigensstatp.x global_enkf.x global_gsi.x \
interp_inc.x ncdiag_cat.x oznmon_horiz.x oznmon_time.x radmon_angle.x \
getsfcensmeanp.x getsigensmeanp_smooth.x getsigensstatp.x enkf.x gsi.x \
interp_inc.x nc_diag_cat.x oznmon_horiz.x oznmon_time.x radmon_angle.x \
radmon_bcoef.x radmon_bcor.x radmon_time.x recentersigp.x;do
[[ -s $gsiexe ]] && rm -f $gsiexe
$LINK ../sorc/gsi.fd/exec/$gsiexe .
$LINK ../sorc/gsi.fd/install/bin/$gsiexe .
done

for gldasexe in gdas2gldas gldas2gdas gldas_forcing gldas_model gldas_post gldas_rst; do
Expand Down

0 comments on commit 0f8bb4c

Please sign in to comment.