Merge branch 'feature-cmake' into devel

diff --combined source/unres/src_CSA/energy_p_new_barrier.F
index a46c47d,1a9044f..f0f93ef
--- 1/source/unres/src_CSA/energy_p_new_barrier.F
--- 2/source/unres/src_CSA/energy_p_new_barrier.F
+++ b/source/unres/src_CSA/energy_p_new_barrier.F
@@@ -125,13 -125,13 +125,13 @@@
    107 continue
        
  C     JUYONG for dfa test!
 -      call edfad(edfadis)
 +      if (wdfa_dist.gt.0) call edfad(edfadis)
  c      print*, 'edfad is finished!', edfadis
 -      call edfat(edfator)
 +      if (wdfa_tor.gt.0) call edfat(edfator)
  c      print*, 'edfat is finished!', edfator
 -      call edfan(edfanei)
 +      if (wdfa_nei.gt.0) call edfan(edfanei)
  c      print*, 'edfan is finished!', edfanei
 -      call edfab(edfabet)
 +      if (wdfa_beta.gt.0) call edfab(edfabet)
  c      print*, 'edfab is finished!', edfabet
  C      stop
  C     JUYONG
@@@ -7966,18 -7966,18 +7966,18 @@@ c--------------------------------------
        logical lprn
        common /kutas/ lprn
  CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
- C                                              
- C      Parallel       Antiparallel
- C                                             
- C          o             o         
- C         /l\           /j\       
- C        /   \         /   \      
- C       /| o |         | o |\     
- C     \ j|/k\|  /   \  |/k\|l /   
- C      \ /   \ /     \ /   \ /    
- C       o     o       o     o                
- C       i             i                     
- C
+ C                                                                              C
+ C      Parallel       Antiparallel                                             C
+ C                                                                              C
+ C          o             o                                                     C
+ C         /l\           /j\                                                    C
+ C        /   \         /   \                                                   C
+ C       /| o |         | o |\                                                  C
+ C     \ j|/k\|  /   \  |/k\|l /                                                C
+ C      \ /   \ /     \ /   \ /                                                 C
+ C       o     o       o     o                                                  C
+ C       i             i                                                        C
+ C                                                                              C
  CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
        itk=itortyp(itype(k))
        s1= scalar2(AEAb1(1,2,imat),CUgb2(1,i))
@@@ -8071,18 -8071,18 +8071,18 @@@ c--------------------------------------
        logical lprn
        common /kutas/ lprn
  CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
- C                                              
- C      Parallel       Antiparallel
- C                                             
- C          o             o         
- C     \   /l\           /j\   /   
- C      \ /   \         /   \ /    
- C       o| o |         | o |o     
- C     \ j|/k\|      \  |/k\|l     
- C      \ /   \       \ /   \      
- C       o             o                      
- C       i             i                     
- C
+ C                                                                              C
+ C      Parallel       Antiparallel                                             C
+ C                                                                              C 
+ C          o             o                                                     C
+ C     \   /l\           /j\   /                                                C
+ C      \ /   \         /   \ /                                                 C
+ C       o| o |         | o |o                                                  C                   
+ C     \ j|/k\|      \  |/k\|l                                                  C
+ C      \ /   \       \ /   \                                                   C
+ C       o             o                                                        C
+ C       i             i                                                        C 
+ C                                                                              C
  CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
  cd      write (2,*) 'eello6_graph2: i,',i,' j',j,' k',k,' l',l
  C AL 7/4/01 s1 would occur in the sixth-order moment, 
@@@ -8253,18 -8253,18 +8253,18 @@@ c--------------------------------------
        double precision vv(2),pizda(2,2),auxmat(2,2),auxvec(2)
        logical swap
  CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
- C                                              
- C      Parallel       Antiparallel
- C                                             
- C          o             o         
- C         /l\   /   \   /j\       
- C        /   \ /     \ /   \      
- C       /| o |o       o| o |\     
- C       j|/k\|  /      |/k\|l /   
- C        /   \ /       /   \ /    
- C       /     o       /     o                
- C       i             i                     
- C
+ C                                                                              C
+ C      Parallel       Antiparallel                                             C
+ C                                                                              C
+ C          o             o                                                     C
+ C         /l\   /   \   /j\                                                    C
+ C        /   \ /     \ /   \                                                   C
+ C       /| o |o       o| o |\                                                  C
+ C       j|/k\|  /      |/k\|l /                                                C
+ C        /   \ /       /   \ /                                                 C
+ C       /     o       /     o                                                  C
+ C       i             i                                                        C
+ C                                                                              C
  CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
  C
  C 4/7/01 AL Component s1 was removed, because it pertains to the respective 
@@@ -8370,18 -8370,18 +8370,18 @@@ c--------------------------------------
       & auxvec1(2),auxmat1(2,2)
        logical swap
  CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
- C                                              
- C      Parallel       Antiparallel
- C                                             
- C          o             o         
- C         /l\   /   \   /j\       
- C        /   \ /     \ /   \      
- C       /| o |o       o| o |\     
- C     \ j|/k\|      \  |/k\|l     
- C      \ /   \       \ /   \      
- C       o     \       o     \                
- C       i             i                     
- C
+ C                                                                              C
+ C      Parallel       Antiparallel                                             C
+ C                                                                              C
+ C          o             o                                                     C
+ C         /l\   /   \   /j\                                                    C
+ C        /   \ /     \ /   \                                                   C
+ C       /| o |o       o| o |\                                                  C
+ C     \ j|/k\|      \  |/k\|l                                                  C
+ C      \ /   \       \ /   \                                                   C
+ C       o     \       o     \                                                  C
+ C       i             i                                                        C
+ C                                                                              C
  CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
  C
  C 4/7/01 AL Component s1 was removed, because it pertains to the respective