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

[develop] Removing RRFS-related features. #893

Merged
merged 28 commits into from
Sep 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
37930b8
Removing externals and build for GSI & RRFS_UTIL
christinaholtNOAA Aug 3, 2023
9638585
Removing GSI and RRFS_UTILS jobs and scripts
christinaholtNOAA Aug 3, 2023
6a34050
Removing get DA obs job/script
christinaholtNOAA Aug 3, 2023
5495d65
Modifying RRFS/GSI/RRFS_UTILS build options.
christinaholtNOAA Aug 3, 2023
5546132
Remove data retrieval of observations.
christinaholtNOAA Aug 3, 2023
634d60c
Remove Jenkins build test for all target.
christinaholtNOAA Aug 3, 2023
5de9726
Remove cycling references.
christinaholtNOAA Aug 3, 2023
5ff1f09
Removing RRFS-related DO_ settings and references.
christinaholtNOAA Aug 3, 2023
449bacd
Removing GSI paths in machine files.
christinaholtNOAA Aug 3, 2023
0f91007
Removing options that are repeats of defaults.
christinaholtNOAA Aug 3, 2023
eb9b499
Removing defaults for removed components.
christinaholtNOAA Aug 3, 2023
020103f
Removing wflow definitions for DA
christinaholtNOAA Aug 3, 2023
00cdf63
Removing wflow config items for machines.
christinaholtNOAA Aug 3, 2023
f8aa44c
Removing concept of NWGES.
christinaholtNOAA Aug 3, 2023
64c084e
Remove RRFS branding
christinaholtNOAA Aug 3, 2023
030f039
Removing GSI-required modules.
christinaholtNOAA Aug 15, 2023
421e7d1
Remove version. It's not updated/maintained.
christinaholtNOAA Aug 15, 2023
22e05f1
Removing GSI-required libs from version file.
christinaholtNOAA Aug 15, 2023
cf4d639
Removing unnecessary paths to namelists
christinaholtNOAA Aug 22, 2023
75990c4
Merge remote-tracking branch 'origin/develop' into remove_gsi
christinaholtNOAA Aug 22, 2023
05e5bef
Fixing one section after removing the anchor.
christinaholtNOAA Aug 22, 2023
200f216
Removing unnecessary module files under tasks.
christinaholtNOAA Aug 28, 2023
9d492d8
Use NET for UPP file name in prodgen and plotting
christinaholtNOAA Aug 28, 2023
7f75346
Addressing review comments.
christinaholtNOAA Sep 8, 2023
2e4b06f
Merge remote-tracking branch 'ufs/develop' into remove_gsi
christinaholtNOAA Sep 8, 2023
c0be992
Remove process_obs from coverage.jet.
christinaholtNOAA Sep 12, 2023
c55bc39
Removing GSI path in modulefile for Gaea
christinaholtNOAA Sep 12, 2023
520f14f
Remove additional lines from Gaea modulefile.
christinaholtNOAA Sep 13, 2023
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 .cicd/scripts/srw_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fi
# Build and install
cd ${workspace}/tests
set +e
./build.sh ${platform} ${SRW_COMPILER} all
./build.sh ${platform} ${SRW_COMPILER}
build_exit=$?
set -e
cd -
Expand Down
19 changes: 0 additions & 19 deletions Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,6 @@ hash = dccb321
local_path = sorc/UPP
required = True

[GSI]
protocol = git
repo_url = https://github.com/NOAA-EMC/GSI.git
# Specify either a branch name or a hash but not both.
#branch = develop
hash = 4afe6ed
local_path = sorc/gsi
externals = None
required = True

[rrfs_utl]
protocol = git
repo_url = https://github.com/NOAA-GSL/rrfs_utl.git
# Specify either a branch name or a hash but not both.
#branch = develop
hash = 6cacff5
local_path = sorc/rrfs_utl
required = True

[arl_nexus]
protocol = git
repo_url = https://github.com/noaa-oar-arl/NEXUS
Expand Down
22 changes: 2 additions & 20 deletions devbuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ OPTIONS
TARGETS
default = builds the default list of apps (also not passing any target does the same)
all = builds all apps
Or any combinations of (ufs, ufs_utils, upp, gsi, rrfs_utils)
Or any combinations of (ufs, ufs_utils, upp)

NOTE: See User's Guide for detailed build instructions

Expand Down Expand Up @@ -84,8 +84,6 @@ Settings:
BUILD_UFS=${BUILD_UFS}
BUILD_UFS_UTILS=${BUILD_UFS_UTILS}
BUILD_UPP=${BUILD_UPP}
BUILD_GSI=${BUILD_GSI}
BUILD_RRFS_UTILS=${BUILD_RRFS_UTILS}
BUILD_NEXUS=${BUILD_NEXUS}
BUILD_AQM_UTILS=${BUILD_AQM_UTILS}

Expand Down Expand Up @@ -122,8 +120,6 @@ DEFAULT_BUILD=true
BUILD_UFS="off"
BUILD_UFS_UTILS="off"
BUILD_UPP="off"
BUILD_GSI="off"
BUILD_RRFS_UTILS="off"
BUILD_NEXUS="off"
BUILD_AQM_UTILS="off"

Expand Down Expand Up @@ -178,13 +174,10 @@ while :; do
# targets
default) ;;
all) DEFAULT_BUILD=false; BUILD_UFS="on";
BUILD_UFS_UTILS="on"; BUILD_UPP="on";
BUILD_GSI="on"; BUILD_RRFS_UTILS="on";;
BUILD_UFS_UTILS="on"; BUILD_UPP="on";;
ufs) DEFAULT_BUILD=false; BUILD_UFS="on" ;;
ufs_utils) DEFAULT_BUILD=false; BUILD_UFS_UTILS="on" ;;
upp) DEFAULT_BUILD=false; BUILD_UPP="on" ;;
gsi) DEFAULT_BUILD=false; BUILD_GSI="on" ;;
rrfs_utils) DEFAULT_BUILD=false; BUILD_RRFS_UTILS="on" ;;
nexus) DEFAULT_BUILD=false; BUILD_NEXUS="on" ;;
aqm_utils) DEFAULT_BUILD=false; BUILD_AQM_UTILS="on" ;;
# unknown
Expand Down Expand Up @@ -321,8 +314,6 @@ CMAKE_SETTINGS="\
-DBUILD_UFS=${BUILD_UFS}\
-DBUILD_UFS_UTILS=${BUILD_UFS_UTILS}\
-DBUILD_UPP=${BUILD_UPP}\
-DBUILD_GSI=${BUILD_GSI}\
-DBUILD_RRFS_UTILS=${BUILD_RRFS_UTILS}\
-DBUILD_NEXUS=${BUILD_NEXUS}\
-DBUILD_AQM_UTILS=${BUILD_AQM_UTILS}"

Expand Down Expand Up @@ -407,15 +398,6 @@ if [ $USE_SUB_MODULES = true ]; then
module use ${SRW_DIR}/sorc/UPP/modulefiles
load_module ""
fi
if [ $BUILD_GSI = "on" ]; then
printf "... Loading GSI modules ...\n"
module use ${SRW_DIR}/sorc/gsi/modulefiles
load_module "gsi_"
fi
if [ $BUILD_RRFS_UTILS = "on" ]; then
printf "... Loading RRFS_UTILS modules ...\n"
load_module ""
fi
if [ $BUILD_NEXUS = "on" ]; then
printf "... Loading NEXUS modules ...\n"
module use ${SRW_DIR}/sorc/arl_nexus/modulefiles
Expand Down
155 changes: 0 additions & 155 deletions jobs/JREGIONAL_ANALYSIS_GSI

This file was deleted.

91 changes: 0 additions & 91 deletions jobs/JREGIONAL_GET_DA_OBS

This file was deleted.

2 changes: 0 additions & 2 deletions jobs/JREGIONAL_GET_EXTRN_MDL_FILES
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,6 @@ elif [ "${ICS_OR_LBCS}" = "LBCS" ]; then
export TIME_OFFSET_HRS=${EXTRN_MDL_LBCS_OFFSET_HRS:-0}
export EXTRN_MDL_NAME=${EXTRN_MDL_NAME_LBCS}
GFS_FILE_FMT=${FV3GFS_FILE_FMT_LBCS}

export NEED_ALL_LBCS=${DO_RRFS_DEV}
fi

#
Expand Down
3 changes: 0 additions & 3 deletions jobs/JREGIONAL_MAKE_ICS
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,10 @@ for the FV3 (in NetCDF format).
#
if [ $RUN_ENVIR = "nco" ]; then
export INPUT_DATA="${COMIN}"
export INPUT_DATA_NWGES="${NWGES_DIR}${SLASH_ENSMEM_SUBDIR}/ics"
else
export INPUT_DATA="${COMIN}${SLASH_ENSMEM_SUBDIR}/INPUT"
export INPUT_DATA_NWGES="${NWGES_DIR}${SLASH_ENSMEM_SUBDIR}/ics"
fi
mkdir_vrfy -p "${INPUT_DATA}"
mkdir_vrfy -p "${INPUT_DATA_NWGES}"
#
#
#-----------------------------------------------------------------------
Expand Down
3 changes: 0 additions & 3 deletions jobs/JREGIONAL_MAKE_LBCS
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,10 @@ hour zero).
#
if [ $RUN_ENVIR = "nco" ]; then
export INPUT_DATA="${COMIN}"
export INPUT_DATA_NWGES="${NWGES_DIR}${SLASH_ENSMEM_SUBDIR}/lbcs"
else
export INPUT_DATA="${COMIN}${SLASH_ENSMEM_SUBDIR}/INPUT"
export INPUT_DATA_NWGES="${NWGES_DIR}${SLASH_ENSMEM_SUBDIR}/lbcs"
fi
mkdir_vrfy -p "${INPUT_DATA}"
mkdir_vrfy -p "${INPUT_DATA_NWGES}"
#
#-----------------------------------------------------------------------
#
Expand Down
Loading
Loading