Orion port (#190)

* add orion to the list of machines and adapt matrix_ncep for orion environments * modify bin/matrix_ncep to include partion on Orion for regression test running in 8 hr wall time
NOAA-EMC · Apr 21, 2020 · 19f3126 · 19f3126
1 parent 96ba41e
commit 19f3126
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/model/bin/cmplr.env b/model/bin/cmplr.env
@@ -110,7 +110,7 @@ if [ "$cmplr" == "intel" ]          || [ "$cmplr" == "intel_debug" ]    || [ "$c
    [ "$cmplr" == "so_intel" ]       || [ "$cmplr" == "so_intel_debug" ] || [ "$cmplr" == "so_intel_prof" ] || \
    [ "$cmplr" == "datarmor_intel" ] || [ "$cmplr" == "datarmor_intel_debug" ] || [ "$cmplr" == "datarmor_intel_prof" ] || \
    [ "$cmplr" == "wcoss_phase2" ]   || [ "$cmplr" == "wcoss_cray" ]     || [ "$cmplr" == "wcoss_dell_p3" ]  || \
-   [ "$cmplr" == "theia" ]          || [ "$cmplr" == "hera" ] ; then
+   [ "$cmplr" == "theia" ]          || [ "$cmplr" == "hera" ] || [ "$cmplr" == "orion" ] ; then
 
 
   # COMPILER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -151,7 +151,7 @@ if [ "$cmplr" == "intel" ]          || [ "$cmplr" == "intel_debug" ]    || [ "$c
   if [ "$list" == 'yes' ] ; then optc="$optc -list"; fi
 
   # omp options
-  if [ "$cmplr" == "hera" ] || [ "$cmplr" == "wcoss_cray" ] || [ "$cmplr" == "wcoss_dell_p3" ]; then
+  if [ "$cmplr" == "hera" ] || [ "$cmplr" == "orion" ] || [ "$cmplr" == "wcoss_cray" ] || [ "$cmplr" == "wcoss_dell_p3" ]; then
      optomp="-qopenmp"
   else
      optomp="-openmp"

diff --git a/model/bin/w3_setup b/model/bin/w3_setup
@@ -415,7 +415,7 @@ then
        [ "$cmplr" == "datarmor_intel" ] || [ "$cmplr" == "datarmor_intel_debug" ]   || \
        [ "$cmplr" == "gnu" ] || [ "$cmplr" == "gnu_debug" ]                         || \
        [ "$cmplr" == "theia" ] || [ "$cmplr" == "wcoss_cray" ]                      || \
-       [ "$cmplr" == "hera" ]                                                       || \
+       [ "$cmplr" == "hera" ] || [ "$cmplr" == "orion" ]                            || \
        [ "$cmplr" == "wcoss_phase2" ] || [ "$cmplr" == "wcoss_dell_p3" ]            || \
        [ "$cmplr" == "datarmor_gnu" ] || [ "$cmplr" == "datarmor_gnu_debug" ]       || \
        [ "$cmplr" == "pgi" ] || [ "$cmplr" == "pgi_debug" ]                         || \
@@ -441,7 +441,7 @@ then
        [ "$cmplr" == "datarmor_intel" ] || [ "$cmplr" == "datarmor_intel_debug" ]   || \
        [ "$cmplr" == "gnu" ] || [ "$cmplr" == "gnu_debug" ]                         || \
        [ "$cmplr" == "theia" ] || [ "$cmplr" == "wcoss_cray" ]                      || \
-       [ "$cmplr" == "hera" ]                                                       || \
+       [ "$cmplr" == "hera" ] || [ "$cmplr" == "orion" ]                            || \
        [ "$cmplr" == "wcoss_phase2" ] || [ "$cmplr" == "wcoss_dell_p3" ]            || \
        [ "$cmplr" == "datarmor_gnu" ] || [ "$cmplr" == "datarmor_gnu_debug" ]       || \
        [ "$cmplr" == "pgi" ] || [ "$cmplr" == "pgi_debug" ]                         || \

diff --git a/model/esmf/Makefile b/model/esmf/Makefile
@@ -35,7 +35,7 @@ ifeq ($(WW3_COMP),Portland)
 else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","pgi" "datarmor_pgi" "datarmor_pgi_debug"))
  ESMF_F90COMPILEOPTS := $(ESMF_F90COMPILEOPTS) -byteswapio
 # intel
-else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","theia" "Intel" "hera"))
+else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","theia" "Intel" "hera" "orion"))
  ESMF_F90COMPILEOPTS := $(ESMF_F90COMPILEOPTS) -convert big_endian
 else ifeq ("$(WW3_COMP)",$(filter "$(WW3_COMP)","wcoss_phase2" "wcoss_cray" "wcoss_dell_p3"))
  ESMF_F90COMPILEOPTS := $(ESMF_F90COMPILEOPTS) -convert big_endian

diff --git a/regtests/bin/matrix_ncep b/regtests/bin/matrix_ncep
@@ -40,6 +40,7 @@
 # Set batchq queue, choose modules and other custom variables to fit system and 
 # to define headers etc (default to original version if empty)
 ishera=`hostname | grep hfe`
+isorion=`hostname | grep Orion`
 if [ $ishera ]
 then
 # If no other h, assuming Hera 
@@ -49,6 +50,14 @@ then
   modmpi='impi/2018.0.4'
   modnetcdf='netcdf/4.6.1'
   metispath='/scratch2/COASTAL/coastal/save/Ali.Abdolali/parmetis-4.0.3'
+elif [ $isorion ]
+then
+  cmplr=orion
+  batchq="slurm"
+  modcomp='intel/2018.4'
+  modmpi='impi/2018.4'
+  modnetcdf='netcdf/4.7.2'
+  metispath='/work/noaa/marine/ali.abdolali/Source/parmetis-4.0.3'
 else
   batchq=
 fi
@@ -58,7 +67,16 @@ fi
 
   echo '#!/bin/sh --login'                                   > matrix.head
   echo ' '                                                  >> matrix.head
-if [ $batchq = "slurm" ]
+if [ $batchq = "slurm" ] && [ $isorion ]
+then
+  echo '#SBATCH -n 24'                                      >> matrix.head
+  echo '#SBATCH -q batch'                                   >> matrix.head
+  echo '#SBATCH -t 08:00:00'                                >> matrix.head
+  echo '#SBATCH -A marine-cpu'                              >> matrix.head
+  echo '#SBATCH -J ww3_regtest'                             >> matrix.head
+  echo '#SBATCH -o matrix.out'                              >> matrix.head
+  echo '#SBATCH -p orion'                                   >> matrix.head
+elif [ $batchq = "slurm" ]
 then
   echo '#SBATCH -n 24'                                      >> matrix.head
   echo '#SBATCH -q batch'                                   >> matrix.head