Merge branch 'lipid' into AFM

[unres.git] / source / wham / src-M / COMMON.ALLPARM

diff --git a/source/wham/src-M/COMMON.ALLPARM b/source/wham/src-M/COMMON.ALLPARM
index 88b480f..5b6284a 100644 (file)
--- a/source/wham/src-M/COMMON.ALLPARM
+++ b/source/wham/src-M/COMMON.ALLPARM
@@ -66,8 +66,10 @@
      & app_all(2,2,max_parm),bpp_all(2,2,max_parm),
      & ael6_all(2,2,max_parm),ael3_all(2,2,max_parm),
      & aad_all(ntyp,2,max_parm),bad_all(ntyp,2,max_parm),
-     & aa_all(ntyp,ntyp,max_parm),bb_all(ntyp,ntyp,max_parm),
+     & aa_aq_all(ntyp,ntyp,max_parm),bb_aq_all(ntyp,ntyp,max_parm),
+     & aa_lip_all(ntyp,ntyp,max_parm),bb_lip_all(ntyp,ntyp,max_parm),
      & augm_all(ntyp,ntyp,max_parm),eps_all(ntyp,ntyp,max_parm),
+     & epslip_all(ntyp,ntyp,max_parm),
      & sigma_all(ntyp,ntyp,max_parm),r0_all(ntyp,ntyp,max_parm),
      & chi_all(ntyp,ntyp,max_parm),chip_all(ntyp,max_parm),
      & alp_all(ntyp,max_parm),ebr_all(max_parm),d0cm_all(max_parm),
@@ -98,7 +100,8 @@
      & v0_all,v1_all,v2_all,vlor1_all,vlor2_all,vlor3_all,v1c_all,
      & v1s_all,v2c_all,v2s_all,b1_all,b2_all,cc_all,dd_all,ee_all,
      & ctilde_all,dtilde_all,b1tilde_all,app_all,bpp_all,ael6_all,
-     & ael3_all,aad_all,bad_all,aa_all,bb_all,augm_all,
+     & ael3_all,aad_all,bad_all,aa_aq_all,bb_aq_all,augm_all,
+     & aa_lip_all,bb_lip_all,epslip_all,
      & eps_all,sigma_all,r0_all,chi_all,chip_all,alp_all,ebr_all,
      & d0cm_all,akcm_all,akth_all,akct_all,v1ss_all,v2ss_all,v3ss_all,
      & v1sccor_all,v2sccor_all,nbondterm_all,