working SC-base energy

[unres4.git] / source / unres / data / names.f90

diff --git a/source/unres/data/names.f90 b/source/unres/data/names.f90
index 97eb2d0..5803edc 100644 (file)
--- a/source/unres/data/names.f90
+++ b/source/unres/data/names.f90
@@ -59,7 +59,7 @@
 !-----------------------------------------------------------------------------
 !-----------------------------------------------------------------------------
 ! Number of energy components
-      integer,parameter :: n_ene=38
+      integer,parameter :: n_ene=46
       integer :: n_ene2=2*n_ene
 !-----------------------------------------------------------------------------
 ! common.names
@@ -86,7 +86,9 @@
         "ELT       ","          ","          ","ETUBE     ",&
         "EVDWPP    ","EESPP     ","EVDWPSB   ","EESPSB    ","EVDWSB    ",&
         "EESSB     ","ESTR      ","EBE       ","ESBLOC    ","ETORS     ",&
-        "ETORSD    ","ECORR     ","ECORR3    " /)
+        "ETORSD    ","ECORR     ","ECORR3    ","NULL      ","NULL      ",&
+        "ECATPROT  ","ECATCAT   ","NULL      ","NULL      ","NULL      ",&
+        "ESCBASE   "/)
 
       character(len=10),dimension(n_ene) :: wname = &
       (/"WSC       ","WSCP      ","WELEC"    ,"WCORR      ","WCORR5    ","WCORR6    ","WEL_LOC   ",&
@@ -95,14 +97,16 @@
         "WLT       ","          ","         ","WTUBE      " ,&
         "WVDWPP    ","WELPP     ","WVDWPSB  ","WELPSB     ","WVDWSB    ",&
         "WELSB     ","WBOND     ","WANG     ","WSBLOC     ","WTOR      ",&
-        "WTORD     ","WCORR     ","WCORR3   "/)
+        "WTORD     ","WCORR     ","WCORR3   ","WNULL      ","WNULL     ",&
+        "WCATPROT  ","WCATCAT   ","WNULL    ","WNULL      ","WNULL     ",&
+        "WSCBASE   "/)
 
       integer :: nprint_ene = 21
       integer,dimension(n_ene) :: print_order = &
          (/1,2,3,18,11,12,13,14,4,5,6,7,8,9,10,19,16,15,17,20,21,22,23,24,25,&
-         26,27,28,29,30,31,32,33,34,35,36,37,38/)
-
+         26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46/)
 
+      character(len=1), dimension(2) :: sugartyp = (/'D',' '/)
 !#endif
 !-----------------------------------------------------------------------------
 !-----------------------------------------------------------------------------