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

add utest related changes #11

Merged
Merged
Changes from all commits
Commits
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
32 changes: 10 additions & 22 deletions tests/utest
Original file line number Diff line number Diff line change
Expand Up @@ -428,16 +428,13 @@ fi
# utility functions in rt_utils need to be able to see variables in utest
source rt_utils.sh

source $PATHTR/NEMS/src/conf/module-setup.sh.inc
# Machine-dependent libraries, modules, variables, etc.
if [[ $MACHINE_ID = hera.* ]]; then

source $PATHTR/NEMS/src/conf/module-setup.sh.inc
module use $PATHTR/modulefiles/${MACHINE_ID}
module load fv3

export PATH=/scratch2/NCEPDEV/fv3-cam/Dusan.Jovic/ecflow/bin:$PATH
export PYTHONPATH=/scratch2/NCEPDEV/fv3-cam/Dusan.Jovic/ecflow/lib/python2.7/site-packages
ECFLOW_START=/scratch2/NCEPDEV/fv3-cam/Dusan.Jovic/ecflow/bin/ecflow_start.sh
export PATH=/scratch1/NCEPDEV/nems/emc.nemspara/soft/miniconda3/bin:$PATH
export PYTHONPATH=/scratch1/NCEPDEV/nems/emc.nemspara/soft/miniconda3/lib/python3.8/site-packages
ECFLOW_START=/scratch1/NCEPDEV/nems/emc.nemspara/soft/miniconda3/bin/ecflow_start.sh
ECF_PORT=$(( $(id -u) + 1500 ))

PARTITION=
Expand All @@ -453,15 +450,11 @@ if [[ $MACHINE_ID = hera.* ]]; then

elif [[ $MACHINE_ID = orion.* ]]; then

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

module use $PATHTR/modulefiles/${MACHINE_ID}
module load fv3
module load gcc/8.3.0

export PATH=/work/noaa/fv3-cam/djovic/ecflow/bin:$PATH
export PYTHONPATH=/work/noaa/fv3-cam/djovic/ecflow/lib/python2.7/site-packages
ECFLOW_START=/work/noaa/fv3-cam/djovic/ecflow/bin/ecflow_start.sh
export PATH=/work/noaa/nems/emc.nemspara/soft/miniconda3/bin:$PATH
export PYTHONPATH=/work/noaa/nems/emc.nemspara/soft/miniconda3/lib/python3.8/site-packages
ECFLOW_START=/work/noaa/nems/emc.nemspara/soft/miniconda3/bin/ecflow_start.sh
ECF_PORT=$(( $(id -u) + 1500 ))
QUEUE=batch
COMPILE_QUEUE=batch
Expand All @@ -477,17 +470,12 @@ elif [[ $MACHINE_ID = orion.* ]]; then

elif [[ $MACHINE_ID = wcoss_dell_p3 ]]; then

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

module use $PATHTR/modulefiles/${MACHINE_ID}
module load fv3

module load python/2.7.14
module load python/3.6.3

module load ips/18.0.1.163
module load ecflow/4.7.1
ECFLOW_START=${ECF_ROOT}/intel/bin/ecflow_start.sh
module load ecflow/4.17.0
ECFLOW_START=${ECF_ROOT}/bin/ecflow_start.sh
ECF_PORT=$(grep $USER /usrx/local/sys/ecflow/assigned_ports.txt | awk '{print $2}')

DISKNM=/gpfs/dell2/emc/modeling/noscrub/emc.nemspara/RT
Expand Down