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

Update NCAR/develop from NOAA-EMC/develop 2019/10/10 #12

Merged
merged 2 commits into from
Oct 11, 2019
Merged

Update NCAR/develop from NOAA-EMC/develop 2019/10/10 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba1ddf7
Remove Theia (#10)
RatkoVasic-NOAA Oct 1, 2019
e527137
Merge branch 'develop' of https://github.com/NOAA-EMC/NEMS into HEAD
climbfuji Oct 11, 2019
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
6 changes: 0 additions & 6 deletions src/conf/module-setup.csh.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ else if ( { test -d /scratch1 -a ! -d /scratch } ) then
source /apps/lmod/lmod/init/$__ms_shell
endif
module purge
else if ( { test -d /scratch3 -a -d /scratch } ) then
# We are on NOAA Theia
if ( ! { module help >& /dev/null } ) then
source /apps/lmod/lmod/init/$__ms_shell
endif
module purge
else if ( { test -d /gpfs/hps -a -e /etc/SuSE-release } ) then
# We are on NOAA Luna or Surge
if ( ! { module help >& /dev/null } ) then
Expand Down
6 changes: 0 additions & 6 deletions src/conf/module-setup.sh.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,6 @@ elif [[ -d /scratch1 && ! -d /scratch ]] ; then
source /apps/lmod/lmod/init/$__ms_shell
fi
module purge
elif [[ -d /scratch3 && -d /scratch ]] ; then
# We are on NOAA Theia
if ( ! eval module help > /dev/null 2>&1 ) ; then
source /apps/lmod/lmod/init/$__ms_shell
fi
module purge
elif [[ -d /gpfs/hps && -e /etc/SuSE-release ]] ; then
# We are on NOAA Luna or Surge
if ( ! eval module help > /dev/null 2>&1 ) ; then
Expand Down
2 changes: 1 addition & 1 deletion src/incmake/buildenv.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# This is the main driver for the build environment decision logic.
# It walks throught the known build environments (WCOSS Phase 3, Linux
# GNU, Theia + Intel compiler, etc.) For each one, if the environment
# GNU, Hera + Intel compiler, etc.) For each one, if the environment
# is detected on this machine, it is added to the known list. The
# first detected is chosen as the default, unless the user chooses one
# through the BUILD_ENV variable.
Expand Down
15 changes: 1 addition & 14 deletions src/incmake/confopt.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,10 @@ ifneq ($(CONFOPT),)

$(info Automatically converting to new variables from CONFOPT="$(CONFOPT)")

ifeq ($(CONFOPT),nmmb_intel_theia)
CONFIGURE_NEMS_FILE ?= configure.nems.Theia.intel_nmmb
CHOSEN_MODULE ?= theia/ESMF_700_nmmb

else ifeq ($(CONFOPT),nmmb_intel_wcoss)
ifeq ($(CONFOPT),nmmb_intel_wcoss)
CONFIGURE_NEMS_FILE ?= configure.nems.Wcoss.intel_nmmb
CHOSEN_MODULE ?= wcoss/ESMF_700_nmmb

else ifeq ($(CONFOPT),gsm_intel_theia)
CONFIGURE_NEMS_FILE ?= configure.nems.Theia.intel_gsm
CHOSEN_MODULE ?= theia/ESMF_700_gsm

else ifeq ($(CONFOPT),gsm_intel_wcoss)
CONFIGURE_NEMS_FILE ?= configure.nems.Wcoss.intel_gsm
CHOSEN_MODULE ?= wcoss.phase1/ESMF_700_gsm
Expand All @@ -39,11 +31,6 @@ ifneq ($(CONFOPT),)
EXTERNALS_NEMS_FILE ?= externals.nems.Gaea
CHOSEN_MODULE ?= gaea/ESMF_NUOPC

else ifeq ($(CONFOPT),coupled_intel_theia)
CONFIGURE_NEMS_FILE ?= configure.nems.Theia.intel
EXTERNALS_NEMS_FILE ?= externals.nems.Theia
CHOSEN_MODULE ?= theia/ESMF_NUOPC

else ifeq ($(CONFOPT),coupled_intel_yellowstone)
CONFIGURE_NEMS_FILE ?= configure.nems.Yellowstone.intel
EXTERNALS_NEMS_FILE ?= externals.nems.Yellowstone
Expand Down
17 changes: 6 additions & 11 deletions src/incmake/env/rdhpcs/detect.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,17 @@
#
########################################################################

ifneq (,$(and $(wildcard /scratch),$(wildcard /scratch3)))
ifneq (,$(and $(wildcard /scratch1),$(wildcard /scratch2)))
NEMS_COMPILER?=intel
$(call add_build_env,theia.$(NEMS_COMPILER),env/rdhpcs/theia.$(NEMS_COMPILER).mk)
$(call add_build_env,hera.$(NEMS_COMPILER),env/rdhpcs/hera.$(NEMS_COMPILER).mk)
else
ifneq (,$(and $(wildcard /scratch1),$(wildcard /scratch2)))
ifneq (,$(and $(wildcard /lfs1),$(wildcard /lfs3)))
NEMS_COMPILER?=intel
$(call add_build_env,hera.$(NEMS_COMPILER),env/rdhpcs/hera.$(NEMS_COMPILER).mk)
$(call add_build_env,jet.$(NEMS_COMPILER),env/rdhpcs/jet.$(NEMS_COMPILER).mk)
else
ifneq (,$(and $(wildcard /lfs1),$(wildcard /lfs3)))
ifneq (,$(shell hostname | grep -i gaea))
NEMS_COMPILER?=intel
$(call add_build_env,jet.$(NEMS_COMPILER),env/rdhpcs/jet.$(NEMS_COMPILER).mk)
else
ifneq (,$(shell hostname | grep -i gaea))
NEMS_COMPILER?=intel
$(call add_build_env,gaea.$(NEMS_COMPILER),env/rdhpcs/gaea.$(NEMS_COMPILER).mk)
endif
$(call add_build_env,gaea.$(NEMS_COMPILER),env/rdhpcs/gaea.$(NEMS_COMPILER).mk)
endif
endif
endif
7 changes: 0 additions & 7 deletions src/incmake/env/rdhpcs/theia.gnu.mk
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions src/incmake/env/rdhpcs/theia.intel.mk
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions src/incmake/env/rdhpcs/theia.pgi.mk
View file
Open in desktop

This file was deleted.

19 changes: 4 additions & 15 deletions tests/apps.def
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
# List of valid platforms and the human-readable names of each.
PLATFORM theia NAME Theia
PLATFORM theia.slurm.intel NAME Theia (SLURM test)
PLATFORM hera NAME Hera
PLATFORM hera.intel NAME Hera (SLURM test)
PLATFORM hera.intel NAME Hera
PLATFORM wcoss1 NAME WCOSS Phase 1
PLATFORM wcoss2 NAME WCOSS Phase 2
PLATFORM wcoss_cray NAME WCOSS Cray
Expand All @@ -22,27 +19,19 @@ APP FV3GFS-GSDCHEM URL gerrit:EMC_FV3GFS-GSDCHEM

# Shell expressions that generate scrub space for a given $username
# on each platform.
ON theia SCRUB /scratch4/NCEPDEV/nems/scrub/$username
ON theia.slurm.intel SCRUB /scratch4/NCEPDEV/nems/scrub/$username
ON hera SCRUB /scratch1/NCEPDEV/nems/$username
ON hera.intel SCRUB /scratch1/NCEPDEV/nems/$username
ON hera.intel SCRUB /scratch1/NCEPDEV/nems/$username/scrub
ON wcoss1 SCRUB /ptmpp1/$username
ON wcoss2 SCRUB /ptmpd3/$username
ON wcoss_cray SCRUB /gpfs/hps2/ptmp/$username
ON wcoss_dell_p3 SCRUB /gpfs/dell2/ptmp/$username

# List of apps to run on each platform.
ON theia APPS FV3-MOM6-CICE5
ON theia.slurm.intel APPS NEMSfv3gfs WW3-FV3
ON hera APPS FV3-MOM6-CICE5
ON hera.intel APPS NEMSfv3gfs WW3-FV3
#ON hera.intel APPS NEMSfv3gfs FV3-MOM6-CICE5 WW3-FV3
ON hera.intel APPS NEMSfv3gfs FV3-MOM6-CICE5
ON wcoss1 APPS NEMSfv3gfs
ON wcoss2 APPS NEMSfv3gfs WW3-FV3
ON wcoss_cray APPS NEMSfv3gfs FV3GFS-GSDCHEM
ON wcoss_dell_p3 APPS NEMSfv3gfs

# Extra arguments to rt.sh for each platform
ON theia EXTRA_ARGS --platform theia
ON theia.slurm.intel EXTRA_ARGS --platform theia.slurm.intel
ON hera EXTRA_ARGS --platform hera
ON hera.intel EXTRA_ARGS --platform hera.intel
2 changes: 0 additions & 2 deletions tests/commit.def
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
# Directory to receive the webpage with regression test results
ON theia WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
ON theia.slurm.intel WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
ON hera WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
ON hera.intel WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
ON wcoss1 WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/NUOPC/
Expand Down
3 changes: 0 additions & 3 deletions tests/multi-app-test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,13 +237,11 @@ parse_control_file() {
# Specifies the directory to use for this scripts work
# space. Use the string "$username" in place of the user
# name.
# ON theia SCRUB /scratch4/NCEPDEV/nems/scrub/$username
#echo "Platform $key uses scrub space $value"
set_global "scrub_space_for_$key" "$value"
check_platform_in_key=YES
elif [[ "$context" == ON && "$command" == APPS ]] ; then
# Specifies which apps should be tested on each platform.
# ON theia APPS NEMSfv3gfs NEMSGSM HYCOM-GSM-CICE WW3-FV3 WW3-ATM FV3-MOM6-CICE5
#echo "Platform $key will run apps $value"
set_global "app_list_for_$key" "$value"
check_platform_in_key=YES
Expand Down Expand Up @@ -282,7 +280,6 @@ parse_control_file() {
elif [[ "$context" == ON && "$command" == WEBPAGE ]] ; then
# Specifies the directory (local or remote) to receive the webpage that has test results.
#ON tujet WEBPAGE /lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/dell-produtil/
#ON theia WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/nems-commit/dell-produtil/

#echo "Platform $key sends to webpage $value"
set_global "webpage_for_$key" "$value"
Expand Down
4 changes: 4 additions & 0 deletions tests/nightly/cron/hera-nemspara.cron
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
03 00 * * * mkdir -p /scratch1/NCEPDEV/nems/emc.nemspara/scrub /scratch1/NCEPDEV/stmp2/emc.nemspara/scrub

40 22 * * * /scratch2/NCEPDEV/fv3-cam/Ratko.Vasic/multi-app-test/tests/nightly/run-from-hera-nemspara.sh ngt hera.intel test > /home/emc.nemspara/hera-nightly-test.log 2>&1
47 * * * * /scratch2/NCEPDEV/fv3-cam/Ratko.Vasic/multi-app-test/tests/nightly/run-from-hera-nemspara.sh ngt hera.intel deliver > /home/emc.nemspara/hera-nightly-deliver.log 2>&1
3 changes: 3 additions & 0 deletions tests/nightly/cron/hera-user.cron
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
01 00 * * * /home/Ratko.Vasic/bin/scrubber > /home/Ratko.Vasic/logs/hera_scrubber.log

00 22 * * * /scratch2/NCEPDEV/fv3-cam/Ratko.Vasic/multi-app-test/tests/nightly/run-from-hera-user.sh ngt hera.intel checkout > /scratch2/NCEPDEV/fv3-cam/Ratko.Vasic/hera-nightly-checkout.log 2>&1
16 changes: 0 additions & 16 deletions tests/nightly/cron/theia-nemspara.cron
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions tests/nightly/cron/theia-user.cron
View file
Open in desktop

This file was deleted.

4 changes: 1 addition & 3 deletions tests/nightly/nightly.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,7 @@ ON tujet WEBPAGE /lfs3/projects/hfv3gfs/emc.nemspara/web/rt
ON ujet.slurm WEBPAGE /lfs3/projects/hfv3gfs/emc.nemspara/web/rt
ON svjet WEBPAGE /lfs3/projects/hfv3gfs/emc.nemspara/web/rt
ON xjet WEBPAGE /lfs3/projects/hfv3gfs/emc.nemspara/web/rt
ON theia WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/rt
ON theia.intel WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/rt
ON theia.slurm.intel WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/rt
ON hera.intel WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/rt
ON wcoss1 WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/rt
ON wcoss2 WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/rt
ON wcoss_cray WEBPAGE jetscp.rdhpcs.noaa.gov:/lfs3/projects/hfv3gfs/emc.nemspara/web/rt
Expand Down
5 changes: 5 additions & 0 deletions tests/nightly/run-from-hera-nemspara.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#! /bin/bash --login
cd $( dirname "$0" )
cd ..
source ../src/conf/module-setup.sh.inc
cat apps.def nightly/nightly.def | ./multi-app-test.sh "$@"
4 changes: 4 additions & 0 deletions tests/nightly/run-from-hera-user.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#! /bin/sh
cd $( dirname "$0" )
cd ..
cat apps.def nightly/nightly.def | ./multi-app-test.sh "$@"
Loading