X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=source%2Funres%2Fdata%2Fnames.f90;h=5803edcd182fda026172aad4cc5f27647bdfa597;hb=fa303bca64ee8c5549cdc075600e06fb60974c9c;hp=e669cc16cac05a80afa6b8c7bb096ce5fd789ace;hpb=834a82f8158d4d91c1890efe979bf66cc399aea4;p=unres4.git

diff --git a/source/unres/data/names.f90 b/source/unres/data/names.f90
index e669cc1..5803edc 100644
--- a/source/unres/data/names.f90
+++ b/source/unres/data/names.f90
@@ -59,7 +59,7 @@
 !-----------------------------------------------------------------------------
 !-----------------------------------------------------------------------------
 ! Number of energy components
-      integer,parameter :: n_ene=25
+      integer,parameter :: n_ene=46
       integer :: n_ene2=2*n_ene
 !-----------------------------------------------------------------------------
 ! common.names
@@ -83,19 +83,30 @@
         "ECORR6    ","EELLO     ","ETURN3    ","ETURN4    ","ETURN6    ",&
         "EBE bend  ","ESC SCloc ","ETORS     ","ETORSD    ","EHPB      ","EVDWPP    ",&
         "EVDW2_14  ","ESTR      ","ESCCOR    ","EDIHC     ","EVDW_T    ",&
-        "ELT       ","          ","         ","ETUBE      " /)
+        "ELT       ","          ","          ","ETUBE     ",&
+        "EVDWPP    ","EESPP     ","EVDWPSB   ","EESPSB    ","EVDWSB    ",&
+        "EESSB     ","ESTR      ","EBE       ","ESBLOC    ","ETORS     ",&
+        "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   ",&
         "WTURN3    ","WTURN4    ","WTURN6   ","WANG       ","WSCLOC    ","WTOR      ","WTORD     ",&
         "WHPB      ","WVDWPP    ","WSCP14   ","WBOND      ","WSCCOR    ","WDIHC     ","WSC       ",&
-        "WLT       ","          ","         ","WTUBE      " /)
+        "WLT       ","          ","         ","WTUBE      " ,&
+        "WVDWPP    ","WELPP     ","WVDWPSB  ","WELPSB     ","WVDWSB    ",&
+        "WELSB     ","WBOND     ","WANG     ","WSBLOC     ","WTOR      ",&
+        "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/)
-
+         (/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,39,40,41,42,43,44,45,46/)
 
+      character(len=1), dimension(2) :: sugartyp = (/'D',' '/)
 !#endif
 !-----------------------------------------------------------------------------
 !-----------------------------------------------------------------------------