Avoid duplicating acc --oacc arguments to NMODL (#486)

* Avoid duplicating 'acc --oacc' arguments to NMODL.
    - When both CORENRN_ENABLE_NMODL and CORENRN_ENABLE_GPU
       are true then these arguments were added twice, which triggers a compilation error:
           file: File does not exist: acc
* fix ringtest : spike outputes are now written in current directory and use option -dumpmodel

Author: olupton

CMakeLists.txt

@@ -274,9 +274,6 @@ if(CORENRN_ENABLE_NMODL)
   set(CORENRN_NMODL_FLAGS
       ""
       CACHE STRING "Extra NMODL options such as passes")
-  if(CORENRN_ENABLE_GPU)
-    string(APPEND CORENRN_NMODL_FLAGS " acc --oacc")
-  endif()
 else()
   include(AddMod2cSubmodule)
   set(CORENRN_MOD2CPP_BINARY ${CMAKE_BINARY_DIR}/bin/mod2c_core${CMAKE_EXECUTABLE_SUFFIX})

tests/jenkins/run_neuron.sh

@@ -23,12 +23,12 @@ if [ "${TEST_DIR}" = "testcorenrn" ]; then
     rm out${TEST}.dat
 elif [ "${TEST_DIR}" = "ringtest" ]; then
     mkdir ${TEST}
-    mpirun -n 6 ./x86_64/special ringtest.py -mpi
-    if [ ! -f coredat/spk6.std ]; then
+    mpirun -n 6 ./x86_64/special ringtest.py -mpi -dumpmodel
+    if [ ! -f spk6.std ]; then
       echo "Neuron simulation didn't run correctly"
       exit 1
     fi
-    cat coredat/spk6.std | sort -k 1n,1n -k 2n,2n > ${TEST}/out_nrn_${TEST}.spk
+    cat spk6.std | sort -k 1n,1n -k 2n,2n > ${TEST}/out_nrn_${TEST}.spk
 elif [ "${TEST_DIR}" = "tqperf" ]; then
     mkdir ${TEST}
     mpirun -n ${MPI_RANKS} ./x86_64/special -c tstop=50 run.hoc -mpi