Merge branch 'master' into be_quiet

pramodk · web-flow · commit ae0906d053eb · 2020-07-28T10:02:53.000+02:00
diff --git a/coreneuron/io/nrn_setup.cpp b/coreneuron/io/nrn_setup.cpp
@@ -1232,8 +1232,8 @@ void read_phase2(FileHandler& F, int imult, NrnThread& nt) {
                 printf(
                     "Error : NEURON and CoreNEURON must use same mod files for compatibility, %d different mod file(s) found. Re-compile special and special-core!\n",
                     diff_mech_count);
+                nrn_abort(1);
             }
-            nrn_abort(1);
         }
 
         nt._nidata = F.read_int();

Original file line number	Diff line number	Diff line change
`@@ -1232,8 +1232,8 @@ void read_phase2(FileHandler& F, int imult, NrnThread& nt) {`
`1232`	`1232`	`printf(`
`1233`	`1233`	`"Error : NEURON and CoreNEURON must use same mod files for compatibility, %d different mod file(s) found. Re-compile special and special-core!\n",`
`1234`	`1234`	`diff_mech_count);`
	`1235`	`+ nrn_abort(1);`
`1235`	`1236`	`}`
`1236`		`- nrn_abort(1);`
`1237`	`1237`	`}`
`1238`	`1238`
`1239`	`1239`	`nt._nidata = F.read_int();`