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.

Sign up for GitHub

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

Jump to bottom

GFSv16.3.0 updates for GSI tag, resources, versions, and WAFS CFP #983

Merged
merged 8 commits into from
Aug 18, 2022
Merged

GFSv16.3.0 updates for GSI tag, resources, versions, and WAFS CFP #983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d24c1a7
Update GSI tag to gfsda.v16.3.0
KateFriedman-NOAA Aug 18, 2022
6f11c64
Update obsproc version to v1.1.0
KateFriedman-NOAA Aug 18, 2022
21754b3
Update CRTM version to 2.4.0
KateFriedman-NOAA Aug 18, 2022
7d94cb1
Merge remote-tracking branch 'upstream/release/gfs.v16.3.0' into rele…
KateFriedman-NOAA Aug 18, 2022
d75b622
Incorporate ecf script resource updates in configs
KateFriedman-NOAA Aug 18, 2022
f4d9cd0
Update WAFS rocoto scripts for USE_CFP
KateFriedman-NOAA Aug 18, 2022
d606f8b
Add wafsgrib2 block to Hera/Orion env files
KateFriedman-NOAA Aug 18, 2022
acba477
Update obsproc_run_ver in target version files
KateFriedman-NOAA Aug 18, 2022
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 Externals.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ protocol = git
required = True

[GSI]
tag = gfsda.v16.2.0
tag = gfsda.v16.3.0
local_path = sorc/gsi.fd
repo_url = https://github.com/NOAA-EMC/GSI.git
protocol = git
Expand Down
6 changes: 3 additions & 3 deletions ecf/versions/obsproc.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export gfs_ver="v16.2"
export obsproc_ver="1.0.2"
export gfs_ver="v16.3"
export obsproc_ver="1.1.0"
export envvars_ver="1.0"
export PrgEnv_intel_ver=8.1.0
export intel_ver=19.1.3.304
Expand Down Expand Up @@ -28,4 +28,4 @@ export PROCESS_MASTER_SHIP_STNLST=NO # turn off the ship/names/stn_l
export PATH=$PATH:.
export BACK=off

export HOMEobsproc="/lfs/h2/emc/global/save/emc.global/git/obsproc/v${obsproc_ver}"
export HOMEobsproc="/lfs/h1/ops/prod/packages/obsproc.v${obsproc_ver}"
5 changes: 5 additions & 0 deletions env/HERA.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,4 +229,9 @@ elif [ $step = "awips" ]; then
elif [ $step = "gempak" ]; then

echo "WARNING: $step is not enabled on $machine!"

elif [ $step = "wafsgrib2" -o $step = "wafsgrib20p25" ]; then

export USE_CFP=${USE_CFP:-"YES"}

fi
5 changes: 5 additions & 0 deletions env/ORION.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,4 +230,9 @@ elif [ $step = "awips" ]; then
elif [ $step = "gempak" ]; then

echo "WARNING: $step is not enabled on $machine!"

elif [ $step = "wafsgrib2" -o $step = "wafsgrib20p25" ]; then

export USE_CFP=${USE_CFP:-"YES"}

fi
4 changes: 4 additions & 0 deletions env/WCOSS2.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,4 +203,8 @@ elif [ $step = "waveawipsbulls" ]; then

unset PERL5LIB

elif [ $step = "wafsgrib2" -o $step = "wafsgrib20p25" ]; then

export USE_CFP=${USE_CFP:-"YES"}

fi
7 changes: 7 additions & 0 deletions jobs/rocoto/wafsgrib2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ for config in $configs; do
[[ $status -ne 0 ]] && exit $status
done

##########################################
# Source machine runtime environment
##########################################
. $HOMEgfs/env/${machine}.env wafsgrib2
status=$?
[[ $status -ne 0 ]] && exit $status

###############################################################

export DATAROOT="$RUNDIR/$CDATE/$CDUMP/wafsgrib2"
Expand Down
7 changes: 7 additions & 0 deletions jobs/rocoto/wafsgrib20p25.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ for config in $configs; do
[[ $status -ne 0 ]] && exit $status
done

##########################################
# Source machine runtime environment
##########################################
. $HOMEgfs/env/${machine}.env wafsgrib20p25
status=$?
[[ $status -ne 0 ]] && exit $status

###############################################################

export DATAROOT="$RUNDIR/$CDATE/$CDUMP/wafsgrib20p25"
Expand Down
5 changes: 3 additions & 2 deletions parm/config/config.resources.emc.dyn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ elif [ $step = "waveprep" ]; then
export npe_node_waveprep=$npe_waveprep
export npe_node_waveprep_gfs=$npe_waveprep_gfs
export memory_waveprep="100GB"
export memory_waveprep_gfs="200GB"
export memory_waveprep_gfs="220GB"
export NTASKS=$npe_waveprep
export NTASKS_gfs=$npe_waveprep_gfs

Expand Down Expand Up @@ -128,6 +128,7 @@ elif [ $step = "waveawipsgridded" ]; then
export nth_waveawipsgridded=1
export npe_node_waveawipsgridded=$(echo "$npe_node_max / $nth_waveawipsgridded" | bc)
export NTASKS=$npe_waveawipsgridded
export memory_waveawipsgridded_gfs="2GB"

elif [ $step = "anal" ]; then

Expand Down Expand Up @@ -334,7 +335,7 @@ elif [ $step = "ediag" ]; then
export npe_ediag=48
export nth_ediag=1
export npe_node_ediag=$npe_node_max
export memory_ediag="24GB"
export memory_ediag="28GB"

elif [ $step = "eupd" ]; then

Expand Down
5 changes: 3 additions & 2 deletions parm/config/config.resources.nco.static
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ elif [ $step = "waveprep" ]; then
export npe_node_waveprep=$npe_waveprep
export npe_node_waveprep_gfs=$npe_waveprep_gfs
export memory_waveprep="100GB"
export memory_waveprep_gfs="200GB"
export memory_waveprep_gfs="220GB"
export NTASKS=$npe_waveprep
export NTASKS_gfs=$npe_waveprep_gfs

Expand Down Expand Up @@ -112,6 +112,7 @@ elif [ $step = "waveawipsgridded" ]; then
export nth_waveawipsgridded=1
export npe_node_waveawipsgridded=$(echo "$npe_node_max / $nth_waveawipsgridded" | bc)
export NTASKS=$npe_waveawipsgridded
export memory_waveawipsgridded_gfs="2GB"

elif [ $step = "anal" ]; then

Expand Down Expand Up @@ -273,7 +274,7 @@ elif [ $step = "ediag" ]; then
export npe_ediag=48
export nth_ediag=1
export npe_node_ediag=$npe_node_max
export memory_ediag="24GB"
export memory_ediag="28GB"

elif [ $step = "eupd" ]; then

Expand Down
2 changes: 1 addition & 1 deletion sorc/checkout.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ fi
echo gsi checkout ...
if [[ ! -d gsi.fd ]] ; then
rm -f ${topdir}/checkout-gsi.log
git clone --recursive --branch release/gfsda.v16.3.0 https://github.com/NOAA-EMC/GSI.git gsi.fd >> ${topdir}/checkout-gsi.log 2>&1
git clone --recursive --branch gfsda.v16.3.0 https://github.com/NOAA-EMC/GSI.git gsi.fd >> ${topdir}/checkout-gsi.log 2>&1
cd gsi.fd
git submodule update --init
cd ${topdir}
Expand Down
2 changes: 1 addition & 1 deletion versions/build.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export netcdf_ver=4.7.4
export esmf_ver=8.0.1
export wgrib2_ver=2.0.7

export crtm_ver=2.3.0
export crtm_ver=2.4.0

export g2tmpl_ver=1.9.1
export bacio_ver=2.4.1
Expand Down
2 changes: 1 addition & 1 deletion versions/hera.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export hpc_ver=1.2.0
export hpc_intel_ver=18.0.5.274
export hpc_impi_ver=2018.0.4

export obsproc_run_ver=1.0.2
export obsproc_run_ver=1.1.0
export prepobs_run_ver=1.0.1

export hpss_ver=hpss
Expand Down
2 changes: 1 addition & 1 deletion versions/orion.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export hpc_ver=1.2.0
export hpc_intel_ver=2018.4
export hpc_impi_ver=2018.4

export obsproc_run_ver=1.0.2
export obsproc_run_ver=1.1.0
export prepobs_run_ver=1.0.1

export prod_util_ver=1.2.2
Expand Down
4 changes: 2 additions & 2 deletions versions/run.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export ecmwf_ver=v2.1
export nam_ver=v4.2
export rtofs_ver=v2.3
export radarl2_ver=v1.2
export obsproc_ver=v1.0
export obsproc_ver=v1.1

export PrgEnv_intel_ver=8.1.0
export intel_ver=19.1.3.304
Expand Down Expand Up @@ -35,7 +35,7 @@ export util_shared_ver=1.4.0
export grib_util_ver=1.2.3
export wgrib2_ver=2.0.7

export crtm_ver=2.3.0
export crtm_ver=2.4.0

export g2tmpl_ver=1.9.1
export bacio_ver=2.4.1
Expand Down
2 changes: 1 addition & 1 deletion versions/wcoss2.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export envvar_ver=1.0
export prod_envir_ver=${prod_envir_ver:-2.0.4} # Allow override from ops ecflow
export prod_util_ver=${prod_util_ver:-2.0.9} # Allow override from ops ecflow

export obsproc_run_ver=1.0.2
export obsproc_run_ver=1.1.0
export prepobs_run_ver=1.0.1

export tracker_ver=v1.1.15.5
Expand Down