Skip to content

Commit

Permalink
Remove all references to /lfs3 on Jet and add Ben and Ratko to the CO…
Browse files Browse the repository at this point in the history
…DEOWNERS file in the develop branch (NOAA-EMC#234)

* Remove all references to /lfs3 on Jet

* Add Ben and Ratko to the CODEOWNERS file
  • Loading branch information
JeffBeck-NOAA authored Jun 11, 2020
1 parent 414607c commit 670294e
Show file tree
Hide file tree
Showing 13 changed files with 16 additions and 95 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# These owners will be the default owners for everything in the repo.
#* @defunkt
* @JulieSchramm @mkavulich @gsketefian @JeffBeck-NOAA
* @JulieSchramm @mkavulich @gsketefian @JeffBeck-NOAA @RatkoVasic-NOAA @BenjaminBlake-NOAA

# Order is important. The last matching pattern has the most precedence.
# So if a pull request only touches javascript files, only these owners
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/module-setup.csh.inc
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ set __ms_shell=csh

eval "if ( -d / ) set __ms_shell=tcsh"

if ( { test -d /lfs3 } ) then
if ( { test -d /lfs4 } ) then
if ( ! { module help >& /dev/null } ) then
source /apps/lmod/lmod/init/$__ms_shell
endif
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/module-setup.sh.inc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ else
__ms_shell=sh
fi

if [[ -d /lfs3 ]] ; then
if [[ -d /lfs4 ]] ; then
# We are on NOAA Jet
if ( ! eval module help > /dev/null 2>&1 ) ; then
source /apps/lmod/lmod/init/$__ms_shell
Expand Down
34 changes: 0 additions & 34 deletions modulefiles/tasks/jet/make_ics.hardcoded

This file was deleted.

5 changes: 0 additions & 5 deletions modulefiles/tasks/jet/make_ics.local

This file was deleted.

34 changes: 0 additions & 34 deletions modulefiles/tasks/jet/make_lbcs.hardcoded

This file was deleted.

5 changes: 0 additions & 5 deletions modulefiles/tasks/jet/make_lbcs.local

This file was deleted.

6 changes: 3 additions & 3 deletions tests/baseline_configs/config.nco_conus.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ STMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp"
PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp"

#On Jet:
#COMINgfs="/lfs1/projects/hwrf-data/hafs-input/COMGFS"
#STMP="/lfs3/BMC/wrfruc/beck/NCO_dirs/stmp"
#PTMP="/lfs3/BMC/wrfruc/beck/NCO_dirs/ptmp"
#COMINgfs="/lfs1/HFIP/hwrf-data/hafs-input/COMGFS"
#STMP=""
#PTMP=""

#
# In NCO mode, the user must manually (e.g. after doing the build step)
Expand Down
6 changes: 3 additions & 3 deletions tests/baseline_configs/config.nco_conus_c96.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ STMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/stmp"
PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp"

#On Jet:
#COMINgfs="/lfs1/projects/hwrf-data/hafs-input/COMGFS"
#STMP="/lfs3/BMC/wrfruc/beck/NCO_dirs/stmp"
#PTMP="/lfs3/BMC/wrfruc/beck/NCO_dirs/ptmp"
#COMINgfs="/lfs1/HFIP/hwrf-data/hafs-input/COMGFS"
#STMP=""
#PTMP=""

#
# In NCO mode, the user must manually (e.g. after doing the build step)
Expand Down
7 changes: 3 additions & 4 deletions tests/baseline_configs/config.regional_006.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ RUN_TASK_MAKE_SFC_CLIMO="FALSE"
SFC_CLIMO_DIR="/scratch2/BMC/det/FV3SAR_pregen/sfc_climo/GSD_HRRR25km"

#On Jet
#GRID_DIR="/lfs3/projects/wrfruc/beck/FV3SAR_pregen/grid/GSD_HRRR25km"
#OROG_DIR="/lfs3/projects/wrfruc/beck/FV3SAR_pregen/orog/GSD_HRRR25km"
#SFC_CLIMO_DIR="/lfs3/projects/wrfruc/beck/FV3SAR_pregen/sfc_climo/GSD_HRRR25km"

#GRID_DIR=""
#OROG_DIR=""
#SFC_CLIMO_DIR=""
4 changes: 2 additions & 2 deletions tests/baseline_configs/config.regional_009.sh
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ PTMP="/scratch2/BMC/det/Gerard.Ketefian/UFS_CAM/NCO_dirs/ptmp"

#On Jet:
#COMINgfs="/lfs1/projects/hwrf-data/hafs-input/COMGFS"
#STMP="/lfs3/BMC/wrfruc/beck/NCO_dirs/stmp"
#PTMP="/lfs3/BMC/wrfruc/beck/NCO_dirs/ptmp"
#STMP=""
#PTMP=""

#
# In NCO mode, the user must manually (e.g. after doing the build step)
Expand Down
2 changes: 1 addition & 1 deletion ush/load_fv3gfs_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ source "$HOMEgfs/modulefiles/module-setup.sh.inc"
# Load our modules:
module use "$HOMEgfs/modulefiles"

if [[ -d /lfs3 ]] ; then
if [[ -d /lfs4 ]] ; then
# We are on NOAA Jet
module load module_base.jet
elif [[ -d /scratch3 ]] ; then
Expand Down
2 changes: 1 addition & 1 deletion ush/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ case $MACHINE in
;;

"JET")
FIXgsm="/lfs3/projects/hpc-wof1/ywang/regional_fv3/fix/fix_am"
FIXgsm="/lfs4/HFIP/gsd-fv3-hfip/FV3/fix/fix_am"
SFC_CLIMO_INPUT_DIR="/lfs1/HFIP/hwrf-data/git/fv3gfs/fix/fix_sfc_climo"
;;

Expand Down

0 comments on commit 670294e

Please sign in to comment.