Merging adam with devel
Conflicts:
source/unres/src_CSA/readrtns_csa.F
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