Change ifeq to ifdef for OPENMP, modify make_ncep_libs.sh to only exp…

…ort OPENMP=1, and leave it unset when OPENMP=0
NCAR · Oct 16, 2019 · cc870d6 · cc870d6
1 parent 62d0ab2
commit cc870d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/make_ncep_libs.sh b/make_ncep_libs.sh
@@ -182,7 +182,9 @@ cp -v ${MACROS_FILE}.${SYSTEM}.${COMPILER} ${MACROS_FILE}
 #--------------------------------------------------------------
 # Copy library source to BUILD_DIR and build
 #--------------------------------------------------------------
-export OPENMP=${OPENMP}
+if [ "$OPENMP" == "1" ]; then
+  export OPENMP=${OPENMP}
+fi
 rsync -a macros.make Makefile src ${BUILD_DIR}
 cd ${BUILD_DIR}
 if [ "$APP" == "all" ]; then

diff --git a/src/sp/v2.0.2/src/ncpus.F b/src/sp/v2.0.2/src/ncpus.F
@@ -29,7 +29,7 @@ FUNCTION NCPUS()
 C - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
       INTEGER NTHREADS, TID, OMP_GET_NUM_THREADS,OMP_GET_THREAD_NUM
 C     Obtain thread number
-#if OPENMP == 1
+#ifdef OPENMP
 #ifdef LINUX
 !$OMP PARALLEL PRIVATE(TID)
       TID = OMP_GET_THREAD_NUM()