Added src_MD-M-newcorr (Adasko's source) and src-NEWSC of WHAM (with Momo's SCSC...

[unres.git] / source / wham / src-NEWSC / wham_multparm.F

diff --git a/source/wham/src-NEWSC/wham_multparm.F b/source/wham/src-NEWSC/wham_multparm.F
index 012af76..04fcdc9 100644 (file)
--- a/source/wham/src-NEWSC/wham_multparm.F
+++ b/source/wham/src-NEWSC/wham_multparm.F
@@ -64,6 +64,12 @@ c NaNQ initialization
       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)
@@ -105,6 +111,11 @@ c NaNQ initialization
           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)