write (iout,*) "proc_groups exited"
call flush(iout)
#endif
+<<<<<<< HEAD
+=======
+#ifdef SCALREP
+ write (iout,*) "1,4 SCSC repulsive interactions sacled down by 10"
+#endif
+>>>>>>> e183793... Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)
do ipar=1,nParmSet
write (iout,*) "Calling parmread",ipar
call parmread(ipar,*10)
call enecalc(islice,*10)
write (iout,*) "enecalc OK"
call flush(iout)
+<<<<<<< HEAD
+=======
+ write (iout,*) "Calling WHAM_calc"
+ call flush(iout)
+>>>>>>> e183793... Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC potentials)
call WHAM_CALC(islice,*10)
write (iout,*) "wham_calc OK"
call flush(iout)