Merge branch 'adam' into devel

Merging adam with devel
Conflicts:
	source/unres/src_CSA/readrtns_csa.F

diff --cc bin/unres/CSA/unres_csa_ifort_mpich-1.2.7p1.exe~adam
index 0000000,0000000..59d3545
new file mode 100755 (executable)
Binary files differ

diff --cc source/unres/src_CSA/readrtns_csa.F
index df144f4,a070596..6e222d4
--- 1/source/unres/src_CSA/readrtns_csa.F
--- 2/source/unres/src_CSA/readrtns_csa.F
+++ b/source/unres/src_CSA/readrtns_csa.F
@@@ -577,8 -577,8 +577,13 @@@ C     Juyong:READ read_inf
  C     READ fragment information!!
  C     both routines should be in dfa.F file!!
  
++<<<<<<< HEAD
 +      if (.not. (wdfa_dist.eq.0.0 .and. wdfa_tor.eq.0.0 .and.
 +     &            wdfa_nei.eq.0.0 .and. wdfa_beta.eq.0.0)) then
++=======
+       if (.not. (wdfa_dist.eq.0.0 .and. wdfa_tor.eq.0.0
+      &      .and. wdfa_nei.eq.0.0 .and. wdfa_beta.eq.0.0)) then
++>>>>>>> adam
         call init_dfa_vars
         print*, 'init_dfa_vars finished!'
         call read_dfa_info

diff --cc source/unres/src_CSA/unres_csa.F
Simple merge