Skip to content

Commit

Permalink
Changes to get C48 aerosol test ready (NOAA-EMC#1829)
Browse files Browse the repository at this point in the history
This PR partially addresses NOAA-EMC#1821 in that it allows for a C48 simplified aerosol 3DVar test
using the workflow to run in GDASApp CI testing. The workflow team will be able to adapt
this test case for their CI testing with minimal effort.

This limits the C48 aerosol analysis to 6 PEs and updates the hash of GDASApp to a stable
build from this morning.

Refs NOAA-EMC#1821
  • Loading branch information
CoryMartin-NOAA authored Aug 31, 2023
1 parent 63270da commit 573ecce
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ protocol = git
required = False

[GDASApp]
hash = 2774a10
hash = f614cc2
local_path = sorc/gdas.cd
repo_url = https://github.com/NOAA-EMC/GDASApp.git
protocol = git
Expand Down
18 changes: 14 additions & 4 deletions parm/config/gfs/config.resources
Original file line number Diff line number Diff line change
Expand Up @@ -249,18 +249,23 @@ elif [[ "${step}" = "aeroanlinit" ]]; then

# below lines are for creating JEDI YAML
case ${CASE} in
C768)
C768)
layout_x=8
layout_y=8
;;
C384)
layout_x=8
layout_y=8
;;
C192 | C96 | C48)
C192 | C96)
layout_x=8
layout_y=8
;;
C48 )
# this case is for testing only
layout_x=1
layout_y=1
;;
*)
echo "FATAL ERROR: Resolution not supported for aerosol analysis'"
exit 1
Expand All @@ -279,18 +284,23 @@ elif [[ "${step}" = "aeroanlinit" ]]; then
elif [[ "${step}" = "aeroanlrun" ]]; then

case ${CASE} in
C768)
C768)
layout_x=8
layout_y=8
;;
C384)
layout_x=8
layout_y=8
;;
C192 | C96 | C48)
C192 | C96)
layout_x=8
layout_y=8
;;
C48 )
# this case is for testing only
layout_x=1
layout_y=1
;;
*)
echo "FATAL ERROR: Resolution ${CASE} is not supported, ABORT!"
exit 1
Expand Down
2 changes: 1 addition & 1 deletion sorc/checkout.sh
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ if [[ ${checkout_gsi} == "YES" ]]; then
fi

if [[ ${checkout_gdas} == "YES" ]]; then
checkout "gdas.cd" "https://github.com/NOAA-EMC/GDASApp.git" "2774a10"; errs=$((errs + $?))
checkout "gdas.cd" "https://github.com/NOAA-EMC/GDASApp.git" "f614cc2"; errs=$((errs + $?))
fi

if [[ ${checkout_gsi} == "YES" || ${checkout_gdas} == "YES" ]]; then
Expand Down

0 comments on commit 573ecce

Please sign in to comment.