correction in new ions and clusterfix

[unres4.git] / source / unres / data / energy_data.F90

diff --git a/source/unres/data/energy_data.F90 b/source/unres/data/energy_data.F90
index 6459849..7babb3a 100644 (file)
--- a/source/unres/data/energy_data.F90
+++ b/source/unres/data/energy_data.F90
@@ -3,7 +3,7 @@
       use names
 !-----------------------------------------------------------------------------
 ! Max. number of energy intervals
-      integer,parameter :: max_ene=49 !10
+      integer,parameter :: max_ene=50 !10
 !-----------------------------------------------------------------------------
 ! Maximum number of terms in SC bond-stretching potential
       integer,parameter :: maxbondterm=3
@@ -73,7 +73,7 @@
        wturn6,wvdwpp,wliptran,wshield,lipscale,wtube, &
        wbond_nucl,wang_nucl,wcorr_nucl,wcorr3_nucl,welpp,wtor_nucl,&
        wtor_d_nucl,welsb,wsbloc,wvdwsb,welpsb,wvdwpp_nucl,wvdwpsb,wcatprot,&
-       wcatcat,wscbase,wpepbase,wscpho,wpeppho,wdihc
+       wcatcat,wscbase,wpepbase,wscpho,wpeppho,wdihc,wcatnucl
 #ifdef CLUSTER
       real(kind=8) :: scalscp
 #endif
@@ -343,7 +343,7 @@
         integer,dimension(:),allocatable :: icharge
         real(kind=8),dimension(:,:),allocatable :: alphapol,epshead,&
            sig0head,sigiso1,sigiso2,rborn,sigmap1,sigmap2,chis,wquad,chipp,&
-           epsintab
+           epsintab,debaykap
         real(kind=8),dimension(:,:,:),allocatable :: alphasur,alphiso,&
            wqdip,wstate,dtail
          real(kind=8),dimension(:,:,:,:),allocatable :: dhead
@@ -364,6 +364,8 @@
        real(kind=8) :: distafminit,forceAFMconst,velAFMconst
       integer :: afmend,afmbeg
       real(kind=8),dimension(:,:), allocatable :: catprm
+      real(kind=8),dimension(:,:,:), allocatable :: catnuclprm
+
 
          real(kind=8),dimension(:,:), allocatable ::  eps_scbase, &
         sigma_scbase,                         &
@@ -398,6 +400,35 @@
 !------------- for psi prec constraints
          real(kind=8),dimension(:,:), allocatable :: vpsipred,sdihed
 
+!23 Jul 2019 ions parameters by Agnieszka Lipska (Ca, K, Na, Mg, Cl)--------------------
+!        real(kind=8),dimension(:,:),allocatable :: alphapolcat,&
+!           epsheadcat,sig0headcat,sigiso1cat,sigiso2cat,sigmap1cat,&
+!           sigmap2cat,wquadcat,chicat,chiscat,chippcat,&
+!           epsintabcat,debaykapcat
+        integer,dimension(:),allocatable :: ichargecat
+!        integer oldion
+
+        real(kind=8),dimension(:,:),allocatable :: alphapolcat,&
+           epsheadcat,sig0headcat,sigiso1cat,sigiso2cat,rborn1cat,rborn2cat,&
+           sigmap1cat,sigmap2cat,chis1cat,chis2cat,wquadcat,chipp1cat,chipp2cat,&
+           epsintabcat,debaykapcat,chi1cat,chi2cat,sigmacat, nstatecat, epscat,&
+           aa_aq_cat,bb_aq_cat
 
+        real(kind=8),dimension(:,:,:),allocatable :: alphasurcat,&
+           alphisocat,wqdipcat,dtailcat,wstatecat
+         real(kind=8),dimension(:,:,:,:),allocatable :: dheadcat
+          integer,dimension(60000) :: contlistscpi_f,contlistscpj_f
+!         integer :: ifirstrun,ilist_scp_first
+!        real(kind=8),dimension(:,:),allocatable :: alphapol,epshead,&
+!           sig0head,sigiso1,sigiso2,rborn,sigmap1,sigmap2,chis,wquad,chipp,&
+!           epsintab,debaykap
 
+
+!end of ions parameters by Agnieszka Lipska (Ca, K, Na, Mg, Cl)-----------------------
+!
+! FRAGMENT FOR INTERACTION LIST
+        integer,dimension(:),allocatable :: newcontlistppi,newcontlistppj,&
+        newcontlisti,newcontlistj,  newcontlistscpi,newcontlistscpj
+        integer :: g_listpp_start,g_listpp_end,g_listscp_start,g_listscp_end,&
+        g_listscsc_start,g_listscsc_end   
       end module energy_data