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

Port to Orion #105

Merged
merged 10 commits into from
Apr 22, 2020
Merged

Port to Orion #105

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b171ab6
Porting to Orion
DusanJovic-NOAA Apr 15, 2020
e11d158
Merge branch 'develop' into orion
DusanJovic-NOAA Apr 17, 2020
2b9591b
Add WW3 orion port.
DusanJovic-NOAA Apr 19, 2020
4f4ce63
Update NEMS submodule
DusanJovic-NOAA Apr 20, 2020
4653732
Revert changes that removed support for WCOSS phase1/2
DusanJovic-NOAA Apr 20, 2020
14ca8c3
Update FV3 submodule
DusanJovic-NOAA Apr 20, 2020
70f4141
Regression test log files on Hera
DusanJovic-NOAA Apr 21, 2020
c51cdcd
Regression test log files on WCOSS Cray
DusanJovic-NOAA Apr 21, 2020
b25199c
Regression test log files on WCOSS Dell
DusanJovic-NOAA Apr 22, 2020
3787d6e
Update FV3 and WW3 submodules
DusanJovic-NOAA Apr 22, 2020
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
Prev Previous commit
Next Next commit
Revert changes that removed support for WCOSS phase1/2
  • Loading branch information
@DusanJovic-NOAA
DusanJovic-NOAA committed Apr 20, 2020
commit 46537328fb06af2dd23c7fe036b69d76f10b5d64
24 changes: 24 additions & 0 deletions tests/detect_machine.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,30 @@ export ACCNR=${ACCNR:-nems}

case $(hostname -f) in

g10a1.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=1;; ### gyre 1
g10a2.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=1;; ### gyre 2
g14a1.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=1;; ### gyre 3
g14a2.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=1;; ### gyre 4

t10a1.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=1;; ### tide 1
t10a2.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=1;; ### tide 2
t14a1.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=1;; ### tide 3
t14a2.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=1;; ### tide 4

g20a1.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=2;; ### gyre phase2
g20a2.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=2;; ### gyre phase2
g20a3.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=2;; ### gyre phase2
g21a1.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=2;; ### gyre phase2
g21a2.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=2;; ### gyre phase2
g21a3.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=2;; ### gyre phase2

t20a1.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=2;; ### tide phase2
t20a2.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=2;; ### tide phase2
t20a3.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=2;; ### tide phase2
t21a1.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=2;; ### tide phase2
t21a2.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=2;; ### tide phase2
t21a3.ncep.noaa.gov) MACHINE_ID=wcoss ; export pex=2;; ### tide phase2

llogin1) MACHINE_ID=wcoss_cray ;; ### luna
llogin2) MACHINE_ID=wcoss_cray ;; ### luna
llogin3) MACHINE_ID=wcoss_cray ;; ### luna
Expand Down
21 changes: 20 additions & 1 deletion tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,26 @@ export COMPILER=${NEMS_COMPILER:-intel}
source detect_machine.sh
source rt_utils.sh

if [[ $MACHINE_ID = wcoss_cray ]]; then
if [[ $MACHINE_ID = wcoss ]]; then

source $PATHTR/NEMS/src/conf/module-setup.sh.inc

set +u
source /usrx/local/ecflow/setup.sh
ECFLOW_START=/usrx/local/ecflow/bin/ecflow_start.sh
set -u
ROCOTORUN="/u/Christopher.W.Harrop/rocoto/bin/rocotorun"
ROCOTOSTAT="/u/Christopher.W.Harrop/rocoto/bin/rocotostat"
DISKNM=/nems/noscrub/emc.nemspara/RT
QUEUE=debug
PARTITION=
ACCNR=GFS-DEV
STMP=/ptmpp$pex
PTMP=/ptmpp$pex
SCHEDULER=lsf
# cp fv3_conf/fv3_bsub.IN_wcoss fv3_conf/fv3_bsub.IN

elif [[ $MACHINE_ID = wcoss_cray ]]; then

source $PATHTR/NEMS/src/conf/module-setup.sh.inc
module load xt-lsfhpc
Expand Down