Skip to content
This repository was archived by the owner on Mar 20, 2023. It is now read-only.

Commit 6da0f49

Browse files
jorblancoaBlanco Alonso Jorgeiomaganaris
authored
Flush reports when having gap junctions (#311)
* Flush reports when having gap junctions * Load neuron module due to issue with cmake build system of neuron : neuronsimulator/nrn#567 Co-authored-by: Blanco Alonso Jorge <[email protected]> Co-authored-by: Ioannis Magkanaris <[email protected]>
1 parent 02b5550 commit 6da0f49

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

coreneuron/sim/fadvance_core.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,10 @@ void nrn_fixed_step_minimal() { /* not so minimal anymore with gap junctions */
8080
nrn_spike_exchange(nrn_threads);
8181
}
8282
#endif
83+
84+
#ifdef ENABLE_REPORTING
85+
nrn_flush_reports(nrn_threads[0]._t);
86+
#endif
8387
t = nrn_threads[0]._t;
8488
}
8589

tests/jenkins/run_neuron.sh

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
set -e
44
source ${JENKINS_DIR:-.}/_env_setup.sh
5+
module load neuron/develop
56

67
set -x
78
TEST_DIR="$1"
@@ -14,15 +15,27 @@ if [ "${TEST_DIR}" = "testcorenrn" ]; then
1415
mkdir test${TEST}dat
1516
mkdir ${TEST}
1617
mpirun -n ${MPI_RANKS} ./x86_64/special -mpi -c sim_time=100 test${TEST}.hoc
18+
if [ ! -f out${TEST}.dat ]; then
19+
echo "Neuron simulation didn't run correctly"
20+
exit 1
21+
fi
1722
cat out${TEST}.dat | sort -k 1n,1n -k 2n,2n > ${TEST}/out_nrn_${TEST}.spk
1823
rm out${TEST}.dat
1924
elif [ "${TEST_DIR}" = "ringtest" ]; then
2025
mkdir ${TEST}
2126
mpirun -n 6 ./x86_64/special ringtest.py -mpi
27+
if [ ! -f coredat/spk6.std ]; then
28+
echo "Neuron simulation didn't run correctly"
29+
exit 1
30+
fi
2231
cat coredat/spk6.std | sort -k 1n,1n -k 2n,2n > ${TEST}/out_nrn_${TEST}.spk
2332
elif [ "${TEST_DIR}" = "tqperf" ]; then
2433
mkdir ${TEST}
2534
mpirun -n ${MPI_RANKS} ./x86_64/special -c tstop=50 run.hoc -mpi
35+
if [ ! -f spk000.dat ]; then
36+
echo "Neuron simulation didn't run correctly"
37+
exit 1
38+
fi
2639
cat spk000.dat | sort -k 1n,1n -k 2n,2n > ${TEST}/out_nrn_${TEST}.spk
2740
else
2841
echo "Not a valid TEST"

0 commit comments

Comments
 (0)