Remove nb-parameters from t_forcerec
authorBerk Hess <hess@kth.se>
Wed, 14 Sep 2016 10:42:31 +0000 (12:42 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Fri, 15 Sep 2017 21:16:35 +0000 (23:16 +0200)
Removed all Coulomb and Van der Waals mdp parameters from t_forcerec.
The ones that are not used in the Verlet scheme (yet) have been added
to interaction_const_t. Now init_interaction_const() is called early
in init_forcerec().

Change-Id: I9ca14f2194742cc8b0aef09a42dbd75fa3f94517

1258 files changed:
src/gromacs/ewald/ewald.cpp
src/gromacs/ewald/long-range-correction.cpp
src/gromacs/ewald/pme-load-balancing.cpp
src/gromacs/gmxlib/nonbonded/nb_free_energy.cpp
src/gromacs/gmxlib/nonbonded/nb_generic.cpp
src/gromacs/gmxlib/nonbonded/nb_generic_cg.cpp
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_avx_128_fma_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_double/nb_kernel_template_avx_128_fma_double.pre
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_avx_128_fma_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_128_fma_single/nb_kernel_template_avx_128_fma_single.pre
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_avx_256_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_double/nb_kernel_template_avx_256_double.pre
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_avx_256_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_avx_256_single/nb_kernel_template_avx_256_single.pre
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwBham_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwBham_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecCoul_VdwNone_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwBhamSh_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwBhamSw_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwBham_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwLJ_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecEw_VdwNone_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwBham_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwLJ_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecGB_VdwNone_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwBhamSh_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwBhamSw_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSh_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwBhamSw_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwBham_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwLJ_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomP1P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW3P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW3W3_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW4P1_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_ElecRF_VdwNone_GeomW4W4_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_allvsall.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_allvsallgb.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_c.c
src/gromacs/gmxlib/nonbonded/nb_kernel_c/nb_kernel_template_c.pre
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_sparc64_hpc_ace_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sparc64_hpc_ace_double/nb_kernel_template_sparc64_hpc_ace_double.pre
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_sse2_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_double/nb_kernel_template_sse2_double.pre
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_sse2_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse2_single/nb_kernel_template_sse2_single.pre
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_sse4_1_double.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_double/nb_kernel_template_sse4_1_double.pre
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCSTab_VdwNone_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwLJ_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecCoul_VdwNone_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSh_VdwNone_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEwSw_VdwNone_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwCSTab_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJEw_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwLJ_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecEw_VdwNone_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwCSTab_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwLJ_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecGB_VdwNone_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJEw_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSh_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecNone_VdwLJSw_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRFCut_VdwNone_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwCSTab_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwLJ_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomP1P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW3W3_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4P1_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_ElecRF_VdwNone_GeomW4W4_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_sse4_1_single.c
src/gromacs/gmxlib/nonbonded/nb_kernel_sse4_1_single/nb_kernel_template_sse4_1_single.pre
src/gromacs/listed-forces/pairs.cpp
src/gromacs/mdlib/force.cpp
src/gromacs/mdlib/force.h
src/gromacs/mdlib/forcerec.cpp
src/gromacs/mdlib/genborn.cpp
src/gromacs/mdlib/minimize.cpp
src/gromacs/mdlib/ns.cpp
src/gromacs/mdlib/rf_util.cpp
src/gromacs/mdlib/sim_util.cpp
src/gromacs/mdlib/tpi.cpp
src/gromacs/mdlib/wall.cpp
src/gromacs/mdtypes/forcerec.h
src/gromacs/mdtypes/interaction_const.h
src/gromacs/tables/forcetable.cpp
src/gromacs/tables/forcetable.h
src/programs/mdrun/md.cpp
src/programs/mdrun/runner.cpp

index ce3521a16fd3f710d4a2d2b364f9264a28ddf4b0..a628811aa906f0af385e465a4f08ca50b28d8b08 100644 (file)
@@ -314,7 +314,7 @@ real ewald_charge_correction(t_commrec *cr, t_forcerec *fr, real lambda,
         /* Apply charge correction */
         vol = box[XX][XX]*box[YY][YY]*box[ZZ][ZZ];
 
-        fac = M_PI*ONE_4PI_EPS0/(fr->epsilon_r*2.0*vol*vol*gmx::square(fr->ewaldcoeff_q));
+        fac = M_PI*ONE_4PI_EPS0/(fr->ic->epsilon_r*2.0*vol*vol*gmx::square(fr->ic->ewaldcoeff_q));
 
         qs2A = fr->qsum[0]*fr->qsum[0];
         qs2B = fr->qsum[1]*fr->qsum[1];
index a37e6113cfc43b4ae0f8358e670ce54c88542968..09438a88c061eb5cf49dd25ae45a0794791fb188 100644 (file)
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013,2014,2015,2016, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015,2016,2017, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -100,8 +100,8 @@ void ewald_LRcorrection(int numAtomsLocal,
     double      Vexcl_lj;
     real        one_4pi_eps;
     real        v, vc, qiA, qiB, dr2, rinv;
-    real        Vself_q[2], Vself_lj[2], Vdipole[2], rinv2, ewc_q = fr->ewaldcoeff_q, ewcdr;
-    real        ewc_lj = fr->ewaldcoeff_lj, ewc_lj2 = ewc_lj * ewc_lj;
+    real        Vself_q[2], Vself_lj[2], Vdipole[2], rinv2, ewc_q = fr->ic->ewaldcoeff_q, ewcdr;
+    real        ewc_lj = fr->ic->ewaldcoeff_lj, ewc_lj2 = ewc_lj * ewc_lj;
     real        c6Ai   = 0, c6Bi = 0, c6A = 0, c6B = 0, ewcdr2, ewcdr4, c6L = 0, rinv6;
     rvec        df, dx, mutot[2], dipcorrA, dipcorrB;
     tensor      dxdf_q = {{0}}, dxdf_lj = {{0}};
@@ -116,9 +116,11 @@ void ewald_LRcorrection(int numAtomsLocal,
      * However, that requires a thorough verification that they are correct in all cases.
      */
 
-    one_4pi_eps   = ONE_4PI_EPS0/fr->epsilon_r;
+    bool vdwPme   = EVDW_PME(fr->ic->vdwtype);
+
+    one_4pi_eps   = ONE_4PI_EPS0/fr->ic->epsilon_r;
     vr0_q         = ewc_q*M_2_SQRTPI;
-    if (EVDW_PME(fr->vdwtype))
+    if (vdwPme)
     {
         vr0_lj    = -gmx::power6(ewc_lj)/6.0;
     }
@@ -149,7 +151,7 @@ void ewald_LRcorrection(int numAtomsLocal,
             if (epsilon_surface != 0)
             {
                 dipole_coeff =
-                    2*M_PI*ONE_4PI_EPS0/((2*epsilon_surface + fr->epsilon_r)*vol);
+                    2*M_PI*ONE_4PI_EPS0/((2*epsilon_surface + fr->ic->epsilon_r)*vol);
                 for (i = 0; (i < DIM); i++)
                 {
                     dipcorrA[i] = 2*dipole_coeff*mutot[0][i];
@@ -188,7 +190,7 @@ void ewald_LRcorrection(int numAtomsLocal,
         {
             /* Initiate local variables (for this i-particle) to 0 */
             qiA = chargeA[i]*one_4pi_eps;
-            if (EVDW_PME(fr->vdwtype))
+            if (vdwPme)
             {
                 c6Ai = C6A[i];
                 if (bDoingLBRule)
@@ -215,7 +217,7 @@ void ewald_LRcorrection(int numAtomsLocal,
                     if (k > i)
                     {
                         qqA = qiA*chargeA[k];
-                        if (EVDW_PME(fr->vdwtype))
+                        if (vdwPme)
                         {
                             c6A  = c6Ai * C6A[k];
                             if (bDoingLBRule)
@@ -353,7 +355,7 @@ void ewald_LRcorrection(int numAtomsLocal,
             /* Initiate local variables (for this i-particle) to 0 */
             qiA = chargeA[i]*one_4pi_eps;
             qiB = chargeB[i]*one_4pi_eps;
-            if (EVDW_PME(fr->vdwtype))
+            if (vdwPme)
             {
                 c6Ai = C6A[i];
                 c6Bi = C6B[i];
@@ -376,7 +378,7 @@ void ewald_LRcorrection(int numAtomsLocal,
                     {
                         qqA = qiA*chargeA[k];
                         qqB = qiB*chargeB[k];
-                        if (EVDW_PME(fr->vdwtype))
+                        if (vdwPme)
                         {
                             c6A = c6Ai*C6A[k];
                             c6B = c6Bi*C6B[k];
@@ -391,7 +393,7 @@ void ewald_LRcorrection(int numAtomsLocal,
                             real fscal;
 
                             qqL   = L1_q*qqA + lambda_q*qqB;
-                            if (EVDW_PME(fr->vdwtype))
+                            if (vdwPme)
                             {
                                 c6L = L1_lj*c6A + lambda_lj*c6B;
                             }
@@ -444,7 +446,7 @@ void ewald_LRcorrection(int numAtomsLocal,
                                     }
                                 }
 
-                                if ((c6A != 0.0 || c6B != 0.0) && EVDW_PME(fr->vdwtype))
+                                if ((c6A != 0.0 || c6B != 0.0) && vdwPme)
                                 {
                                     rinv6         = rinv2*rinv2*rinv2;
                                     ewcdr2        = ewc_lj2*dr2;
@@ -522,7 +524,7 @@ void ewald_LRcorrection(int numAtomsLocal,
             {
                 /* Self-energy correction */
                 Vself_q[q] = ewc_q*one_4pi_eps*fr->q2sum[q]*M_1_SQRTPI;
-                if (EVDW_PME(fr->vdwtype))
+                if (vdwPme)
                 {
                     Vself_lj[q] =  fr->c6sum[q]*0.5*vr0_lj;
                 }
@@ -565,7 +567,7 @@ void ewald_LRcorrection(int numAtomsLocal,
     if (!bHaveChargeOrTypePerturbed)
     {
         *Vcorr_q = Vdipole[0] - Vself_q[0] - Vexcl_q;
-        if (EVDW_PME(fr->vdwtype))
+        if (vdwPme)
         {
             *Vcorr_lj = -Vself_lj[0] - Vexcl_lj;
         }
@@ -577,7 +579,7 @@ void ewald_LRcorrection(int numAtomsLocal,
             - Vexcl_q;
         *dvdlambda_q += Vdipole[1] - Vself_q[1]
             - (Vdipole[0] - Vself_q[0]) - dvdl_excl_q;
-        if (EVDW_PME(fr->vdwtype))
+        if (vdwPme)
         {
             *Vcorr_lj      = -(L1_lj*Vself_lj[0] + lambda_lj*Vself_lj[1]) - Vexcl_lj;
             *dvdlambda_lj += -Vself_lj[1] + Vself_lj[0] - dvdl_excl_lj;
index 6e2bea5d8739446eb0e9efc1996d0936fa447f5f..58caf85b458f45eca50a6d04476c42dab9fd644b 100644 (file)
@@ -1017,12 +1017,8 @@ void pme_loadbal_do(pme_load_balancing_t *pme_lb,
                          fr->ic, fr->nbv, &fr->pmedata,
                          step);
 
-        /* Update constants in forcerec/inputrec to keep them in sync with fr->ic */
-        fr->ewaldcoeff_q  = fr->ic->ewaldcoeff_q;
-        fr->ewaldcoeff_lj = fr->ic->ewaldcoeff_lj;
+        /* Update deprecated rlist in forcerec to stay in sync with fr->nbv */
         fr->rlist         = fr->nbv->listParams->rlistOuter;
-        fr->rcoulomb      = fr->ic->rcoulomb;
-        fr->rvdw          = fr->ic->rvdw;
 
         if (ir->eDispCorr != edispcNO)
         {
index db50f9b3c5bd3c60acb35fe3cdc0ab56b17aa239..381e49c69f309eff1cf77cd2e53c4a6fda4df848 100644 (file)
@@ -138,6 +138,9 @@ gmx_nb_free_energy_kernel(const t_nblist * gmx_restrict    nlist,
     const real    six         = 6.0;
     const real    fourtyeight = 48.0;
 
+    /* Extract pointer to non-bonded interaction constants */
+    const interaction_const_t *ic = fr->ic;
+
     x                   = xx[0];
     f                   = ff[0];
 
@@ -155,9 +158,9 @@ gmx_nb_free_energy_kernel(const t_nblist * gmx_restrict    nlist,
     shiftvec            = fr->shift_vec[0];
     chargeA             = mdatoms->chargeA;
     chargeB             = mdatoms->chargeB;
-    facel               = fr->epsfac;
-    krf                 = fr->k_rf;
-    crf                 = fr->c_rf;
+    facel               = fr->ic->epsfac;
+    krf                 = ic->k_rf;
+    crf                 = ic->c_rf;
     Vc                  = kernel_data->energygrp_elec;
     typeA               = mdatoms->typeA;
     typeB               = mdatoms->typeB;
@@ -178,17 +181,17 @@ gmx_nb_free_energy_kernel(const t_nblist * gmx_restrict    nlist,
     bDoShiftForces      = kernel_data->flags & GMX_NONBONDED_DO_SHIFTFORCE;
     bDoPotential        = kernel_data->flags & GMX_NONBONDED_DO_POTENTIAL;
 
-    rcoulomb            = fr->rcoulomb;
-    rvdw                = fr->rvdw;
-    sh_invrc6           = fr->ic->sh_invrc6;
-    sh_lj_ewald         = fr->ic->sh_lj_ewald;
-    ewclj               = fr->ewaldcoeff_lj;
+    rcoulomb            = ic->rcoulomb;
+    rvdw                = ic->rvdw;
+    sh_invrc6           = ic->sh_invrc6;
+    sh_lj_ewald         = ic->sh_lj_ewald;
+    ewclj               = ic->ewaldcoeff_lj;
     ewclj2              = ewclj*ewclj;
     ewclj6              = ewclj2*ewclj2*ewclj2;
 
-    if (fr->coulomb_modifier == eintmodPOTSWITCH)
+    if (ic->coulomb_modifier == eintmodPOTSWITCH)
     {
-        d               = fr->rcoulomb-fr->rcoulomb_switch;
+        d               = ic->rcoulomb - ic->rcoulomb_switch;
         elec_swV3       = -10.0/(d*d*d);
         elec_swV4       =  15.0/(d*d*d*d);
         elec_swV5       =  -6.0/(d*d*d*d*d);
@@ -202,9 +205,9 @@ gmx_nb_free_energy_kernel(const t_nblist * gmx_restrict    nlist,
         elec_swV3 = elec_swV4 = elec_swV5 = elec_swF2 = elec_swF3 = elec_swF4 = 0.0;
     }
 
-    if (fr->vdw_modifier == eintmodPOTSWITCH)
+    if (ic->vdw_modifier == eintmodPOTSWITCH)
     {
-        d               = fr->rvdw-fr->rvdw_switch;
+        d               = ic->rvdw - ic->rvdw_switch;
         vdw_swV3        = -10.0/(d*d*d);
         vdw_swV4        =  15.0/(d*d*d*d);
         vdw_swV5        =  -6.0/(d*d*d*d*d);
@@ -220,9 +223,8 @@ gmx_nb_free_energy_kernel(const t_nblist * gmx_restrict    nlist,
 
     if (fr->cutoff_scheme == ecutsVERLET)
     {
-        const interaction_const_t *ic;
+        const interaction_const_t *ic = fr->ic;
 
-        ic = fr->ic;
         if (EVDW_PME(ic->vdwtype))
         {
             ivdw         = GMX_NBKERNEL_VDW_LJEWALD;
@@ -250,12 +252,12 @@ gmx_nb_free_energy_kernel(const t_nblist * gmx_restrict    nlist,
     }
     else
     {
-        bExactElecCutoff = (fr->coulomb_modifier != eintmodNONE) || fr->eeltype == eelRF_ZERO;
-        bExactVdwCutoff  = (fr->vdw_modifier != eintmodNONE);
+        bExactElecCutoff = (ic->coulomb_modifier != eintmodNONE) || ic->eeltype == eelRF_ZERO;
+        bExactVdwCutoff  = (ic->vdw_modifier != eintmodNONE);
     }
 
     bExactCutoffAll = (bExactElecCutoff && bExactVdwCutoff);
-    rcutoff_max2    = std::max(fr->rcoulomb, fr->rvdw);
+    rcutoff_max2    = std::max(ic->rcoulomb, ic->rvdw);
     rcutoff_max2    = rcutoff_max2*rcutoff_max2;
 
     bEwald          = (icoul == GMX_NBKERNEL_ELEC_EWALD);
@@ -263,12 +265,12 @@ gmx_nb_free_energy_kernel(const t_nblist * gmx_restrict    nlist,
 
     if (bEwald || bEwaldLJ)
     {
-        sh_ewald       = fr->ic->sh_ewald;
-        ewtab          = fr->ic->tabq_coul_FDV0;
-        ewtabscale     = fr->ic->tabq_scale;
+        sh_ewald       = ic->sh_ewald;
+        ewtab          = ic->tabq_coul_FDV0;
+        ewtabscale     = ic->tabq_scale;
         ewtabhalfspace = half/ewtabscale;
-        tab_ewald_F_lj = fr->ic->tabq_vdw_F;
-        tab_ewald_V_lj = fr->ic->tabq_vdw_V;
+        tab_ewald_F_lj = ic->tabq_vdw_F;
+        tab_ewald_V_lj = ic->tabq_vdw_V;
     }
 
     /* For Ewald/PME interactions we cannot easily apply the soft-core component to
@@ -284,11 +286,11 @@ gmx_nb_free_energy_kernel(const t_nblist * gmx_restrict    nlist,
      * things (1/r rather than short-range Ewald). For these settings, we just
      * use the traditional short-range Ewald interaction in that case.
      */
-    bConvertEwaldToCoulomb = (bEwald && (fr->coulomb_modifier != eintmodPOTSWITCH));
+    bConvertEwaldToCoulomb = (bEwald && (ic->coulomb_modifier != eintmodPOTSWITCH));
     /* For now the below will always be true (since LJ-PME only works with Shift in Gromacs-5.0),
      * but writing it this way means we stay in sync with coulomb, and it avoids future bugs.
      */
-    bConvertLJEwaldToLJ6   = (bEwaldLJ && (fr->vdw_modifier   != eintmodPOTSWITCH));
+    bConvertLJEwaldToLJ6   = (bEwaldLJ && (ic->vdw_modifier   != eintmodPOTSWITCH));
 
     /* We currently don't implement exclusion correction, needed with the Verlet cut-off scheme, without conversion */
     if (fr->cutoff_scheme == ecutsVERLET &&
@@ -543,7 +545,7 @@ gmx_nb_free_energy_kernel(const t_nblist * gmx_restrict    nlist,
                                     /* The shift for the Coulomb potential is stored in
                                      * the RF parameter c_rf, which is 0 without shift.
                                      */
-                                    Vcoul[i]  -= qq[i]*fr->ic->c_rf;
+                                    Vcoul[i]  -= qq[i]*ic->c_rf;
                                     break;
 
                                 case GMX_NBKERNEL_ELEC_REACTIONFIELD:
@@ -600,9 +602,9 @@ gmx_nb_free_energy_kernel(const t_nblist * gmx_restrict    nlist,
                                     break;
                             }
 
-                            if (fr->coulomb_modifier == eintmodPOTSWITCH)
+                            if (ic->coulomb_modifier == eintmodPOTSWITCH)
                             {
-                                d                = rC-fr->rcoulomb_switch;
+                                d                = rC - ic->rcoulomb_switch;
                                 d                = (d > zero) ? d : zero;
                                 d2               = d*d;
                                 sw               = one+d2*d*(elec_swV3+d*(elec_swV4+d*elec_swV5));
@@ -722,9 +724,9 @@ gmx_nb_free_energy_kernel(const t_nblist * gmx_restrict    nlist,
                                     break;
                             }
 
-                            if (fr->vdw_modifier == eintmodPOTSWITCH)
+                            if (ic->vdw_modifier == eintmodPOTSWITCH)
                             {
-                                d                = rV-fr->rvdw_switch;
+                                d                = rV - ic->rvdw_switch;
                                 d                = (d > zero) ? d : zero;
                                 d2               = d*d;
                                 sw               = one+d2*d*(vdw_swV3+d*(vdw_swV4+d*vdw_swV5));
index 70244a9f684c1519a1abfdf3c71b5464f308ee28..499b9f5d2dc6a344aed6c5a18b85f9a7b93c1935 100644 (file)
@@ -119,24 +119,27 @@ gmx_nb_generic_kernel(t_nblist *                nlist,
         tabscale        = 0;
         VFtab           = nullptr;
     }
-    ewtab               = fr->ic->tabq_coul_FDV0;
-    ewtabscale          = fr->ic->tabq_scale;
+
+    const interaction_const_t *ic = fr->ic;
+
+    ewtab               = ic->tabq_coul_FDV0;
+    ewtabscale          = ic->tabq_scale;
     ewtabhalfspace      = 0.5/ewtabscale;
 
-    rcoulomb2           = fr->rcoulomb*fr->rcoulomb;
-    rvdw                = fr->rvdw;
+    rcoulomb2           = ic->rcoulomb*ic->rcoulomb;
+    rvdw                = ic->rvdw;
     rvdw2               = rvdw*rvdw;
-    sh_dispersion       = fr->ic->dispersion_shift.cpot;
-    sh_repulsion        = fr->ic->repulsion_shift.cpot;
-    sh_lj_ewald         = fr->ic->sh_lj_ewald;
+    sh_dispersion       = ic->dispersion_shift.cpot;
+    sh_repulsion        = ic->repulsion_shift.cpot;
+    sh_lj_ewald         = ic->sh_lj_ewald;
 
-    ewclj               = fr->ewaldcoeff_lj;
+    ewclj               = ic->ewaldcoeff_lj;
     ewclj2              = ewclj*ewclj;
     ewclj6              = ewclj2*ewclj2*ewclj2;
 
-    if (fr->coulomb_modifier == eintmodPOTSWITCH)
+    if (ic->coulomb_modifier == eintmodPOTSWITCH)
     {
-        d               = fr->rcoulomb-fr->rcoulomb_switch;
+        d               = ic->rcoulomb - ic->rcoulomb_switch;
         elec_swV3       = -10.0/(d*d*d);
         elec_swV4       =  15.0/(d*d*d*d);
         elec_swV5       =  -6.0/(d*d*d*d*d);
@@ -149,9 +152,9 @@ gmx_nb_generic_kernel(t_nblist *                nlist,
         /* Avoid warnings from stupid compilers (looking at you, Clang!) */
         elec_swV3 = elec_swV4 = elec_swV5 = elec_swF2 = elec_swF3 = elec_swF4 = 0.0;
     }
-    if (fr->vdw_modifier == eintmodPOTSWITCH)
+    if (ic->vdw_modifier == eintmodPOTSWITCH)
     {
-        d               = fr->rvdw-fr->rvdw_switch;
+        d               = ic->rvdw - ic->rvdw_switch;
         vdw_swV3        = -10.0/(d*d*d);
         vdw_swV4        =  15.0/(d*d*d*d);
         vdw_swV5        =  -6.0/(d*d*d*d*d);
@@ -165,13 +168,13 @@ gmx_nb_generic_kernel(t_nblist *                nlist,
         vdw_swV3 = vdw_swV4 = vdw_swV5 = vdw_swF2 = vdw_swF3 = vdw_swF4 = 0.0;
     }
 
-    bExactElecCutoff    = (fr->coulomb_modifier != eintmodNONE) || fr->eeltype == eelRF_ZERO;
-    bExactVdwCutoff     = (fr->vdw_modifier != eintmodNONE);
+    bExactElecCutoff    = (ic->coulomb_modifier != eintmodNONE) || ic->eeltype == eelRF_ZERO;
+    bExactVdwCutoff     = (ic->vdw_modifier != eintmodNONE);
     bExactCutoff        = bExactElecCutoff && bExactVdwCutoff;
 
     if (bExactCutoff)
     {
-        rcutoff  = ( fr->rcoulomb > fr->rvdw ) ? fr->rcoulomb : fr->rvdw;
+        rcutoff  = ( ic->rcoulomb > ic->rvdw ) ? ic->rcoulomb : ic->rvdw;
         rcutoff2 = rcutoff*rcutoff;
     }
     else
@@ -191,7 +194,7 @@ gmx_nb_generic_kernel(t_nblist *                nlist,
 
     charge              = mdatoms->chargeA;
     type                = mdatoms->typeA;
-    facel               = fr->epsfac;
+    facel               = fr->ic->epsfac;
     shiftvec            = fr->shift_vec[0];
     vdwparam            = fr->nbfp;
     ntype               = fr->ntype;
@@ -268,13 +271,13 @@ gmx_nb_generic_kernel(t_nblist *                nlist,
                         /* The shift for the Coulomb potential is stored in
                          * the RF parameter c_rf, which is 0 without shift
                          */
-                        velec           -= qq*fr->ic->c_rf;
+                        velec           -= qq*ic->c_rf;
                         break;
 
                     case GMX_NBKERNEL_ELEC_REACTIONFIELD:
                         /* Reaction-field */
-                        velec            = qq*(rinv+fr->k_rf*rsq-fr->c_rf);
-                        felec            = qq*(rinv*rinvsq-2.0*fr->k_rf);
+                        velec            = qq*(rinv + ic->k_rf*rsq-ic->c_rf);
+                        felec            = qq*(rinv*rinvsq - 2.0*ic->k_rf);
                         break;
 
                     case GMX_NBKERNEL_ELEC_CUBICSPLINETABLE:
@@ -301,7 +304,7 @@ gmx_nb_generic_kernel(t_nblist *                nlist,
                         eweps            = ewrt-ewitab;
                         ewitab           = 4*ewitab;
                         felec            = ewtab[ewitab]+eweps*ewtab[ewitab+1];
-                        rinvcorr         = (fr->coulomb_modifier == eintmodPOTSHIFT) ? rinv-fr->ic->sh_ewald : rinv;
+                        rinvcorr         = (ic->coulomb_modifier == eintmodPOTSHIFT) ? rinv - ic->sh_ewald : rinv;
                         velec            = qq*(rinvcorr-(ewtab[ewitab+2]-ewtabhalfspace*eweps*(ewtab[ewitab]+felec)));
                         felec            = qq*rinv*(rinvsq-felec);
                         break;
@@ -310,9 +313,9 @@ gmx_nb_generic_kernel(t_nblist *                nlist,
                         gmx_fatal(FARGS, "Death & horror! No generic coulomb interaction for ielec=%d.\n", ielec);
                         break;
                 }
-                if (fr->coulomb_modifier == eintmodPOTSWITCH)
+                if (ic->coulomb_modifier == eintmodPOTSWITCH)
                 {
-                    d                = rsq*rinv-fr->rcoulomb_switch;
+                    d                = rsq*rinv - ic->rcoulomb_switch;
                     d                = (d > 0.0) ? d : 0.0;
                     d2               = d*d;
                     sw               = 1.0+d2*d*(elec_swV3+d*(elec_swV4+d*elec_swV5));
@@ -352,7 +355,7 @@ gmx_nb_generic_kernel(t_nblist *                nlist,
                         vvdw_disp        = c6*rinvsix;
                         vvdw_rep         = c12*rinvsix*rinvsix;
                         fvdw             = (vvdw_rep-vvdw_disp)*rinvsq;
-                        if (fr->vdw_modifier == eintmodPOTSHIFT)
+                        if (ic->vdw_modifier == eintmodPOTSHIFT)
                         {
                             vvdw             = (vvdw_rep + c12*sh_repulsion)/12.0 - (vvdw_disp + c6*sh_dispersion)/6.0;
                         }
@@ -373,7 +376,7 @@ gmx_nb_generic_kernel(t_nblist *                nlist,
                         br               = cexp2*rsq*rinv;
                         vvdw_rep         = cexp1*std::exp(-br);
                         fvdw             = (br*vvdw_rep-vvdw_disp)*rinvsq;
-                        if (fr->vdw_modifier == eintmodPOTSHIFT)
+                        if (ic->vdw_modifier == eintmodPOTSHIFT)
                         {
                             vvdw             = (vvdw_rep-cexp1*std::exp(-cexp2*rvdw))-(vvdw_disp + c6*sh_dispersion)/6.0;
                         }
@@ -422,7 +425,7 @@ gmx_nb_generic_kernel(t_nblist *                nlist,
                         vvdw_disp        = (c6-c6grid*(1.0-poly))*rinvsix;
                         vvdw_rep         = c12*rinvsix*rinvsix;
                         fvdw             = (vvdw_rep - vvdw_disp - c6grid*(1.0/6.0)*exponent*ewclj6)*rinvsq;
-                        if (fr->vdw_modifier == eintmodPOTSHIFT)
+                        if (ic->vdw_modifier == eintmodPOTSHIFT)
                         {
                             vvdw             = (vvdw_rep + c12*sh_repulsion)/12.0 - (vvdw_disp + c6*sh_dispersion - c6grid*sh_lj_ewald)/6.0;
                         }
@@ -436,9 +439,9 @@ gmx_nb_generic_kernel(t_nblist *                nlist,
                         gmx_fatal(FARGS, "Death & horror! No generic VdW interaction for ivdw=%d.\n", ivdw);
                         break;
                 }
-                if (fr->vdw_modifier == eintmodPOTSWITCH)
+                if (ic->vdw_modifier == eintmodPOTSWITCH)
                 {
-                    d                = rsq*rinv-fr->rvdw_switch;
+                    d                = rsq*rinv - ic->rvdw_switch;
                     d                = (d > 0.0) ? d : 0.0;
                     d2               = d*d;
                     sw               = 1.0+d2*d*(vdw_swV3+d*(vdw_swV4+d*vdw_swV5));
index 9bddb02823cead9390815da173e20b7c8a015116..315247998cc30ffd182c7d749797237cc48018a1 100644 (file)
@@ -123,7 +123,7 @@ gmx_nb_generic_cg_kernel(t_nblist *                nlist,
 
     charge              = mdatoms->chargeA;
     type                = mdatoms->typeA;
-    facel               = fr->epsfac;
+    facel               = fr->ic->epsfac;
     shiftvec            = fr->shift_vec[0];
     vdwparam            = fr->nbfp;
     ntype               = fr->ntype;
@@ -210,8 +210,8 @@ gmx_nb_generic_cg_kernel(t_nblist *                nlist,
 
                             case 2:
                                 /* Reaction-field */
-                                krsq             = fr->k_rf*rsq;
-                                vcoul            = qq*(rinv+krsq-fr->c_rf);
+                                krsq             = fr->ic->k_rf*rsq;
+                                vcoul            = qq*(rinv + krsq - fr->ic->c_rf);
                                 fscal            = qq*(rinv-2.0*krsq)*rinvsq;
                                 break;
 
index 0e65e89c99b29535cb6c1b4f9b2462c88bc57ba6..08332f6528ee05ad0535c1bf9678c4678ffc2a42 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -463,7 +463,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 92fbbaf1224a07b10a049b8c3c17e7384c16231b..44596f605ddf40f7916225b84c0433247cb0ef82 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -709,7 +709,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 8d2ae4dd338c9dd2d4d8ffadce7cd78b97aadeea..9878f2b00740a586cd74ee2792a101740e234feb 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1333,7 +1333,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 9e46466101ee22361e554d10e25657d9fcda56bd..0fab5a74bee318b0081fe70c9021d20330acafdd 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -794,7 +794,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index fb86498f22d86b3d95a917da4c86c581e645452f..8c76875a0ce95b895969bb742a45ffcd98c9193f 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1426,7 +1426,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index fe34546856f525969abfcf65afc60f7ab9202c18..409a897d15af7cc14134fc9c6bf6c76763c31176 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -423,7 +423,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index d87961083161ae4a48717aeef45f351833894bd1..014d4682e3af4080a5eb1ca97c2fe2e14dabc7b3 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -669,7 +669,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index efffe1cf427881ec4b72967a8bff91fa5dacf5da..ca602aa8f6229dbdeb63c41d37de39f9598d9258 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1293,7 +1293,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 0aab8140633023ded0983d5d7b25d7fabcf1d063..a1b7a632bd96fc2059bf5aa410c066d3effb071f 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -726,7 +726,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 88afde36ab4f1ad3c72389ec01621a9f1f2acd9c..f0866d4b4b00b6bb67831852224e2d4df36a3daa 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1358,7 +1358,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 86a8fca36052d0d60a5278b5ebbe1e9eb6185d34..f2ecc0457100e13d488db2fd1cc03f25c7f18a99 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -376,7 +376,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index c811aaca84e434a6ecc2b826399f87863650f887..170f17130bafc94adf90171eb6a470b7f692bc65 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -622,7 +622,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 366031ecc6e7718c54f5754d1948607d4ed0ba45..a9160938603c846f60724c1c810824a39daed96d 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1249,7 +1249,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index b12ba2f166d7a70a856321b60528e0a2a6b17c86..5fb11968baade168e6d1fb0fac5daa9ff015f828 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -622,7 +622,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 89d1e4c2713dbaf22b8d99e282df86b7e6fc3b87..1ad50cfc5cf464527d097070d0c3a90fe611b929 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1249,7 +1249,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 44b23225ee2512a0df065d8c0ba1fc63a67e97a3..8f5d40f2cca962711a7d064ea6dc717e73b90486 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -447,7 +447,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index f6b1b1853a4e9e1324acdcdeef43d0ea5f5b1b7b..5a4fc2e3429ca97f7f373d82f985362d47bae19b 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -609,7 +609,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index fe75f2486002a5d0c8aed761bf4c496f336c6134..bc765313180b76876bd430012a9a0cb818fd939c 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -981,7 +981,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 82bc65502d49f0b69cda4d0eea77828b4a0e1896..a62c0689efb737bc337cf1c167336b198b1c7242 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -668,7 +668,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 90cc63c230ccff43bca06523a05b008b3b620f06..1269f016625c6da5682399e10a1a96abb60491b7 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1048,7 +1048,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index f49ae6583f30dc2fc235309d13d67ee3c35d4e2d..7e832f64a20ae18cadde9fcf4abb5e7d64b8555a 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -368,7 +368,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 8e4d1c50a430acfd101528aeaa7f73c09a1363b8..f355e16c06de00637a79623a92b8e42ad556a18d 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -530,7 +530,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 2229a9ad135fa37c9087f7a10d66664b819687ef..6a9fe78d2228cb6788b9cff0953216fb5aad89e3 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -902,7 +902,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index c1611161e59868d49aab63eca09274d28ddcae67..cfcbd4250ee971a135930d5d1742af7b832e6e14 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -589,7 +589,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index d7cc28a6de5d4974c43bb9e7a1c4d9b612e3c151..b691874adf7090ff5697605647e497cc6e77189c 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -969,7 +969,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index eb4825748666e0f3d7ce61f35b3806f70663db60..a6187e18ad7ff5267051b788532eb07150d25fbb 100644 (file)
@@ -98,7 +98,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
@@ -325,7 +325,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
index 8064b0fda1e2fe608e61d069484676da94ca4f0f..c90c25b6ce5e41303eaab14150d62cd07e472423 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -487,7 +487,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index fe90389403cad93dcfb457de053d493becad3f82..51b9821b9c798830577976d4fbaef76a3ab1727d 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -862,7 +862,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 9b7535dde763d0be19c29ea0a0f7bb0e438fdac4..11b01a95be24f0ae97c75c0b7cb92c14d450523d 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -487,7 +487,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index ec3a0483f60a34dda8352e5f20ed785368fcf3c3..79f7f7daae677466250fc7a79fa2b467cd7364ee 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -862,7 +862,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index f67834dae98979c034562b525379a0f2db5a4c33..12896c623399bc365e4b30eb38c2cb28ae6d4757 100644 (file)
@@ -112,14 +112,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -128,12 +128,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_avx_128_fma_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -482,14 +482,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -498,12 +498,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_avx_128_fma_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 05bab3160bfe532c2da6d291111d36a92b9ef073..de7fe1cd35f73fcd3c6c80f8105e685aa30f8b17 100644 (file)
@@ -120,14 +120,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -143,12 +143,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -772,14 +772,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -795,12 +795,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index a49616cd4a7d0adef9a2b434f1f4a36affdb41d9..950106ab0592a84332cdbafa8c570074891a8be8 100644 (file)
@@ -136,14 +136,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -176,12 +176,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1526,14 +1526,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1566,12 +1566,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 0a7d64281c3ac44bc886b1cb65fa87767064184a..3d8fde00eaa05e5b39ba2902f69f1e2f0c552121 100644 (file)
@@ -124,14 +124,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -147,12 +147,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -857,14 +857,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -880,12 +880,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 9479c86c1a9ba9cd669469dac159c8f57d436390..9969ca7085727552de6c779c15b4e78de7596d96 100644 (file)
@@ -142,14 +142,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -182,12 +182,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1619,14 +1619,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1659,12 +1659,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 73dc88749e458b9d584933cd913c51022827b322..637c96ec4758edc7c67bca125fe9d9dabc659eeb 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -119,12 +119,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_avx_128_fma_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -453,7 +453,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -465,12 +465,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_avx_128_fma_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index f52e488f92afc51d30a7f8b75b2d85c11424a9db..aa166495db41c5b375d25baa191f3acf4f6f5be1 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -132,12 +132,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -739,7 +739,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -758,12 +758,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 36c2a5b195a70439bd0b8a0201d47a1596183d3f..ec21aabfc4820192f3f2c465bffc469c456357d8 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -158,12 +158,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1483,7 +1483,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1518,12 +1518,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index caa2070f356df35883afd402141efb92936c906f..238b8d5a0b74871253d1ecda7fbd0944584a3c3a 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -135,12 +135,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -816,7 +816,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -835,12 +835,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 1099b0c20e0c6af4d62249f62b4e10eba6344f5d..9e4070cd83739c2c5aaa8405db226c0e889ae97f 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -163,12 +163,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1568,7 +1568,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1603,12 +1603,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index e7f4f6adbbea102ff9d694d697fe050b01d7d788..237950212bab581d7310a3d6094c91038c6bb341 100644 (file)
@@ -101,7 +101,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -110,7 +110,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_avx_128_fma_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -403,7 +403,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -412,7 +412,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_avx_128_fma_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 0d4eba09eddc27da5c96d879abe2474f1879241d..e288b915bc0b6c4ac009a00bb831b39e9a2dad0e 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -122,7 +122,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_avx_128_fma_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -689,7 +689,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -704,7 +704,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_avx_128_fma_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 80cd39408eb08f2491625cb040146fe0f626fc92..cab527eab7cb7d244b0cb52caf76127d34702152 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -145,7 +145,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1436,7 +1436,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1464,7 +1464,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 823af83bb2c2953e4a7335a683da3dafa42dc1e9..9ac48410879408733fdc419a407365db5d8e39a8 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -122,7 +122,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_avx_128_fma_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -689,7 +689,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -704,7 +704,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_avx_128_fma_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index fe16a5d591a26a61b066fd7f46534ef3da4a1e9d..c87d089561b5c4c3ca91b42599435b378e98406e 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -145,7 +145,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1436,7 +1436,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1464,7 +1464,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index f2b1e90f742b2100622f06f82b705b84d17e6ece..8ce60cd44b019441720bccb20d1e80720ac1bbaf 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -121,11 +121,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_avx_128_fma_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -490,7 +490,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -502,11 +502,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_avx_128_fma_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index e7f6bdc11373ec69ca07174cf8bca468f9c8aa4f..a4b927537c0e26b818fd943ded1a658ad20a17fe 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -134,11 +134,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -820,7 +820,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -839,11 +839,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 108f0f6edce79279dead52781d5d205b52660353..9d068f5c3d5e3b3eb77d136e91d81a6e0f10b39c 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -160,11 +160,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1696,7 +1696,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1731,11 +1731,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index d8bf1ab38ffbfef2bfacbfaeb8731d6c1f15f43e..fbdc18a884947d646723f1c5243aabb1397bf892 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -137,11 +137,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -921,7 +921,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -940,11 +940,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 52fcff6f00f9e83ebc6227587437c539f6c9bfb2..b1b04b36e1bf9fdc2eddbdce867f573844a4ae09 100644 (file)
@@ -130,7 +130,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -165,11 +165,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1805,7 +1805,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1840,11 +1840,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 5dd95f8b988e44dff01d9fce548cd3b2c314d527..a419817665bcc3166f709813284b7734a96ae3a0 100644 (file)
@@ -103,7 +103,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -112,11 +112,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_avx_128_fma_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -441,7 +441,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -450,11 +450,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_avx_128_fma_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index d3be94306c37d7c74005d295e3cdfcadccffc674..10f7cc1f3585d1f41e322c0dc80c9cd081bc8ac7 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -124,11 +124,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_avx_128_fma_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -771,7 +771,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -786,11 +786,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_avx_128_fma_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index cdc28f0b02875ce6d31e03e32dff26e5ef1e4d47..3aa48e9a50454f8b1b1ea6650255132544d9d880 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -147,11 +147,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1650,7 +1650,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1678,11 +1678,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 90b4ff78c160ed03703dddecd158bcd44711fa15..ae5f4efd82a62ea0583deb779f7b590a187da657 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -124,11 +124,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_avx_128_fma_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -771,7 +771,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -786,11 +786,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_avx_128_fma_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 742e57652632b2221a1b2bbb1d1c93fcba08c7d6..0166caf928d17c07d73aee55325f9b3b14c42c6c 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -147,11 +147,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1650,7 +1650,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1678,11 +1678,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index d21ef2567d80a9b28caa260e09924433b303c184..ebdd91a3dbf5220db8d199fcabc78fe216a1c77c 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -496,7 +496,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 4aae06351be2b30ef8cd40b7ed75ada72f19e7d1..4db2af6204478906c2b6366be85e6d4e15bfd68b 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -742,7 +742,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 21012ff48ed0aeb668ed1e9524ac4d8a9bb57623..1110db579e653a85c5f354110b7bd3987468c2de 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1366,7 +1366,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 051e7bc29cab32474a3ca345d8fcfab529eee6b6..a3584ace183a494e2ea6a34b8f52fbda1be931e7 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -805,7 +805,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index f3f6e4be76e664ef86640126be0f7b2505ab883c..d34afe83dadc84a1074a16842f6d9e526f31308d 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1437,7 +1437,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index c2d8af8a534b5b7b8d3547b79144ecdcdfc839cf..e835e14e08581a466ab6e12474b49a0797f2a103 100644 (file)
@@ -112,14 +112,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -450,14 +450,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index 663ce52f486f3dea5f02027ebc986de6563e6dad..5cadfe9e88f6f819b7b01338043e92bbaf758b2f 100644 (file)
@@ -120,14 +120,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -700,14 +700,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index 0bac9e742fa9c499d7485867ce8c68b559dbf273..bbeb3c6cc65a9802c337b9946bff521273033307 100644 (file)
@@ -136,14 +136,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1334,14 +1334,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index 95b2eabd2533a7dbfa792366c2711634c985905a..ea8f57e092665cdfe2ca7c0b7583e48a96b7ac01 100644 (file)
@@ -124,14 +124,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -767,14 +767,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index a3f7ee07eb76a2b42d184338e680080d9fadc048..6c1c54603b24aa3eebf0eb7f333928aca2578302 100644 (file)
@@ -142,14 +142,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1409,14 +1409,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index bce5bdc7b5a01f524696571aca84b13b07bfb4a7..a455c511bdd8511cb08450fdd3876d502e820abf 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -421,7 +421,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 51d0d76e6dd2e404bec31439da5d9db0652d173d..32d542d90fa47d3dd4fc9f00d572ff24daceda6f 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -667,7 +667,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index af646cf0b5b1a32406974df98cd3c782d7f50ebf..4a662c0652cc61b0efa8a04346b0349c73f4cfe4 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1291,7 +1291,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 9302265c3880f206cf58bcac69525a589bec4b73..182496af23a76f4e794eb9ef5a41bdd7e4b419d4 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -726,7 +726,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index b976b1d8995adfe6d3c8208f538d98d7a349a5a1..adc366c4b0a32447697a62385a0a191894867b43 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1358,7 +1358,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index a57f6c1613e4746b769a63ee6fe74f3057551609..1806a38655a69ae5d9ee3af208740fddcf8a3b8c 100644 (file)
@@ -101,7 +101,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -378,7 +378,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index e230a2d02b5b3f0caa34d427c05084154cb67c2c..8a5c93804356d99931ef6469f8f0da0112c14111 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -624,7 +624,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index 10960bebc023a42c6659c1ed16b31f854adb563d..a7f43bc580c6daef0a66942a05c5a9a266664c20 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1251,7 +1251,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index dc5a1530d7d6ef57a10b3d0c3b7e0916288f1a8a..5ef96f8a13a1d415ca5a958bcc539df40d0837b3 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -624,7 +624,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index 55a399533993b853f34f9d995eba3a527a3c7c27..1f76de8e150bab446057ad8599a48f4de2dab315 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1251,7 +1251,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index e09406991394885caf4bc1c8064fc98d7ec090d8..ac8fc85251895aa58a5e002af0a71cc08dd17d67 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -125,7 +125,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_avx_128_fma_double
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -533,7 +533,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -546,7 +546,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_avx_128_fma_double
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index da4ee92929a354064cedb3f106ff6e9afacf80e6..477ee06cbdc969ceb7fb5b148b56eb96422ae1a0 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -122,7 +122,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_avx_128_fma_double
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -470,7 +470,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -480,7 +480,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_avx_128_fma_double
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 90d43ca21a47418c6b649c1b476035483dc58559..7d3a9fdd4a3c3d0a91d6023850dd13274ef6d100 100644 (file)
@@ -106,14 +106,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -423,14 +423,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index df9718c034e7da5b405db7efe0bd7d337d06b266..3035bf779d1ec9dd7a1935cdff16c3c2ec1a7271 100644 (file)
@@ -112,15 +112,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_VF_avx_128_fma_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -411,15 +411,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_F_avx_128_fma_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 667448d30cb66f5628a3c4fd29418fff5325b5e8..4ed1d803a9cad75c40b9904d725b247f7e399ca2 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_VF_avx_128_fma_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
@@ -382,7 +382,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_F_avx_128_fma_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
index 4ad69bd5b870e020454bbedd1eb0c0e10647c513..84d0e7087cc327906580fa352d355846f0d26b57 100644 (file)
@@ -106,12 +106,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_VF_avx_128_fma_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -373,12 +373,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_F_avx_128_fma_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 41998a53ec359a869b0b2c9f59834464f2550199..9591ef25570df68473f0cc40e50d0b5c78ec070d 100644 (file)
@@ -108,11 +108,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_VF_avx_128_fma_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -414,11 +414,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_F_avx_128_fma_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 366b0c330775114e6c21ec29f70f41858e6a4af9..8df16677b638846c44386956d04479618b6c0fbe 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -121,7 +121,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_avx_128_fma_double
     vftabscale       = _mm_set1_pd(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -477,7 +477,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -490,7 +490,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_avx_128_fma_double
     vftabscale       = _mm_set1_pd(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 5ddb1d3d75123e113769024958a0faeb65ed2b47..a067ce795b7fc1e0a9f64493d1cd5176f71890e8 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -134,7 +134,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -679,7 +679,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -699,7 +699,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 262209bca371b8192a00fba3e0d595a06fd5272c..61264c8d72b30674b18b0a9b9c5f3a67fc3de19a 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -160,7 +160,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1171,7 +1171,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1207,7 +1207,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index a9de396e92ae3af98a3a65feb78e90938bdee2b3..7690a92ecb0002f7868ffaa8b92a56a7a8fec9b1 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -137,7 +137,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -736,7 +736,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -756,7 +756,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index ab967781da96c62a587e998d41c49ed80ea98e75..65ea8baac2c7965e841afdacc32830a12821fb04 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -165,7 +165,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1236,7 +1236,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1272,7 +1272,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 431b1482425752452495e42a1be44221569262ab..9438d7bf3adf093190d86be7983f8e2f15af2ea5 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -114,12 +114,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_avx_128_fma_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -403,7 +403,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -413,12 +413,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_avx_128_fma_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 9a9ceec0424c6b3bc2f3bf5258d80f54c1215a19..127b7ce06d89b716b1b251d081d53ae4220a4388 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -127,12 +127,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -605,7 +605,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -622,12 +622,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 4ab4266766783e9b30717290d7db59dca3ed2524..d9e5085a4346697e39e0043860f69b8580443eba 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -153,12 +153,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1097,7 +1097,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1130,12 +1130,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 2307aa7ac3b525c6637d0f54a54c8b6cc5ed102b..1f06f54c856f21f44c512761b14a32192c4adc4e 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -130,12 +130,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -682,7 +682,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -699,12 +699,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 15b9770043f8e12ae5fd64fc8501bf809dec802f..ec3ec956e2996fa444f660b852673a057cfa1805 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -158,12 +158,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1182,7 +1182,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1215,12 +1215,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 24785c9842cd7b543dad3253b8fea84ebeb8ea48..33af9907e1e3681fd62787435ecd73fae3798135 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -116,11 +116,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_avx_128_fma_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -440,7 +440,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -450,11 +450,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_avx_128_fma_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 9c51ac2b8a5f4e94a60ce507a1f9633333130389..0362950259395148fe0924f8c5f7f6fabd14f78e 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -129,11 +129,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -642,7 +642,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -659,11 +659,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index b0674c4d1bf86178239eeab5cd82e2828e005608..837dc48647e878dc6104da08adf598ad0b04de21 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -155,11 +155,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1134,7 +1134,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1167,11 +1167,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 66d1034f67ecf6b6c23f26313af1b0511ac1c5a5..e65c28432f119597114294f415af29ba3d797f3f 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -132,11 +132,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -721,7 +721,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -738,11 +738,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_avx_128_fma_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 265a7a06916a0c49e4f0bf6322a714831ed1af0c..5b8c44fb350e23098147aae40c630998b6c201dc 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -160,11 +160,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1221,7 +1221,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1254,11 +1254,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 29e03792aac62fa3ff6622e403aac812c01bc600..8f0dbbfaf427f47dbaed57015e025c9a1037bf2d 100644 (file)
@@ -98,14 +98,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
     crf              = _mm_set1_pd(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -353,14 +353,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
     crf              = _mm_set1_pd(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 66f7e8fc7f538e85638eb025716f321eb7a0bffe..e39f8c0ff8d45c7c50aa11d8d5e2783f16481ba4 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_avx_128_fma_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -555,7 +555,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -568,7 +568,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_avx_128_fma_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index b3d3607a03cc007b2e185c60adf60c39656cc01a..dd4177af149acf0bcc3ac49f09e822a5258b4d05 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -140,7 +140,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1050,7 +1050,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1076,7 +1076,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_avx_128_fma_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index cf52799453637fe80000a59cd978a4e5ab54ec81..e626a5bd4a6046d689dd7d3a012f5c74076437c2 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_avx_128_fma_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -555,7 +555,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -568,7 +568,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_avx_128_fma_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 4b8cdb58841d7df8ac1604ab2207555602a82085..ece5b298d417ffea0162114e28dfc264d7233fd8 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -140,7 +140,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1050,7 +1050,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1076,7 +1076,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_avx_128_fma_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index fb02743e285ad109e519fe98221a3443cc345d1b..e7e160c75facb61816db1143f47caa9df60609a3 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -450,7 +450,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 606c00966a9dc17069f70f43d1227dc234d21f02..5140a624504a38f2d3e5d8c7ffe6e7a74f2fd4a2 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -612,7 +612,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index ebbbd66d84cdd76eb11fe09c0eaf965a13ddd73d..60ced8125983dbeb94803e195cc65a16cb7d2409 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -984,7 +984,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 1debca5d42c30d2faf2265889c5e6f262764a639..7ba45899ee6b7fb1c125bc614fd684042e9eb945 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -671,7 +671,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 63312123e6df74a91ff797bfad8386a11d223118..a5149c4e98eaacb467684e18763151a12772ed30 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1051,7 +1051,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index bbf4d5ea0173a1533657d823277334031fc06d3c..20e5989a2b727f7d408e3e3034546cb184305d24 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -371,7 +371,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 93bfe58a2bc21c194cccb2b46c07d29bc8ac9f1b..663392b75ae94f710865d209ea4a047c6af32533 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -533,7 +533,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index a31ce01ad67ebde53f98b3f637a9b2da7d53004c..18723e87e779482ba81aaab57d2b990de80ecf41 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -905,7 +905,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index d7eb7650078c30d0ebb4c490f158cc0f58fe6422..e16f573236c32363eddf4a4688895f7613455c4c 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -592,7 +592,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 67f8c8896c1d18205860aaf98effb8b02c783e3e..324c57863c1b1f9ad27b66a14f6bf73837e2e37f 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -972,7 +972,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 042b25a9579bb934d590c0a6f5cd6d0a0e986569..582275eb3125a076d7c9cf0754e5802f8018614c 100644 (file)
@@ -98,7 +98,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -328,7 +328,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index f7d5b4facfb7f7cc6ebe578bf0376642ea22ace0..1723063cd1748ecf7785871037447309c4cf3f9b 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -490,7 +490,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 89e16962fae467267113af5215f3a4b24c54c42b..084220f37636d3485afbe9cc0e4e7051658ff510 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -865,7 +865,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 3ef97bc5f8b9b6f848913f4b298b9607592bebc9..48dfc5b578fba030f8d656e0c930bdb57934cd13 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -490,7 +490,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 8e6c3c9e6ca4a28db8630d478a9e38e9fa4752fd..29287e87ee7d96f9bb1408cc7d12511f5078220e 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_VF_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -865,7 +865,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_F_avx_128_fma_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 3775d25ac8c6c1ffff221a219e3ba9320fdba4e4..224f4a4bd36ee21b31b44be939ab450e3bc3de8a 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2017, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
index 9fa5fedd38c8d5aac839786cfa83f7ed7323fe9d..0bbbec2976254116010b92b3e3d4d810cfe81f52 100644 (file)
@@ -182,7 +182,7 @@ void
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
     /* #if KERNEL_ELEC != 'None' */
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     /*     #if 'ReactionField' in KERNEL_ELEC */
     krf              = _mm_set1_pd(fr->ic->k_rf);
@@ -198,7 +198,7 @@ void
     /* #if 'LJEwald' in KERNEL_VDW */
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
     /* #endif */
 
@@ -231,7 +231,7 @@ void
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
     /* #endif */
 
     /* #if 'Water' in GEOMETRY_I */
@@ -272,9 +272,9 @@ void
     /* #if KERNEL_MOD_ELEC!='None' or KERNEL_MOD_VDW!='None' */
     /*     #if KERNEL_ELEC!='None' */
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     /*     #else */
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     /*     #endif */
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
@@ -282,15 +282,15 @@ void
 
     /* #if KERNEL_MOD_VDW=='PotentialShift' */
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
     /* #endif */
 
     /* #if 'PotentialSwitch' in [KERNEL_MOD_ELEC,KERNEL_MOD_VDW] */
     /*     #if KERNEL_MOD_ELEC=='PotentialSwitch'  */
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /*     #else */
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /*     #endif */
     /* Setup switch parameters */
index ebe940021c6e9efdffb6ab88c213fb13e4118d0b..927ab0b280329271c0166578b60e3a11a600a289 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -515,7 +515,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 39655f248bd67f711e0621013b96686f30c70846..557ed46db4ea89dd85aaaa05823266aa511c85dc 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -761,7 +761,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 4d75fb29cc19243436465192b7bb72d73dc4d6f3..733c7a6d88697e9860e04b9d46e8510ff1ff5153 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1367,7 +1367,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 83e6e1f1d94c8ae1b97d9bd318d1d9221258adfd..8fb6585fac252e0d8f55aa988129b8d1b62633a1 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -847,7 +847,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 585832f3c26e9e3f714477cb96651aa973aba27f..07d622bcd50819b4064804b83d5a55087fbc824a 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1463,7 +1463,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 602dc70e6dfdc96421da7179d8ea83b8291adc24..10689bdab8e6489cc1c266587c4edeb14e8307b0 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -479,7 +479,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index c8ff82934cf27600a12242e6ef71c968f364f3de..803763b43ebc3900c3ced77a4650114edc94a10a 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -725,7 +725,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 7f63e631ebcb2c60b70b9500bf978d097f1d56dd..c410e4d19bd94fec317b915716b042d0a94ed9dd 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1331,7 +1331,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 1944863fc7e0c94286ecfc3cf33a80483a0a705b..3407e8ad6332b9d3a7bb4f2d2b5622823983fd46 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -782,7 +782,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 8e57613175f07e41ea69ceaaf439394cad254f0a..e1e3cc5b24cf903859fa11f32c8814ed0a6ef584 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1398,7 +1398,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 64c16f8cc7aa552de298e09f50f4bd5ef636372d..4d697a307bb7e519314eba9fe6ae767463bed973 100644 (file)
@@ -105,7 +105,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -420,7 +420,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 3b8b23c3db8976c4694de46c43fcfca77e19d1c9..f33e2ed0c5c311910b1c284b88aecfe0def2af85 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -666,7 +666,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 253103422e8074f89c82b98299242d4cec968cc3..5e574c22a8098d9e507afc32b2562fa93aadf893 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1287,7 +1287,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 3acb2e614da5084cf7f608b1ba320ce1806b0de3..bead5db9e924a83a997ccc8f95b1b96026b6cdbd 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -666,7 +666,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 7cdf8e300df694373dde376081573d75ab21d992..ed1915de7074df95e50280dfadb68b940ea18f7e 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1287,7 +1287,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 437417a6d30c32b952a189482028158313e10008..d66ecbe59f86886768cd2ef6619afbf0e66a08e9 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -501,7 +501,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 2b92910c73c7db3152ea4e4f7f07d8a9b38c0f2d..73b7c99b139518dca28cce8fb600e6b68b40afa7 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -665,7 +665,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 0b17195d2003899f1f903b56597ca04e4893e7e0..588e384533450adb588fb7fc89257dfd6a3a0df8 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1025,7 +1025,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 54ec9edfdd9e50a66424441777ea61a1c0951caa..09af69616cca113686183d37e3007183f2f37bf7 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -724,7 +724,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 3e309c9a7673342d534b7a31fd9c895ac58e032f..d217c320dc130e16cad5e1d7e8aaff84c5ecc33a 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1094,7 +1094,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 19a1c0c35447206316b9492bde6687bdb4b55e14..d7ae7b347e77bdb0e1b1ba904ae17101b6499bd9 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -425,7 +425,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 92ac844e5129bee3d34b0ab4d1255eb3bbe6a5eb..e35389381782400d2581f46cccce1b3a051c266d 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -589,7 +589,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index fb6f7d9ac71abd1f5a3b5e53a3179b74ef839cfa..2e00069822ee4c530e424bb674bdafc02d237e0a 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -949,7 +949,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index b65f2fadae6c4783829d615501af316656002d1d..d5d7e5f94f361236a7797249f65a934c2dcf86e7 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -648,7 +648,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 8af01fa282a0c4330279786b4d19b044a9e32224..4149f4572e6ea9e4696f5bf16f9b2bd280cf9c8f 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1018,7 +1018,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 292f91810d7498dece8a944ea137069baec506c3..09c3ce4d80a9406343b0301e8c44db516cf8acc1 100644 (file)
@@ -101,7 +101,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
@@ -370,7 +370,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
index 48ef89dc4e428de9ad1098ee2e52bad4d4c85ce2..7e179427a863806fd80ef44b6997b8060f9cece2 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -534,7 +534,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 11351f75e53286a7b2481d2d43af6c0c244e71fc..b897c61967625215321bae25a91c570c66198a0f 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -909,7 +909,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 7a20bf943cdcafda4d6d8d9d6aa5b2a22d94d0f6..37d37e920c24937c8ebaf172ba12fd99c2000e45 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -534,7 +534,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 5d687d87d2128a8eae772bb329506779e917bfc6..7c40a11f4620fc80dca3c54a03d3d0953acd3d28 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -909,7 +909,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index bcc37edd11631a7e4727c0487db936f54a4812cf..7b0106f07376326e7a627f2170762eb21c4bcc22 100644 (file)
@@ -116,14 +116,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -135,12 +135,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_avx_128_fma_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -530,14 +530,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -549,12 +549,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_avx_128_fma_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 241de8ebed09c0a246c8f16a478d5654580051ab..d4944327534b6b60853c3075ae0a810dcb0d504c 100644 (file)
@@ -124,14 +124,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -150,12 +150,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -780,14 +780,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -806,12 +806,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index e5e77dff24c98da21ced57c8efcc3afe5b2e49cd..ba4959d3aca0a67f62b2333cee9ad8e2506dca5e 100644 (file)
@@ -140,14 +140,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -183,12 +183,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1389,14 +1389,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1432,12 +1432,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 0d1ff3db392a929dde5ff9774d16f0a15000eb9a..421cb79e03d62990c8580373d41d3c879e55b215 100644 (file)
@@ -128,14 +128,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -154,12 +154,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -866,14 +866,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -892,12 +892,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 16c5e45d5ed6919e04fc44bcc0230aaf2ced6e8c..76988dfe667f1efff17b6b808184505c091a805a 100644 (file)
@@ -146,14 +146,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -189,12 +189,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1485,14 +1485,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1528,12 +1528,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index d467f8d3378385344dd117cec0b326bce7411f06..1038f25076b4bc08eceb411c2455397a85db42d9 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -126,12 +126,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_avx_128_fma_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -494,7 +494,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -509,12 +509,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_avx_128_fma_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 44ce7190de504ec0de7e0bbb835c8a177425379b..4c4e46814f806b6487d5d5ccd4732ae212e92b41 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -139,12 +139,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -740,7 +740,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -762,12 +762,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 0ca65becfb3de4d98f126c9bfafb691bb74a8aa1..8ca95b4cc5bfbcdbcad7a243b544ce2c322a1471 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -165,12 +165,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1346,7 +1346,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1384,12 +1384,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index d1ee5d1b06797a976f48ccc09f8752eb63b15df5..026012873dd4c5eee684cc3b00a911d964b47bec 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -142,12 +142,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -817,7 +817,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -839,12 +839,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 885afddc0d1f9196598919680241c21b11c73e65..30fc9a4346c8199166f8a895cc19c87aed863f09 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -170,12 +170,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1433,7 +1433,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1471,12 +1471,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 38c9cdc77e5fa12e2f2ae237f15b52070301bbb3..de2c6327b31e96fe35af464ad560e3cb95ea96b9 100644 (file)
@@ -105,7 +105,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -117,7 +117,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_avx_128_fma_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -432,7 +432,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -444,7 +444,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_avx_128_fma_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index be07ff46be28466a29505f35757ff0fa5c816642..bfdd06e19d4a2cdad84749110de1779be0ced801 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -129,7 +129,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_avx_128_fma_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -678,7 +678,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -696,7 +696,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_avx_128_fma_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index e8145470fb2fa878f77da85f6d0b035e5be94dbf..9527c88e06b03650245d02e831c884b7dbe23eb6 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -152,7 +152,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1299,7 +1299,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1330,7 +1330,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 8911cc8aee156a37d1dce8a0869b9e5c6dc54024..957d03c8ee9a6f146a20f2ed0347baf37f36e1c4 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -129,7 +129,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_avx_128_fma_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -678,7 +678,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -696,7 +696,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_avx_128_fma_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index eba974630cf8bab5d4b24e7ffe4417569529d08a..125cc57e2d5259fc57754069d12166f087bd3fa8 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -152,7 +152,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1299,7 +1299,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1330,7 +1330,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 23e4691f5303bd126ca26c6a3365b7408843632c..68fbb7827744c715828d7c9c5d3fa7ec8cbdc8e5 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -128,11 +128,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_avx_128_fma_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -531,7 +531,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -546,11 +546,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_avx_128_fma_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index f64cc32d0f080295e0ef7b86393993d34ebc4900..9e4d0669cda2bc671593322c5c4df23e2f85c597 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -141,11 +141,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -821,7 +821,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -843,11 +843,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 8c5b7e33dcb78ef39f6e7973890ff39e50c210ad..79c8dfb1eac7c79227039276ff2d51fde2478096 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -167,11 +167,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1559,7 +1559,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1597,11 +1597,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index b9c17acf8880b7376d51461ace7cc7e38c46b24d..eb3e7f3f7c54b17bbb69ca2216f1a88a089920b7 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -144,11 +144,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -923,7 +923,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -945,11 +945,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index ad4370f3089fd778e2de04570b4023cc439b75c0..64075158a6437d1580682016805d8aa5494c9efd 100644 (file)
@@ -134,7 +134,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -172,11 +172,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1671,7 +1671,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1709,11 +1709,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 1499d2ceebac56c4fd319b03b386c63179d22f51..817bdb8170cf9f0f92f3c24bf2972157118d3993 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -119,11 +119,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_avx_128_fma_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -470,7 +470,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -482,11 +482,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_avx_128_fma_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 5fbf3135cc49da35e7317a5b5dbbbe2e6997ca16..7eb6af062257ee39c9b48405f422343bd4e30d61 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -131,11 +131,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_avx_128_fma_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -760,7 +760,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -778,11 +778,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_avx_128_fma_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index a9113b3911d8f8f18298d35b900e5340e6276839..96e566c888f0ab4b486e0bb7ebf5f7f527e4c9be 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -154,11 +154,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1513,7 +1513,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1544,11 +1544,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 2f11d9b8baf5cdb43e2854b4c8f1d80e4fb5367b..a7a444c98a9db8931c41e5927de6613864715396 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -131,11 +131,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_avx_128_fma_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -760,7 +760,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -778,11 +778,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_avx_128_fma_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 75eef7d34ca1d068d5afb7b46700f5cd3af2001f..95a4d31f276cb2a90c3859d630b9288a2619c124 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -154,11 +154,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1513,7 +1513,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1544,11 +1544,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index d53c043082e3073c5733bedf7419ac5c24d51a7c..056a023a23471698311710646bc924c21e11157c 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -533,7 +533,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 39942c14e1c1d931e2f8cd606f7f26850b1ced24..c76334168742ee1ee8fd1b76fed6c16cc7a4ee9b 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -739,7 +739,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index a1035e1db8ebba97c75b65836d86d68dbcc5564d..9f17a4dca0cd8b2e83d77b0840b54b39a8c3604d 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1225,7 +1225,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 981029c825a30bf4da87d4a0f4d000e4ae396387..4d18d1a8afa6e6cfb53731b329fff189e88e0520 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -803,7 +803,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index a39f199b1d84d52344e5d6c01fd32f4a66d2e436..64a8d3700408cc28b49b2f6b6b774da884826032 100644 (file)
@@ -136,7 +136,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1299,7 +1299,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index de98c7a8d41c9b027fe2906e2dd57bf7a1f89e26..6ef775acf4744fe8f8097137be1a4cb392d7c71b 100644 (file)
@@ -116,14 +116,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -498,14 +498,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index 85198b0721e4f0d19cf99afaec1a0357f1eb327e..c392d1341069cc08787f23514e23426fc203da56 100644 (file)
@@ -124,14 +124,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -708,14 +708,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index 4d63520cbfa509ac9c6eeea679631080053ca82f..1eae79cb556864f9c5cf6b9c95a75b0cab993b10 100644 (file)
@@ -140,14 +140,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1197,14 +1197,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index ea40c93f800377900f16b7ab9104e55e99c71196..3e3dc5f5812ae4c7f6573b13a8548d69965dd031 100644 (file)
@@ -128,14 +128,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -776,14 +776,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index 45519b2a13032efec870d048f88a7bd2bc1df20f..87d131118bbefe79553c043498615a7ad63af7bb 100644 (file)
@@ -146,14 +146,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1275,14 +1275,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index ca06453c402fbce045733e71729a3a3f46654010..265b4e8703f336abed0651678f7d15f956b9f667 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -462,7 +462,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 73d2d8b6362e0dca80963d8ebc219b9e65a9d3c3..3eed3e24047acdac125ad607c4c08573e503bc61 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -668,7 +668,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 9c07d5ba6a399735ec1a2e6fc87b1aba79be1d2b..cb8b0f2cd3d83fe6df01292b45791b3f5e983886 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1154,7 +1154,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 9b92ca0a66950e16e0a4a5ab54acc4ed02c070f4..c240d07ec316af36279d310952a28c844686f811 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -727,7 +727,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index d2534add7d40f64a15b7538d42b49bd300083a67..6db9f9c1e3a44308d51ff0f233563a5853cd4217 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1223,7 +1223,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 5e87b13d7cef48a2ffc7d018bbd37481aa87337c..02e530db99963d70fd8c97657f207b89e814d84d 100644 (file)
@@ -105,7 +105,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -407,7 +407,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index bbe767d94f0e3a5826ed9e3bb414d84c4b58c114..9141494100fe0f698cb550d8c1411935e1c1f6ce 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -613,7 +613,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index 6fadbb8144b3d57913503dfab8f93e118ecf24a7..9b11c404a3fae8e7a9add824fb45957f8337f313 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1114,7 +1114,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index cf658453ae38d2c90551cde06c9f8f92b4c7c248..96be7f098bbc7e0dd1c790c5138f2316f921353b 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -613,7 +613,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index 34074d1a311fe0d9a6d7cd73f5f531dfa8a584af..7d7c3702a797d5de03128769762c7f6db4edc616 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1114,7 +1114,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index 43a81eca9f11dabf743e129d4970495d2d61ed2f..1e7160bc96711361465e73fb8c54182629ca147f 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -128,7 +128,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_avx_128_fma_single
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -596,7 +596,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -609,7 +609,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_avx_128_fma_single
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 4f0b4966e44efb0417f571f795f79b3e6f4f4ff3..aa4c0b6b0e5b78f141d1657f8c0f2408a170f5a1 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -125,7 +125,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_avx_128_fma_single
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -537,7 +537,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -547,7 +547,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_avx_128_fma_single
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index fbe99686e14f5636baea8a4ae1b71e2373e893ed..737a4e83faed32199515a74c3e634bfdeba66a51 100644 (file)
@@ -109,14 +109,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -478,14 +478,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 581cb88d11494cc438e427d826d0bc567c08afcc..43c8348fa41b069495ca03a889e423026c40cec7 100644 (file)
@@ -115,15 +115,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_VF_avx_128_fma_single
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -474,15 +474,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_F_avx_128_fma_single
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 5b251431dec7eb6d06b40e8dee70cbdcea8f3eeb..77dff5f917c42d5cfeb3f40074c9d6278822240e 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_VF_avx_128_fma_single
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
@@ -445,7 +445,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_F_avx_128_fma_single
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
index cc2b7c034c72e62e01e9f6b416948aa861d10490..560ec5b62391ffeb7351c1d927df47fee2f11501 100644 (file)
@@ -109,12 +109,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_VF_avx_128_fma_single
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -428,12 +428,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_F_avx_128_fma_single
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 462cf872f7396b3b094c284bc1be7c48ab0e1006..71d603072ef76bc83e37b799058f9cb7f7d118f0 100644 (file)
@@ -111,11 +111,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_VF_avx_128_fma_single
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -470,11 +470,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_F_avx_128_fma_single
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 6c1fad7e2d872da7a6a60aaf77d2f27cbbf24109..cb3954a6e4638724ac74618219da7e2eb91c28c3 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -124,7 +124,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_avx_128_fma_single
     vftabscale       = _mm_set1_ps(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -531,7 +531,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -544,7 +544,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_avx_128_fma_single
     vftabscale       = _mm_set1_ps(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 158875fc8ea60e71c3f93a2c22289243cf924ef3..db75b86c916e7dd3633bea94e3635faa033b192c 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -137,7 +137,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -735,7 +735,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -755,7 +755,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 648820a598c2cf7e6182c5d4a19905423b9fbf97..ee9470e4ac1ba4850a8c3e7b2406483b604c43af 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -163,7 +163,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1215,7 +1215,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1251,7 +1251,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index b82b6056f7200a87efeeeae4e69295b38a7ef494..17231716d95a8fd878d2d239b17b3aa19d6c2812 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -140,7 +140,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -792,7 +792,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -812,7 +812,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index db8e4f37865bcc5df8b573af00611880d5919eaa..f35a9c9f280f206598ec483f6349115dbcdd1449 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -168,7 +168,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1302,7 +1302,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1338,7 +1338,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 233a806005239e0176d73f8710b518e7a8be754f..01fcc1c92d78db72cd157439e8666dda3c3bab9c 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -117,12 +117,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_avx_128_fma_single
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -460,7 +460,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -470,12 +470,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_avx_128_fma_single
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 767f010346608f9fc6346bc27074871994a418f9..763a9f57eb93c683a5d82e607c29a23dce2d7eb9 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -130,12 +130,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -664,7 +664,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -681,12 +681,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 4677de8daec7a28497530efeaed8908a67fa09b0..7fd71ad7e3da7aa6442ee287c58861a74c2c945a 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -156,12 +156,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1144,7 +1144,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1177,12 +1177,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index f1debc5ad8630e208b062dd9e7409aa0d73e4cad..6271ec8478f139665d3257e0760cc737adf8a478 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -133,12 +133,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -741,7 +741,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -758,12 +758,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index a6518afac24cd1618fda53218ead823f50459fba..763bf9d9a6cd80b961083522f3abd4a910bba4cf 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -161,12 +161,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1231,7 +1231,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1264,12 +1264,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 5e1f35977bbcdbf197c1d8256a50b7738ef62c09..161d70c58b351ff520df886f41df5771a5fd7922 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -119,11 +119,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_avx_128_fma_single
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -498,7 +498,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -508,11 +508,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_avx_128_fma_single
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index f3433719dac2bef8befb3af324668a27b16141f6..d09161f4fa065c557769a7c7d8c2162eb1d5fc91 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -132,11 +132,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -702,7 +702,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -719,11 +719,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 2f820c93cb52dc1dd1851ebd1037d140d1d22e1a..7f32c042624d9d9a591d4b50b4d1c97c28d3eafe 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -158,11 +158,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1182,7 +1182,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1215,11 +1215,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 64a4f31a2fca6d850cf7099639ac54f69bf502e9..28df6264a5606f4e875b4cb4bd5d6e8cc758ee23 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -135,11 +135,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -781,7 +781,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -798,11 +798,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_avx_128_fma_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 396f8c4d24c3a123899d34b408ec4ab2776ba946..6fd118c72275b77f999b798fb29d950884050f6f 100644 (file)
@@ -130,7 +130,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -163,11 +163,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1271,7 +1271,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1304,11 +1304,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index ef2e22e0d5120439126d60dd70823563ad1cff11..3d462dc682df5f431013b8681ffc8543450f174b 100644 (file)
@@ -101,14 +101,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
     crf              = _mm_set1_ps(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -398,14 +398,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
     crf              = _mm_set1_ps(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 34d37441a281425a9b1d80b9108e379df9763f75..57a71243f0ac6fe5cfb1b047940de83e97f36cbb 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -120,7 +120,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_avx_128_fma_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -602,7 +602,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -615,7 +615,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_avx_128_fma_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index e919be4b8f1999e80e709759051d9b97d559f1c2..de74f79e149d0c672e5195b959b6ad46dceb9fc9 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -143,7 +143,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1097,7 +1097,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1123,7 +1123,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_avx_128_fma_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index dd6a7cd67a31bdf5c637e2c4c38cbb205e7f666c..65fd90dae1fc02a211df0487bfdaa637bea4225e 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -120,7 +120,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_avx_128_fma_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -602,7 +602,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -615,7 +615,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_avx_128_fma_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 3aaa98899a3de9f1ca69d6d777d382843645d024..cc2798c985e1eeb8868fe2ecb22dda49dff7e983 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -143,7 +143,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1097,7 +1097,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1123,7 +1123,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_avx_128_fma_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 5c99c96fe8219dab02047003696fdeca238d8d52..ab588acc544d4937a1990ea7c1c7f9e438af77c1 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -504,7 +504,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index c005c8bb26c9cc02e13b42f6bd72b8bf681aee44..9e3ed2ed67542bf5018f258209e9622e634e5b86 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -668,7 +668,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index adf842e1b14ce11449152db2d876bfd7a708b4c1..5b8e71b1e9b690a43e7404814f611501cfa0f757 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1028,7 +1028,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index e34cf8156f6d425fbb199989273c5153b6f36585..e0ae93628e85cdafe2ab3ea56d700230dface068 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -727,7 +727,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 9f67f56c7dd6478ea255bf6f0c49db9b8bd4049e..78a401cf1305bb70e4c44c0762a5d7d9db917579 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1097,7 +1097,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 58007c92e68ba31ac35d163518aa391cb44417fb..738a2719e1233f1205244af539ad87e4e8961c4f 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -428,7 +428,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 39d20e5052a27cf5c9c837be86396ef728f686c6..71c465e92d984796ef1d80739bb8dc1401a34e0e 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -592,7 +592,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index bd93fa0214a4684085719b26433cdf4eb7b5a64b..d169c4f1db602612243b8e34cfd0a8e33b082298 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -952,7 +952,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index bcdfefc1c413939fd0edd5a116002ad8dd1473d2..03a7f603ca667ed0575437c20bd874a79f7d6c21 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -651,7 +651,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index da2104c7e31766aad9d9fb03642754f856313806..1edc2e75ab2b25d9e3b1034227aea124dfdc360c 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1021,7 +1021,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 22ecb9f0d66be28700de95d7df82f094c03e4889..fe7c57ec046fd5cffb206ef56bed6652d2daa223 100644 (file)
@@ -101,7 +101,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -373,7 +373,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 30d4593cf71d03634714ac93bedc6ed9517db60b..34a1ca53d5984ad74f397da658b8560f1b9abbcc 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -537,7 +537,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index ff8bb0e56c1199746c4d18e2ab3a9f39c38a2981..d3450076e3ec43777bbc5bedbd6726d9db12cf0f 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -912,7 +912,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 9498f1009925e7d6d40a53b1887522e796900a15..26a26c3efc821c7562b6827ef74b4facbfca5fe3 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -537,7 +537,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 072cd9ddb92eac3f7f8fd2b3bf5cdb39e8a3c32f..ea3f1ca81e80d408847a2a945109cdb326cd0da4 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_VF_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -912,7 +912,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_F_avx_128_fma_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index eea891a2a5e3ce8451957718192065ceffe005a6..c87976462a0620421043e59a1727760f43ccc2fb 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2017, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
index c1f4e386a74806db46eebb60d420f81a282c1929..fc3469af5e95d1a4e21319cc7793656af1437b75 100644 (file)
@@ -186,7 +186,7 @@ void
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
     /* #if KERNEL_ELEC != 'None' */
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     /*     #if 'ReactionField' in KERNEL_ELEC */
     krf              = _mm_set1_ps(fr->ic->k_rf);
@@ -202,7 +202,7 @@ void
     /* #if 'LJEwald' in KERNEL_VDW */
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
     /* #endif */
 
@@ -238,7 +238,7 @@ void
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
     /* #endif */
 
     /* #if 'Water' in GEOMETRY_I */
@@ -279,9 +279,9 @@ void
     /* #if KERNEL_MOD_ELEC!='None' or KERNEL_MOD_VDW!='None' */
     /*     #if KERNEL_ELEC!='None' */
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     /*     #else */
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     /*     #endif */
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
@@ -289,15 +289,15 @@ void
 
     /* #if KERNEL_MOD_VDW=='PotentialShift' */
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
     /* #endif */
 
     /* #if 'PotentialSwitch' in [KERNEL_MOD_ELEC,KERNEL_MOD_VDW] */
     /*     #if KERNEL_MOD_ELEC=='PotentialSwitch'  */
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /*     #else */
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /*     #endif */
     /* Setup switch parameters */
index 924ba13429aa53a784b0d92eb13ae1cc3b9c14c5..61708a54c6ac18e713b2823634032d7bde8bab6a 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -524,7 +524,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 71b5971bec036ad2606f28c3deb822fbe4d78276..06a9de14a4825a00a402e3efba91c5d107e2674e 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -780,7 +780,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 061ad6f0625dbc19677525ebb22bb50c91f7cbe4..0634fa02a5dc4c104db57cb2ea6ef30b4ea5e95f 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1398,7 +1398,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index d1a3523ddfd5aa915ef6404a27fa841224819219..5d74431e8c3e10239d997b3839b6784b467be5a6 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -866,7 +866,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index ef01eaded5cc59755d4362854bdfad805b21fbce..ebef2849d124eb71f93c029a242c2a9f5c1af6c0 100644 (file)
@@ -134,7 +134,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1494,7 +1494,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 9b1391b9015ad19d5b141cb0879123ad3f84c413..e3fcfd4e490b5504c8f6fa7f507e3bd6d70e2ba7 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -484,7 +484,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 98c21c6f0ba7dd8b549b37666ecc2ef327375d7a..6a9d76ee52cce3baab0a3dbb78c6f6bc382fe914 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -740,7 +740,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 9afdcf70f9f5c64fb6389b7398ac7524ec15c7ef..8eedcf06ad62fb0d5ae1af6909392c4176adfa80 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1358,7 +1358,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 7a957ddba11068e6f64282fbb470a13f61b3de83..b88838a88a1e8ff1e36f61a9413802c1382f2b96 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -807,7 +807,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 9cbf0771602ab1c06c6bb2158dbf14615ddd8d49..d10c2f5cb6a81fece6c84ee495eaf0924e20acbb 100644 (file)
@@ -134,7 +134,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1435,7 +1435,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 4c9457850a20fae46283ad17c8c84193603aabf7..76113d81845100122cc1403ceb0920f6178bea58 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -425,7 +425,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 8838a011f8250679022d87b8e29c667c3b571068..bc449f549229c96a35f92e40fc8106f717b69451 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -681,7 +681,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index f6b69704609e2d74db99a37bc8e1392b8ccacfa4..c3530a6f1a6fa9b87058435407e05843545ed402 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1314,7 +1314,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 220ae1a5c8f8add41b66549faf5eb2e8308a463c..7031c4cdf36b0dfd35c56708c4b787d183293167 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -681,7 +681,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 34538758152e98d455bba17af540685505cab838..73b988007d701a7fed09456191357a2a78b67535 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1314,7 +1314,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index e6eb11730889285560c147a81631e33549d33dd6..10987cb2a295dee433561dbcb9157311f8bdecb1 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -508,7 +508,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 41d0d467d7f5aac55500f88f6afa79c56b3e92f1..45ee9cb7756bf7318b166e2a2728327b074b6b73 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -698,7 +698,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index ca03597cd3ce9ae64eb8a8df4c9c326be56e2aa2..62d1a81c34ef6afd5aec6b269805f0a831e9afe8 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1118,7 +1118,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index db15efed447cf7b6bf1fb1f5ad903b9c7d03095a..7cb0527da12eee1db49dbe0a3cf3dbaf10277016 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -767,7 +767,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index bc2e3a0564c17e8f71cd387c4e0d2b40eb91870d..e1999a1a731a69c73c0f6fe0751d207614c7e3b5 100644 (file)
@@ -134,7 +134,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1197,7 +1197,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 425dd25d0fb0bb0db51f21cdf187c54e3b839cc5..a99b4d08c98505ba348073a1ac65375ca2896c10 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -438,7 +438,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index b6190c846304b8bf41990350d7fe27fe58da3266..4b75c8d0d4085440c1939a8fadb23b6db5caafbe 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -628,7 +628,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 33759af210281113bbb2b17ee482860e1485386d..f90f9e6c0d1072da77ea3e79ab7e0618219e7c95 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1048,7 +1048,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index a188a94c9da8785a1e8e9215cdcbad6b4b235f8e..dd0bfaccd2cb6c5c5346508de669e9dac69a7ff8 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -697,7 +697,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 21482bb95e03d1c18857f4ee1fff2fc576be70ac..090ae5cf22b7c936c006d0349d3054abbe4085a8 100644 (file)
@@ -130,7 +130,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1127,7 +1127,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index ec4b38a881033f5043281acc9001578018f99747..19b6a6a2077a4bbab6c28f13f890f85aed441491 100644 (file)
@@ -103,7 +103,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
@@ -383,7 +383,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
index 00518c7c1797ae3debd391227b462b798f77fadd..e6d72be361017f22eac6b17d9e38138c670f2d51 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -573,7 +573,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 0287a845b518e0cc2035d326c357a9dc643fef9b..20083d665532df40112424e31b15a9515deb581f 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -1008,7 +1008,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index a1456d4ad2bf395a13c7c55318f3dd107e92dc5d..57a85d9c01f000925c83e389170c8179c663395a 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -573,7 +573,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 19496d610ced483483a1a7bd794c3f66c8d93677..5dfb4bd2cba97a3095ba05dcd632f9f40e9e01f9 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -1008,7 +1008,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 350221e7db34dd614765d8a0b7d3d59a1d2285c6..5241854091773a9a2ddffa16bdf896725ac3fead 100644 (file)
@@ -119,14 +119,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -139,12 +139,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_avx_256_double
     ewtabhalfspace   = _mm256_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -557,14 +557,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -577,12 +577,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_avx_256_double
     ewtabhalfspace   = _mm256_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 355815fc2aa502d68b30fd4981308723c6a63d03..251ef7ae207305e1330b66ac38c4fb153ea4ac4a 100644 (file)
@@ -129,14 +129,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -157,12 +157,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_avx_256_double
     vdwgridioffsetptr0 = vdwgridparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -857,14 +857,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -885,12 +885,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_avx_256_double
     vdwgridioffsetptr0 = vdwgridparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index be002d77abcbcd37bbfdf4b7504edb5621225565..a08c58d7d2e268249d076ce14eec492e04cb4b4f 100644 (file)
@@ -145,14 +145,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -190,12 +190,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1586,14 +1586,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -1631,12 +1631,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 1ef5381ac4bc8db6e4fa912a4c80da302a66231e..15ca177ddd4580a9b23136aa3e40eca7424cee29 100644 (file)
@@ -134,14 +134,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -162,12 +162,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_avx_256_double
     vdwgridioffsetptr0 = vdwgridparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -955,14 +955,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -983,12 +983,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_avx_256_double
     vdwgridioffsetptr0 = vdwgridparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 911a00a721601e8fa54bbd727a091e2143134664..4b061eb13e5ba1a45239404af4add0d8a477091c 100644 (file)
@@ -152,14 +152,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -197,12 +197,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1694,14 +1694,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -1739,12 +1739,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index cfbeea3a5af1eaeb3ea8831549acc7dacdaa806a..6c292c8778c71fb02f63e46b162f925b14d8f718 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -129,12 +129,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_avx_256_double
     ewtabhalfspace   = _mm256_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -518,7 +518,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -534,12 +534,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_avx_256_double
     ewtabhalfspace   = _mm256_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index b66cc1ff64e95a94e0980134bf281c58701c11e7..1ecdd8fbde382508ade7c9e010db861f1dac5120 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -142,12 +142,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -810,7 +810,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -833,12 +833,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 2f3c1c67dcdd4e2451a79ba0a3a1d04b44606fce..37c64c2dc95c913a8ecd64ceecf06ef7a0c13de5 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -168,12 +168,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1536,7 +1536,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1575,12 +1575,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 81cb3d7379fd8e5c843b739fede97aebf0abe088..18dc4f6941f5fb25f326554f4b7a04725bd43c40 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -145,12 +145,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -897,7 +897,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -920,12 +920,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index d5e84adde72a8a77b01150bc94f32c39256cb1fc..cc846a63d50a175ad555af574c9554c6a3e677c4 100644 (file)
@@ -134,7 +134,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -173,12 +173,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1633,7 +1633,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1672,12 +1672,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 04dec911ae22bb88b29096d38dce2c098383c384..52c9907bcdf5091195830c4241d8117fa434c23a 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -120,7 +120,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_avx_256_double
     ewtabhalfspace   = _mm256_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
@@ -456,7 +456,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -469,7 +469,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_avx_256_double
     ewtabhalfspace   = _mm256_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
index ff23028783b465ebc48962002d66a85ba3954f5a..c630603caeaba55f02b47961d41d574dac728811 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -132,7 +132,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_avx_256_double
     iq2              = _mm256_mul_pd(facel,_mm256_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
@@ -748,7 +748,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -767,7 +767,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_avx_256_double
     iq2              = _mm256_mul_pd(facel,_mm256_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
index afccccc969571f82281a20cbd661b261afb074db..d0b5d9a4d9efe69da0d0b62b4bd54e9058365688 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -155,7 +155,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
@@ -1489,7 +1489,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -1521,7 +1521,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
index d33ebc5716aa6af4e35dd70686e5d20b8c259c53..331896cf9caeca82ae4cda4049211a335719b13f 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -132,7 +132,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_avx_256_double
     iq3              = _mm256_mul_pd(facel,_mm256_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
@@ -748,7 +748,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -767,7 +767,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_avx_256_double
     iq3              = _mm256_mul_pd(facel,_mm256_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
index 9f9011663a9881023d803932683637ab93d35c56..9168fbbd5e2105f08f13b449a2596cc5ee357383 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -155,7 +155,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
@@ -1489,7 +1489,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -1521,7 +1521,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
index 0b14e38d06861570939beb82a016c94dae838ac2..616ef5bdfa0a871b64d84b3c5e3bb720cc032454 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -131,11 +131,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_avx_256_double
     ewtabhalfspace   = _mm256_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -555,7 +555,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -571,11 +571,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_avx_256_double
     ewtabhalfspace   = _mm256_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 7e786ea006bfa759b95838627e14d97ee605ccd1..20783eab328fd563722b1ebdd6349af262af2f76 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -144,11 +144,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -891,7 +891,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -914,11 +914,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index da7709b359e6e7d3ce24568e8e602e7d9a8669b8..340b1ca03b6be58e52e74c8dd7323d01cca0acb1 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -170,11 +170,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1749,7 +1749,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1788,11 +1788,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 212f103bdf363064fb79712164c3efe3860d9396..a1c24ccdf0ee3afc208c8d79f050bada9b72e960 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -147,11 +147,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1003,7 +1003,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1026,11 +1026,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 56c7f4224fa99bff2571e8ea04012a3b7136de7a..563a39784d76423b48aaac38768157514e17ef80 100644 (file)
@@ -136,7 +136,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -175,11 +175,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1871,7 +1871,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1910,11 +1910,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 81ee1f1a651b7b857441c7104c4146bfecdd93f8..2bd64b62946aff35286ca848b00ab0cfc5205cde 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -122,11 +122,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_avx_256_double
     ewtabhalfspace   = _mm256_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -494,7 +494,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -507,11 +507,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_avx_256_double
     ewtabhalfspace   = _mm256_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 7a9ad881661e5c5efb6f3374b65bf6233e16ac6b..7ae01d9e60a09b6fdd8fb1e5deee1975887fe199 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -134,11 +134,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_avx_256_double
     iq2              = _mm256_mul_pd(facel,_mm256_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -830,7 +830,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -849,11 +849,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_avx_256_double
     iq2              = _mm256_mul_pd(facel,_mm256_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 6166751bc9e27c781432e465bda8bdcd59cbf231..8866cb18dd453535850409123210405307c84d01 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -157,11 +157,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1703,7 +1703,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -1735,11 +1735,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index c70e2647893422ed2193142801fadaaa39d40233..2e28edc762d8da95e16e38161e87a222752d4ae1 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -134,11 +134,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_avx_256_double
     iq3              = _mm256_mul_pd(facel,_mm256_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -830,7 +830,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -849,11 +849,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_avx_256_double
     iq3              = _mm256_mul_pd(facel,_mm256_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 2a975b41749466222ee818f62fadaaac84063540..7a55880b0649e28560b028ef04a8b90c2c2f390a 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -157,11 +157,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1703,7 +1703,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -1735,11 +1735,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 991140fa81f9a5df77866bcfa015bd836ed61051..b98f8a7bf2c8f80dffc670c418e8d5718499657b 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -551,7 +551,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index f98a0f010f59569957e4d6e08173a76907e6964d..bd2520627ae741e366c7a10857e49fb7a5873412 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -803,7 +803,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 5bae4c1722c6f4c7c6db1ee33aabfb05bb83a2bd..8d8bbd32c129f2c21fe2bab451a3f1cf16f259be 100644 (file)
@@ -133,7 +133,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1409,7 +1409,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 37cf2cd163e1c2a3d6405dda7ffee2bef376a655..a7cadb2a544e1038bc7860377230b9a3e719e501 100644 (file)
@@ -126,7 +126,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -877,7 +877,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 679b4f1f072ea7b579d3d5b8edd1f8f3b57bf4f1..185ae90a22212ddf00526aa12d0d0a87f41ae600 100644 (file)
@@ -138,7 +138,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1493,7 +1493,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 16279238b5c1cb99cf90cdfd913814b0994e4a6f..568d8b8adb2c085384d1e11c9df2276049a662c1 100644 (file)
@@ -119,14 +119,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -525,14 +525,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
index dfba5c0ce9d91715615ce55e8831b538af68d99f..4de7034114c6ba8221abed896ada3e9d0aef03c8 100644 (file)
@@ -129,14 +129,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -785,14 +785,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
index 4ed95115915c62b8ce9307917d4e5d007a734276..c48bc4b64c0c9d17a289d01429b3d517bbc8f02c 100644 (file)
@@ -145,14 +145,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -1394,14 +1394,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
index e6852efa9421902013d403ce9208a4d676b68fc8..a4ee089d2a7e2fe799042e77aab6be20c4c71ff1 100644 (file)
@@ -134,14 +134,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -865,14 +865,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
index 1cf45997f1b5dee2d9169d8440bb5e4749849a33..212654305a2c010244989e0009186e140eb3073a 100644 (file)
@@ -152,14 +152,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -1484,14 +1484,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
index 1c209d83c6beead034b03602f74013b94196759d..4e7f531b83a2c4b4c55929ebad7daf52aff600c8 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -486,7 +486,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 1c2cfd7b37a881b1c26dc939b043c13fc8191271..80e896036d6496ade6ba92bc8b836e0fee23f203 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -738,7 +738,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index f2828690eafe605a004110b49da69aebd7145b4e..bb86f03f129fafb9f3fefef8b660745a46871ba4 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1344,7 +1344,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 7b5bc72743988c5863adf3108c5ed9167577e5c4..e0ce71cdd50ea978559d0591d18ec6ec9720564f 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -807,7 +807,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index deeacd2a26e1a2e6e25a191d6f59128a99862872..5def578d568d6aec786eb8ea19f703afc6052e10 100644 (file)
@@ -134,7 +134,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1423,7 +1423,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index f12a95df89092389b123d4125b668f8d94fe160c..6757d4bf802e85fae980528c36757e57506931e5 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -431,7 +431,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
index e2483b95114d50563238595aa235b32f938e5c28..514db40683281f5a5579ae5b7c1334554ad467bd 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -683,7 +683,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
index 9d3167da8645b3aae203a46cc3e3c81f5178099a..f116671bb8ef2ca59b14b94e629612906a6771f2 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -1304,7 +1304,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
index fbd7c40395f1297507bee441e02301399cc7d825..66876ac6053e9ca2495d28ff3cb9fbdd818f54a4 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -683,7 +683,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
index bc8d6614ed33df069a70ebd3b404081227a92f40..fc8cb4e02d332693a2c079746aa802f0ab4d6c77 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
@@ -1304,7 +1304,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_pd(fr->ic->sh_ewald);
index 17ce5326bc512225fbe23c92c8a9fe2b68078d61..8d3df8b683953bdb01fb5675dfc3691452a37cd2 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -130,7 +130,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_avx_256_double
     dvda             = fr->dvda;
     gbtabscale       = _mm256_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm256_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm256_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -595,7 +595,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -608,7 +608,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_avx_256_double
     dvda             = fr->dvda;
     gbtabscale       = _mm256_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm256_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm256_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index fa0c55449efec1098819e07b828438924bde4837..132b4e69b3256fe15394c452a9b8c3a0d4dfed30 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -127,7 +127,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_avx_256_double
     dvda             = fr->dvda;
     gbtabscale       = _mm256_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm256_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm256_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -542,7 +542,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -552,7 +552,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_avx_256_double
     dvda             = fr->dvda;
     gbtabscale       = _mm256_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm256_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm256_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 3c426e51f6a431a65f1d587c06443b1d09b0e570..a64785a5631bb488475926f5c8689aac3b67cbd8 100644 (file)
@@ -111,14 +111,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = _mm256_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm256_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm256_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -483,14 +483,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = _mm256_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm256_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm256_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index ab04fad6bda7ce9dcfef394fd017c9fc5b76d340..a8b0d2d8a6b58f5a4f9eabc18b3784a6ea19b19a 100644 (file)
@@ -118,15 +118,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_VF_avx_256_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -490,15 +490,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_F_avx_256_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 84ee42299347136e9c8730602eedd6dcb16de4a6..49d0a4846b1d5a897005e3d7ab764c810c36b52d 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_VF_avx_256_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
@@ -461,7 +461,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_F_avx_256_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
index 4c70399bec6d4a0a3e76c1216ed74432244bec8f..53c718632ba0d4d681b22dadbf829d6b059f92d8 100644 (file)
@@ -111,12 +111,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_VF_avx_256_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -441,12 +441,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_F_avx_256_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 9163908ccf4a50b6c7b5dbe1665f485179031c69..84518802bf25684a92b4d9d97ab74d4fa29b7788 100644 (file)
@@ -113,11 +113,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_VF_avx_256_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -483,11 +483,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_F_avx_256_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 1fafc0d3e6a97f8fd1ed53b1246a9f5e303afa94..22469e54c4cac4c26fff4967a7b1385eb15262cb 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -126,7 +126,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_avx_256_double
     vftabscale       = _mm256_set1_pd(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
@@ -538,7 +538,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -551,7 +551,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_avx_256_double
     vftabscale       = _mm256_set1_pd(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
index b16606273e5d6ce8d5ec6f9d416c0559099507b2..f2f504c0b2efc5fde3bf376789a6680d5ca6e199 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -139,7 +139,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
@@ -768,7 +768,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -788,7 +788,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
index 8592825d8773a655fafc8198ce338e9c9e81761f..1d16339c9d30417eacb54adc6cf087506c7dbfe7 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -165,7 +165,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
@@ -1308,7 +1308,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -1344,7 +1344,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
index 423770304d66bdb244bedf91000258fbb4ce147b..310984066a676b3512b1021d6158518e549908f8 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -142,7 +142,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
@@ -835,7 +835,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -855,7 +855,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
index 0b627d0b239d58d016e32ca3740497fac07ad5e2..174179f82fde3245a71e82c8804017bedb52ba39 100644 (file)
@@ -134,7 +134,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -170,7 +170,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
@@ -1405,7 +1405,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -1441,7 +1441,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
index 0ec9ad93b2560d693ccccb9784ae8a914e41151c..373c6c8fe0fb9faa931d85e5b4ccc4e6f0a97486 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -119,12 +119,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_avx_256_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -473,7 +473,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -483,12 +483,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_avx_256_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index fc12d58657b497c498415b7f186bab999bd77f4f..7db1daa42a958a96b066b9f652b1f0dc27ad5f1d 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -132,12 +132,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -703,7 +703,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -720,12 +720,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 9e4fce0af0a57611c2c17eb0d089bedfb4e55249..ae984549410b8297e42911a5d10abc83b8eb97eb 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -158,12 +158,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1243,7 +1243,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -1276,12 +1276,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index bbd860d34377fe8ff30e1030216577e2cd152550..7f4707fe206bf17afb74df33147a8eed440a3943 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -135,12 +135,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -790,7 +790,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -807,12 +807,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index b2bf561a6ee9803f2cfa8c947eb1f19a881d08e0..58d23d5193606c89e0ca30f8bd863d212ccedd05 100644 (file)
@@ -130,7 +130,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -163,12 +163,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1340,7 +1340,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -1373,12 +1373,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 0d39cdd512f9afaa6803d053eda9f51f6cb37f06..9609a41bf6fb22171809ade875a63dbdd760b632 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -121,11 +121,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_avx_256_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -511,7 +511,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -521,11 +521,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_avx_256_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index f8f37747bee64d842f39accba03dc89250d15a14..6c6033d202a23cfe0ec7d72334f8f18ce8b97b37 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -134,11 +134,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -741,7 +741,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -758,11 +758,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index b3a80ece1fc9f169dbb2921b397e108a7e29e4e7..a09ccadabd306120a63aeeaeb115b681f1229a45 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -160,11 +160,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1281,7 +1281,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -1314,11 +1314,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 575e90da89b8c22908a7106f8ec6cfd62d8b4141..46e23227847c1b451a9107613ddbe9f2b2b8f0b8 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -137,11 +137,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -830,7 +830,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -847,11 +847,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_avx_256_double
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 23ab497c2bbbd8bf39a92eefdbbcd51ae81c57f0..cf42eadb90f62065ecfffd2af46105777eb16a09 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -165,11 +165,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1380,7 +1380,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -1413,11 +1413,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 415102ee59d8c66716acdd73b3f3723d56384a60..609bb0be1836f9c911d54ba6495ead68d4f32b0e 100644 (file)
@@ -103,14 +103,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
     crf              = _mm256_set1_pd(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
@@ -411,14 +411,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
     crf              = _mm256_set1_pd(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
index 3b51b83520c5e4382f6cea6ac2b83a8ac8834d60..0de96880ccb0056cbf0c9d7bfa1791ebe96d4e92 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -122,7 +122,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_avx_256_double
     iq2              = _mm256_mul_pd(facel,_mm256_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
@@ -641,7 +641,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -654,7 +654,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_avx_256_double
     iq2              = _mm256_mul_pd(facel,_mm256_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
index 4d1fb11687977c3c376113cfc396a546cb8ffe44..2d81b1a40399150fde29decad5a725b47444b712 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -145,7 +145,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
@@ -1196,7 +1196,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -1222,7 +1222,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_avx_256_double
     qq22             = _mm256_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
index 813c5294468b7d6eb3dd51fcee90d8dc11e9f0ec..1d2dcf7420f3bb0b13f7cffba56c060d4cef9722 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -122,7 +122,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_avx_256_double
     iq3              = _mm256_mul_pd(facel,_mm256_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
@@ -641,7 +641,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -654,7 +654,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_avx_256_double
     iq3              = _mm256_mul_pd(facel,_mm256_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
index 94f3b9c99a1966edccf6408f0b5a68c946aa6f69..da643872ee4c1d4a8ef77d1c74f62cf44e661c85 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -145,7 +145,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
@@ -1196,7 +1196,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -1222,7 +1222,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_avx_256_double
     qq33             = _mm256_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
 
index dacf9a3aa47211128783939a0139e2d663e65b8b..8588fb66429ebfa208c1d832f8a9e4f5e886d8c1 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -511,7 +511,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
index 7f8a1c6454a64ae4f4820c893357dcee3892e3a5..501e4975c1eea7e402f98812a7a857d413ad6958 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -701,7 +701,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
index 3304f6c68c93de15ef1a1674136f4cdb7450c946..9523a14b53497de85de3588e5a22c3896064a83b 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -1121,7 +1121,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
index 96ac6df45eb273a0248d14136f0c579431b17299..32d4d1e8bade0e9359c9e7cc43daf4d8bea881e2 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -770,7 +770,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
index 76f9fb7fb895fa17607c0adbc2f4c3c42464cfe6..773bb36568e3715338b6676f1bbe832998066d1b 100644 (file)
@@ -134,7 +134,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -1200,7 +1200,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
index d24a934eb8ef64d675e50e1cf3c7d2b1864e414c..dae38328b7ce81c82cec9c8b9940e097fd8804b0 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -441,7 +441,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
index a2ea4479c9463cb3457db419a9cdb422a113851d..4b68fa232dbcdc8eb38fc79e5577e9c5a3f15aa6 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -631,7 +631,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
index b2ef0e03abf3d4f60f9e7e9cf7032874cf592485..4d5aa5f89af5bc9b23c20506669c475ed949f75d 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -1051,7 +1051,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
index 855753c6a525e652e35634f71d2b1fdd7fe2fe48..7a671ea601571c2eb5b6468acc5ae227fabf4981 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -700,7 +700,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
index 8f9e7b08fa9bade331aed0db68d5b946f25e58ac..d8b2c94248dad4821fb568f87c7b363a5021cf73 100644 (file)
@@ -130,7 +130,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -1130,7 +1130,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
index 5e2567d70ec0d481b1b2c1e3c38b9b549c541a96..ba788b761d9750330b8ad0cf41484ccc5d8602cf 100644 (file)
@@ -103,7 +103,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -386,7 +386,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
index 424d612ebd140368b6d5451493d9bee3ae0b72f4..dc6cce6b37bce58a33f9740191605136aaaf89f2 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -576,7 +576,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
index 92810a82ae3b12bf457436e07a25a248556a1bdb..e6fe58219501b8a23465c148843bd667d96d7caa 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -1011,7 +1011,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
index 7d0a5358bd2cdcca519cd6334e763bb970a0a07b..9f4b1a47d715a55a405a94c3348e653b7e6a26a8 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -576,7 +576,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
index e6c2e11f8159e316a742c75d0d222b7357c51370..a0efe97a7ffba75f0df4f897cc87be0756c926f5 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_VF_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
@@ -1011,7 +1011,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_F_avx_256_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_pd(fr->ic->k_rf);
     krf2             = _mm256_set1_pd(fr->ic->k_rf*2.0);
index d1f3b98b52389c45eb03ce27cc70d6b9fef71cef..9265074e2738cc2572d916bea284faa3113875ab 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2017, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
index d8d84b68537771ed0d48b864a446c656013431e1..a25ec0e3908bfd8de78d3bffcb773a09b289c95d 100644 (file)
@@ -191,7 +191,7 @@ void
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
     /* #if KERNEL_ELEC != 'None' */
-    facel            = _mm256_set1_pd(fr->epsfac);
+    facel            = _mm256_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     /*     #if 'ReactionField' in KERNEL_ELEC */
     krf              = _mm256_set1_pd(fr->ic->k_rf);
@@ -207,7 +207,7 @@ void
     /* #if 'LJEwald' in KERNEL_VDW */
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_pd(minus_one,_mm256_mul_pd(ewclj,ewclj));
     /* #endif */
 
@@ -244,7 +244,7 @@ void
     dvda             = fr->dvda;
     gbtabscale       = _mm256_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm256_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm256_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
     /* #endif */
 
     /* #if 'Water' in GEOMETRY_I */
@@ -288,9 +288,9 @@ void
     /* #if KERNEL_MOD_ELEC!='None' or KERNEL_MOD_VDW!='None' */
     /*     #if KERNEL_ELEC!='None' */
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     /*     #else */
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     /*     #endif */
     rcutoff          = _mm256_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm256_mul_pd(rcutoff,rcutoff);
@@ -298,15 +298,15 @@ void
 
     /* #if KERNEL_MOD_VDW=='PotentialShift' */
     sh_vdw_invrcut6  = _mm256_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_pd(fr->rvdw);
+    rvdw             = _mm256_set1_pd(fr->ic->rvdw);
     /* #endif */
 
     /* #if 'PotentialSwitch' in [KERNEL_MOD_ELEC,KERNEL_MOD_VDW] */
     /*     #if KERNEL_MOD_ELEC=='PotentialSwitch'  */
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /*     #else */
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_pd(rswitch_scalar);
     /*     #endif */
     /* Setup switch parameters */
index ef721c70809f69b92d30c25b7e368bb00d8fb910..b1efb1b3f122d3a2b14b3c8d997b886064120ff6 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -617,7 +617,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index e9f328829df527e55a0c9c10a409d14c5a6b4d5a..7218549228c797af8591b6e659377b1f47ec9b9f 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -905,7 +905,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 834c426f961509ee9213a3a19795713e038f3732..f52fe3e5d43d174f9ee297f04f708228ee29abdb 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1599,7 +1599,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 9166476d95e4fdc219bdb2c6406a5cbf27138d1f..cb59ee73f0d0ec3daa90c3e2091d7800c463214b 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -999,7 +999,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 7b9381324c979ba935cba87930a7bc9026440b3a..d8969530d4b4207010dc91bcbed5449ccd106af8 100644 (file)
@@ -136,7 +136,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1703,7 +1703,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 12a2102c7531ccec5ba27ee5464709ca8bfeea7a..eb6621dbd7f9635006275037002ce7fb6519424d 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -557,7 +557,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 724cca72a173ddd46ab8cf2d0c9c12828d8ee175..e76f99aedd2930a3fcdd0238b041299121467f47 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -845,7 +845,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 139741acc139f00e54e812584a8656aaac5e9bd8..37233143c1f4bf88e1b7b4dd6b798285764e928b 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1539,7 +1539,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 9541a3141163f41b290942423a25f684e7d2c916..a4b3b9c016ba70af1de7ca73e540d2e11784c008 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -912,7 +912,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 1add7575f8d3a8fa0e61e78ed3033c1c14083297..ca9e8bd1c4fe6bae4f912f39bc123d35a201e020 100644 (file)
@@ -136,7 +136,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1616,7 +1616,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 50963aeb70b90bea8686fe5c1a72db629544fb91..52d2af447cc170d91e0d6d56a23dd1bdd09a59ac 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -482,7 +482,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index e64f37a51e3c7563351930d248255eba3e03d6e1..99db82fd95c12c30076f958b83078544206152e8 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -770,7 +770,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index db0f5bed974d0abe25e14920935315a678e86d4d..99417f763462d7607b2364d042a2a096cef96233 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1495,7 +1495,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index e374911e109e7ff7a36a357a487a7e9eb53d39db..af042c0f62a3524eba23621227bb9edab276d746 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -770,7 +770,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index dac9f8197edf8b52ad5bcd50779aec2b224bacea..9d423ac3370ea4eaf8e6ef41e04c06c82d0846d5 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1497,7 +1497,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 0cd4ba84fc4586c66ba04140ec0767cafbb0659a..167fe2248ec76848a5ec75d886f0cc0dd9fb2e4c 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -591,7 +591,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index f7731790dca91b1dac76e516853c7d8c9353a3b8..e1ebdf49627419753e4d6440f2678f5cb65b36b9 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -781,7 +781,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 641608538a8c3cfbb9ce1a41dbcbac49d026aad0..365a41d560396e6486bd0a413a7e57916d84f501 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1181,7 +1181,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 2a0b6699b9f279633e55d7e03f88ccbcacfd277f..50b7a65e8d177c69d024cd3973ab2a911e8c6e77 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -850,7 +850,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 2d0b063bef5604d2c49c3272bb4beba4cc69fac2..ca7fcdccfc3ba0476be081a1534266035db8d9af 100644 (file)
@@ -136,7 +136,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1260,7 +1260,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index c9ddd5fc68d3dd5f9a95a9bfc167276f020187a5..eb8be7d2f539ae117d2a532da0fecdf258962b7c 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -493,7 +493,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index b75bc0b140ea2e09ad77f4b6359c57c18eb95bcf..f2014225f873b469151b7344e0d91cd3773fa782 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -683,7 +683,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index bbf554090422458f31fe2de798c139b67035dc21..79cb27b9c9c052c24994c84b55ba90b032285b0d 100644 (file)
@@ -126,7 +126,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1083,7 +1083,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index b5d449ba67245f67ecec5053512e1e438d1168b6..3cd322dc726d596264ea452b071a2955a9f11ca8 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -752,7 +752,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 1fc19298e260b6e461d6a19947a100142f5aaf17..723b958eb4877a8aa480743278b126ab8ca9279f 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1162,7 +1162,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index b99296f4dcb6b950fdf4526378f0b3eeb862db2c..13f2d5312c447a66d81544c1812cc090207a79e4 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
@@ -422,7 +422,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
index 3178c560182ee926078a12166f7810090d2cbc7e..53a53bcd46930e99b012cd1354cbdff6c9ae5ca0 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -612,7 +612,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 6ea44102f921f8762eb1bf001f5631347091f83d..6afee4837aece96d560b55bc19fc6ab55d3cf966 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -1043,7 +1043,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 41ee1117134f18bf6bb0335275eb49ff84eae09b..8fb295d5348657004d765cd32a2c4e6262176af9 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -612,7 +612,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index a2a0e1287caa6518b1cc063cbd8b53236f18b9da..76bcd602504d22e5dd2ef209e45d70c68a09e236 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -1045,7 +1045,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 0d1d7cc2ab10b3f3d5aaaa22a4c8f34fcb1b611a..0d9f73af471be18056c0eb8276533a0fa3eb3c19 100644 (file)
@@ -121,14 +121,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -141,12 +141,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_avx_256_single
     ewtabhalfspace   = _mm256_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -614,14 +614,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -634,12 +634,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_avx_256_single
     ewtabhalfspace   = _mm256_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index 61259aa86d0f3607a0d6d5692012359a2913f617..808cc4cf9dddc2e36d7363b8b909ead7ce47fb66 100644 (file)
@@ -131,14 +131,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -159,12 +159,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_avx_256_single
     vdwgridioffsetptr0 = vdwgridparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -898,14 +898,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -926,12 +926,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_avx_256_single
     vdwgridioffsetptr0 = vdwgridparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index b61600df30bf3ac82fde758a66f0ef42c53a3ac2..e2379cb595ca46c975766a57e0d249db9b78f8be 100644 (file)
@@ -147,14 +147,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -192,12 +192,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -1551,14 +1551,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -1596,12 +1596,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index 26088dea438a0de210f60b1c3397da5f3d33a3cc..cea0e43025293ceababa9bbf28d8588b9023d4a4 100644 (file)
@@ -136,14 +136,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -164,12 +164,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_avx_256_single
     vdwgridioffsetptr0 = vdwgridparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -996,14 +996,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -1024,12 +1024,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_avx_256_single
     vdwgridioffsetptr0 = vdwgridparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index 9a200b351cde4d3ac2b5d4b295dff7b320a4962a..de9b73581e025f0b8d506f5784b14ef0cc8644ae 100644 (file)
@@ -154,14 +154,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -199,12 +199,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -1659,14 +1659,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -1704,12 +1704,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index 588933552caaeba5036fdddbf184358e3eaabf83..c953e5d3b24801e441e0f8c0dd19f2d000d4c22f 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -131,12 +131,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_avx_256_single
     ewtabhalfspace   = _mm256_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -567,7 +567,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -583,12 +583,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_avx_256_single
     ewtabhalfspace   = _mm256_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index 42a20f239aec558b837aef692e1b35d20b9bbbc1..fb0e6894e64d31702db2f8c2d8819379af6bfa23 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -144,12 +144,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -843,7 +843,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -866,12 +866,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index 4f43e0e52e87d803774abc388687af9207b484b8..9e5891621348d44399a09f596964e687f0a8eb6b 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -170,12 +170,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -1501,7 +1501,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1540,12 +1540,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index 8fdf6d9a0c0d80537c7d0ec743b710f45fd856fe..2d098d311be2a370ea7e94c15e501896f2d4d35a 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -147,12 +147,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -930,7 +930,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -953,12 +953,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index 6190160d76699c7abcee03c6e85eb22d38212f05..44a4d438f6b00905ee4f5e61ae3215857849c986 100644 (file)
@@ -136,7 +136,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -175,12 +175,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -1598,7 +1598,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1637,12 +1637,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index 991114318ac7f8953ede5fc724fa584a13ea916c..dde7bb53e6a8c1ee3936ad9b72be5c7f55306376 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -122,7 +122,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_avx_256_single
     ewtabhalfspace   = _mm256_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
@@ -489,7 +489,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -502,7 +502,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_avx_256_single
     ewtabhalfspace   = _mm256_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
index 510177f187943bf96f7eaaf4445d1e1f9e65d170..dc09100d4228c67191ec3d79a2562697bdd431ae 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -134,7 +134,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_avx_256_single
     iq2              = _mm256_mul_ps(facel,_mm256_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
@@ -765,7 +765,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -784,7 +784,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_avx_256_single
     iq2              = _mm256_mul_ps(facel,_mm256_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
index 00c83ab277fda1c4ce2328571ea8ad940b59d2ee..c16325a4a882e734fee2f9e4ab860be049933954 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -157,7 +157,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
@@ -1454,7 +1454,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -1486,7 +1486,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
index 6311970b362f32d17364a2e5b4a7063a35efefa2..197f3796396b30044de1b99766197ce08eba6923 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -134,7 +134,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_avx_256_single
     iq3              = _mm256_mul_ps(facel,_mm256_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
@@ -765,7 +765,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -784,7 +784,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_avx_256_single
     iq3              = _mm256_mul_ps(facel,_mm256_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
index a153b694a6abec88257c0c46f916c099a24fa62b..ca54c26d43af812b7e4af4c5cce5a5dfbab5817b 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -157,7 +157,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
@@ -1456,7 +1456,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -1488,7 +1488,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
index b0b05b28183b51a259dcfa58bcb0e7f95cf558a0..4873ce5ccd3ed0ed7a9e9aa5824322b87118267e 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -133,11 +133,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_avx_256_single
     ewtabhalfspace   = _mm256_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -604,7 +604,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -620,11 +620,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_avx_256_single
     ewtabhalfspace   = _mm256_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index a9fe19e39d8963d153be691ca58f1d59afc0737f..1f8e02e81c464542188045436aeb2a55e447c34c 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -146,11 +146,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -924,7 +924,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -947,11 +947,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index f1f43fed2637ff3506266fd03a42809646e6e550..95a944de10fbe13a6527d9e57591e255415f38a7 100644 (file)
@@ -133,7 +133,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -172,11 +172,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1714,7 +1714,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1753,11 +1753,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 3779dc70a72b1d2750e75b0c6614a693c372e1c9..f05b21fdad00972186f2a5d8b23e8775bca6a53a 100644 (file)
@@ -126,7 +126,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -149,11 +149,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1036,7 +1036,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1059,11 +1059,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 8244709307ae3e145b0da3dee28ece908000558c..090dc5a831033b186a88fb8ca576ec49b4869639 100644 (file)
@@ -138,7 +138,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -177,11 +177,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1836,7 +1836,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1875,11 +1875,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 787b094f6ef7aa53c2ae52214b563bcd208a2ede..d687da1f096facd62651fb39aaee131818abbde7 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -124,11 +124,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_avx_256_single
     ewtabhalfspace   = _mm256_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -527,7 +527,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -540,11 +540,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_avx_256_single
     ewtabhalfspace   = _mm256_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 809e5f06f0463e96c68829e9caff855436ea0652..be365fd9a796610d29ae281ecf7735547e501c99 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -136,11 +136,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_avx_256_single
     iq2              = _mm256_mul_ps(facel,_mm256_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -847,7 +847,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -866,11 +866,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_avx_256_single
     iq2              = _mm256_mul_ps(facel,_mm256_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index e4f1ccc09d4df2884f69c9f3635952a42cfd71e2..edbde4f1773a2cc843fcc38ee27748ada9e402ee 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -159,11 +159,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1668,7 +1668,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -1700,11 +1700,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 9b07fcaf959407caa68379f6bb0debb2347296e6..d5ed6691851819ea2eda3cb8c502deba5d8e60ca 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -136,11 +136,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_avx_256_single
     iq3              = _mm256_mul_ps(facel,_mm256_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -847,7 +847,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -866,11 +866,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_avx_256_single
     iq3              = _mm256_mul_ps(facel,_mm256_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 5f0f57fc677d07250ae2eb70e0a4456c2e836e3c..16ffdce1c98da6faf3d0a8ef3fb2435169b41991 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -159,11 +159,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1670,7 +1670,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -1702,11 +1702,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 2bb21d964374beb4e5ee184f46ef59e8e723f943..0e0725e4c37c73095b417463d83f655cb4826c85 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -628,7 +628,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 5408a149235d3a84b2c622b95dcd4ad7a3372156..039d3d68b1ea722bc15807b2500fdc7f6aa90b64 100644 (file)
@@ -126,7 +126,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -864,7 +864,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 94618768dbe3edfb75473dfe5eefe31bbe43b8c6..a22986d3e10639925b109b73eb8d430011f36c57 100644 (file)
@@ -136,7 +136,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1402,7 +1402,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 007437847a8dd8af8ac28a97a35ec75c96f4e026..d61a78658ba23b51d629d3a40277967e835df567 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -938,7 +938,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 63c15e694b85a77b72525c321e9184651a0b2c76..65793d4bd08bd19ea37686b3fb07db559418306b 100644 (file)
@@ -141,7 +141,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1486,7 +1486,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index a8bdb6ba38720118833996e3756a623a8bae3624..bd36ddc02a802901c7cf81032dfeb47875833403 100644 (file)
@@ -121,14 +121,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -582,14 +582,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
index 4f96e7055d89cffcb11318024de65ce426508104..939181c79ae9cb10fa721520f1c861b6395c5628 100644 (file)
@@ -131,14 +131,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -826,14 +826,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
index 29c24aa00919cd3f592297249b8d5948b24971b9..0a446b2f020298589bbfec2854ce9be3ab761af2 100644 (file)
@@ -147,14 +147,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -1359,14 +1359,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
index d5af5cf4e57724dc6a5bd9531d665ad0de2bcee2..a511ba18c5aec01de0c0b1305c2478cbfe450b2c 100644 (file)
@@ -136,14 +136,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -906,14 +906,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
index 6d45db3f80414c27dea9bc322640c68d73cbee1c..bd9624032cab04d29a7cbcac65713e91232af4c4 100644 (file)
@@ -154,14 +154,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -1449,14 +1449,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
index ecfbed170a857c5c7b61c0bd62d4b0f93006a502..00fa71458d1f831a0232f0fe727ec5a7a577ddaf 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -535,7 +535,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index d96781322ff858dc42568a510d4804df59a9def8..05709ada3131feebeb3730315c930e6988ede1e1 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -771,7 +771,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index dd5f9de67b13dc58aa46dfa059c6e3aba2431131..cbbed1ab8f106bde6e0f77c5d6deb1ff0ffcbca9 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1309,7 +1309,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 3ac6e80f25bcb0efb05f2c7ec168af2c64c64175..e4c8cadd3304fd55b551f46b0d4ba91548b167b5 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -840,7 +840,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 4b86f3d6c70d5579b0ebbef0e9685ca7b080035e..0ae34d7b2524db964298788549bd947371dffe75 100644 (file)
@@ -136,7 +136,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1388,7 +1388,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 9555ea5b358437ae2abfa3e420d8ca5121c2e1cd..c4c3aca8be23d299808a6d2d43ad916383b983b4 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -464,7 +464,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
index e8194880ad5df6da054f9bd982bb6e85bcd14867..9cad05bd07a4b9b83a11b8a2e99f82f8fc2ea268 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -700,7 +700,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
index 8b3f92f8d160b2b49caa605d6ff49435bff3f820..1592b284fef02eae6e8ad6b1413198cbc83cdd07 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -1269,7 +1269,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
index d6e5e1a1e3aef715d196f5686c4d9e40e0587383..50c278505c1fdc8f3ee74f3223ba8c6ed90a0930 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -700,7 +700,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
index cb3998b41270dd0355a3d68c1a276abfb34cab44..a79afc1a1873a8622bf5b8f4fe463152b875d17b 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
@@ -1271,7 +1271,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm256_set1_ps(fr->ic->sh_ewald);
index dfb6b826613718832ec959e8120ebdf270738024..7eb97eec873697a4deef55b674188522068b3287 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -133,7 +133,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_avx_256_single
     dvda             = fr->dvda;
     gbtabscale       = _mm256_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm256_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm256_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -708,7 +708,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -721,7 +721,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_avx_256_single
     dvda             = fr->dvda;
     gbtabscale       = _mm256_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm256_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm256_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index c997d0d7b25e14f1652fc3f3d6aaaf0a77f89ba2..6dfbecb6a40b97904117cc4549a53eac6caa40b4 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -130,7 +130,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_avx_256_single
     dvda             = fr->dvda;
     gbtabscale       = _mm256_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm256_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm256_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -629,7 +629,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -639,7 +639,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_avx_256_single
     dvda             = fr->dvda;
     gbtabscale       = _mm256_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm256_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm256_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index 124c58491b4eec6bcc4507d5477ee3c30d7801f4..3c4db3bb8694da8be269565620c1f165bd6ebf17 100644 (file)
@@ -114,14 +114,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = _mm256_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm256_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm256_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -554,14 +554,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = _mm256_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm256_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm256_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index d7d70a2008fa9545c7df87fb434e65e27e6d380e..f4c18d8661674d7f52e2491a85c08f22c1c82c70 100644 (file)
@@ -119,15 +119,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_VF_avx_256_single
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -549,15 +549,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_F_avx_256_single
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index fcb00362fadb74721ac9b00d8ce9629c62201b70..37b1b70c4a4f17b538fa9139e02e8e1f3d5f1209 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_VF_avx_256_single
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
@@ -520,7 +520,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_F_avx_256_single
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
index 8cad0ba0eda9e5d07855fc199ce44bee7d784b43..e378aaf6aa11a56e6983d03b7e2f31a5486ab1c0 100644 (file)
@@ -112,12 +112,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_VF_avx_256_single
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -492,12 +492,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_F_avx_256_single
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index 95bdf3816ab2fa9bd5bf5a17f25f6484c141f358..7b1e621d1b96522130f20cd82f1e69874267ab8a 100644 (file)
@@ -114,11 +114,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_VF_avx_256_single
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -534,11 +534,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_F_avx_256_single
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index c828dab9cf43b985c2cebd6069fba7e6c14fbee6..684dd5713f989c95a0a3dd526557110b6bab7583 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -128,7 +128,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_avx_256_single
     vftabscale       = _mm256_set1_ps(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
@@ -621,7 +621,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -634,7 +634,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_avx_256_single
     vftabscale       = _mm256_set1_ps(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
index ba9db710e5bdc6b0cdd185045c1cab3f26bb62b2..38849e0a5fc37c3578e2ffc0a909e204bb8a4655 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -141,7 +141,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
@@ -851,7 +851,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -871,7 +871,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
index 197dbb5208d6515f5efc87cbb441bb62aa8cdab4..b5d02b2ab9daf8b1d2eedf64d4825ff73f11de37 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -167,7 +167,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
@@ -1371,7 +1371,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -1407,7 +1407,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
index 68183a41fa3ebb8ac574b50e002c30fb54861d23..737a40059bc4c46830e6f53a5d55f8720d4f6ab8 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -144,7 +144,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
@@ -918,7 +918,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -938,7 +938,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
index 4f151f07a04a88af0466575d7d3dbfbc73380b90..d9f55d2c920ba542601ed73837c50c232db46b6d 100644 (file)
@@ -136,7 +136,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -172,7 +172,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
@@ -1468,7 +1468,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -1504,7 +1504,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
index 3ef2a15d8811b33606c94da001b7f390afbd10aa..ad48d36d48247a520e4b41f547fdfeb66fcdb9cd 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -120,12 +120,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_avx_256_single
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -528,7 +528,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -538,12 +538,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_avx_256_single
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index ee6c6476a5fea3aadabd5833a1ac5592b43baa0b..153e118716ad26322a3e62dc68cc9e9567c1994b 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -133,12 +133,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -758,7 +758,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -775,12 +775,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index 76f6c61b4a83a2d93fd3b6e1935514177c5c4626..4fdfc61ca15624a9bd0f00120af4e9b35bcbdb96 100644 (file)
@@ -126,7 +126,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -159,12 +159,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -1278,7 +1278,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -1311,12 +1311,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index 0b5bca15b69bb0f79cbb09a2432c2fb30fae3f40..d0fe7f3327609159a1ffeba23f1474f6d70cdcf1 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -136,12 +136,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -845,7 +845,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -862,12 +862,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index 4d31a5ead2f55d20a73ae31f826373743e03c368..dbf29246aa4f6356bdd56bd2c4e1a1a6f20b0841 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -164,12 +164,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
@@ -1375,7 +1375,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -1408,12 +1408,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = jnrE = jnrF = jnrG = jnrH = 0;
index 02b38ae8727689c74fbdeccd42afe96a2ec34649..948ecd9691e8395520793f35e68694fcd680b2ed 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -122,11 +122,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_avx_256_single
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -566,7 +566,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -576,11 +576,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_avx_256_single
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 3696431daeb59a1378a2a5db7d889500f67b7e42..27b742ec542c1c24dc0dcdc12159da61a126ac80 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -135,11 +135,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -796,7 +796,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -813,11 +813,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 50d1b599a8735b690059eabffdf916ab429eb857..70ec7c54dbee2c830700e3ff364a2319c759b4dd 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -161,11 +161,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1316,7 +1316,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -1349,11 +1349,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index b9147c65d5d085d6e98854c0a9d5897293be7077..68c80ec4675ebb10b2260e79236bf909aec6ac0a 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -138,11 +138,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -885,7 +885,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -902,11 +902,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_avx_256_single
     vdwioffsetptr0   = vdwparam+2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 7df08db4bbe100d90358b6f138713b2e2d70b0ba..e6ee9df56f75349e358caa7cc1f6143319403df0 100644 (file)
@@ -133,7 +133,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -166,11 +166,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1415,7 +1415,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -1448,11 +1448,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index a1de090380caa00f28c323ba08cbd50db6a7df67..c940225775b1619ad201693b913a520617716b3f 100644 (file)
@@ -104,14 +104,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
     crf              = _mm256_set1_ps(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
@@ -450,14 +450,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
     crf              = _mm256_set1_ps(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
index b522eb7f7445a5c273890330787319d075e59ee8..a9531d05c3c164e8804910b41131b52a555c6c61 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -123,7 +123,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_avx_256_single
     iq2              = _mm256_mul_ps(facel,_mm256_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
@@ -680,7 +680,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -693,7 +693,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_avx_256_single
     iq2              = _mm256_mul_ps(facel,_mm256_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
index 51a7e280e7ce9e1533146874fd075d32e1736742..d88924b4b7054f7d9b21b0e14bf48f10fabeb008 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -146,7 +146,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
@@ -1231,7 +1231,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -1257,7 +1257,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_avx_256_single
     qq22             = _mm256_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
index ee808b452125c76119089aa73c0047c857334b2f..f07213e991e4e73905befd5f8dfa327b724e9004 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -123,7 +123,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_avx_256_single
     iq3              = _mm256_mul_ps(facel,_mm256_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
@@ -680,7 +680,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -693,7 +693,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_avx_256_single
     iq3              = _mm256_mul_ps(facel,_mm256_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
index e17d9e2f5d33806dbbc512cc52e768107baca320..460c4e59c8558594f017f0283f1be534b56255da 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -146,7 +146,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
@@ -1233,7 +1233,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -1259,7 +1259,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_avx_256_single
     qq33             = _mm256_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
 
index 45449e158acb9921ae2826618fe8f1af7ba7c4cf..c51692eeac686e73144596cfe2ed88c55e305ae1 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -594,7 +594,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
index c58f2cc2c4f10f45d9a39978b74170e0b6734b01..28569447120f190a841c085657b323b62300c425 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -784,7 +784,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
index 53bd4e25b7cde3904ca7503275ced71343cf1ccb..c1e19c01727be5f89b3ee844243a962ff1eac311 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -1184,7 +1184,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
index d4b8baf2468d1e14d4f0dd527dc8d9d90a678001..879c68720736be3d7ac5cffeeebb46991b6dbfc7 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -853,7 +853,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
index 953f668b6c89698a8f34e20e823192f628946668..337d538648aec3d49ad67d8582fc860680b47d38 100644 (file)
@@ -136,7 +136,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -1263,7 +1263,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
index d336ce03b55ccf2acb2f033e7b478e3132870d19..7df24af79cca6e1b50fd56b2ec484fd5ec4077d0 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -496,7 +496,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
index b3abd496afd08b402a830e6008f23aa96d3418ab..cb8f255cdf65fbcf7068456df9e353f0a347c170 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -686,7 +686,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
index 2b4fed87c7bec06aecacfee4070de194c8671ef3..92420ecbbc2589cadda2565d32e7b5cefae88b0e 100644 (file)
@@ -126,7 +126,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -1086,7 +1086,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
index 668b521026eeaf8c892465b983ec99952ea723e2..776539c909a57fda9206a90252f42e4e92d0de7d 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -755,7 +755,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
index 7839f2d4dff0602d52cd8e7e2148d2a246836ec0..16d227f5f0d9d1cc052dbe722db11a97544e94c7 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -1165,7 +1165,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
index 4f4be7a802143b7aeb3aa205889d77aeb7be2491..26b0db856e9caba36f88f31a4669cf37a3d38c8f 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -425,7 +425,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
index 99f170df9ee5682992a7be1de93a0c025e4839ed..d793af10829400ffbec8d828dc54cc6c6a8a347c 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -615,7 +615,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
index 5724410cbc6765007e1e742b8831c97b2ef6d0a3..a1c73257d91304b5181d1c6fcf8c8f55a2f3ade1 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -1046,7 +1046,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
index 66f42f7eb51194a78b0978e028ecbfc76309674b..700d43436c4e8c8250faa525e6edb06b64e142a7 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -615,7 +615,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
index f202ba72027c2d19ca1a736706dfdead041e9357..e7b1e123b722c9887992d25f46454ea8ac0ec02a 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_VF_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
@@ -1048,7 +1048,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_F_avx_256_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm256_set1_ps(fr->ic->k_rf);
     krf2             = _mm256_set1_ps(fr->ic->k_rf*2.0);
index fb9cd1d31cb628ec4cb9048c0b75901958330564..b4debc8f40d957537eeb2e7982beefb63f81b269 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2017, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
index b2f53ec01598280107f48a7d38032b2b60d9000e..837fce7857680e389e568f6e2971626bc3b64ca4 100644 (file)
@@ -198,7 +198,7 @@ void
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
     /* #if KERNEL_ELEC != 'None' */
-    facel            = _mm256_set1_ps(fr->epsfac);
+    facel            = _mm256_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     /*     #if 'ReactionField' in KERNEL_ELEC */
     krf              = _mm256_set1_ps(fr->ic->k_rf);
@@ -214,7 +214,7 @@ void
     /* #if 'LJEwald' in KERNEL_VDW */
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm256_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm256_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm256_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm256_mul_ps(minus_one,_mm256_mul_ps(ewclj,ewclj));
     /* #endif */
 
@@ -251,7 +251,7 @@ void
     dvda             = fr->dvda;
     gbtabscale       = _mm256_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm256_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm256_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
     /* #endif */
 
     /* #if 'Water' in GEOMETRY_I */
@@ -295,9 +295,9 @@ void
     /* #if KERNEL_MOD_ELEC!='None' or KERNEL_MOD_VDW!='None' */
     /*     #if KERNEL_ELEC!='None' */
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     /*     #else */
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     /*     #endif */
     rcutoff          = _mm256_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm256_mul_ps(rcutoff,rcutoff);
@@ -305,15 +305,15 @@ void
 
     /* #if KERNEL_MOD_VDW=='PotentialShift' */
     sh_vdw_invrcut6  = _mm256_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm256_set1_ps(fr->rvdw);
+    rvdw             = _mm256_set1_ps(fr->ic->rvdw);
     /* #endif */
 
     /* #if 'PotentialSwitch' in [KERNEL_MOD_ELEC,KERNEL_MOD_VDW] */
     /*     #if KERNEL_MOD_ELEC=='PotentialSwitch'  */
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /*     #else */
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm256_set1_ps(rswitch_scalar);
     /*     #endif */
     /* Setup switch parameters */
index fd9565f095f161a5942770842ccecbd5ea9ad131..173074ea0274a0398844f8193b5a4ba1df570ca8 100644 (file)
@@ -93,7 +93,7 @@ nb_kernel_ElecCSTab_VdwBham_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -304,7 +304,7 @@ nb_kernel_ElecCSTab_VdwBham_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 046c15f2b69d1a0cf67b76c43eb97d8401b6a88b..d7e1f0fab30290a5ff7e76c99b38ce72792b2e48 100644 (file)
@@ -99,7 +99,7 @@ nb_kernel_ElecCSTab_VdwBham_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -439,7 +439,7 @@ nb_kernel_ElecCSTab_VdwBham_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 41e78c81e7be57f536db1e88e65d42a0ab7565f6..2c41c15a512bbb27d08c81cd0f1d1db9f8de1269 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecCSTab_VdwBham_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -745,7 +745,7 @@ nb_kernel_ElecCSTab_VdwBham_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 1af1e76b6fba8d12dcdef4eaa6d3d34e19a655a4..05af9ccc4a8b8008c57a232e05c1662404a123dd 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecCSTab_VdwBham_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -486,7 +486,7 @@ nb_kernel_ElecCSTab_VdwBham_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index f53b7bc7f838ed14ee096b98bb78e47bc68c23e5..e48d30cb24bd28aa28f7fc6beeabfda640346be6 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCSTab_VdwBham_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -798,7 +798,7 @@ nb_kernel_ElecCSTab_VdwBham_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 26cfb48f5ee1eec8112367b5923a88b6acb3ba96..987abb5f61b160dbea06fa33f363b3e474e28005 100644 (file)
@@ -93,7 +93,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -318,7 +318,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 02e11fbc301cbd7c8ae2ea6cc748bdc03d62f308..8d893497c9c7e4b554502be4479a70d783a3a80f 100644 (file)
@@ -99,7 +99,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -453,7 +453,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index d07d2208c47d54b12059da4f542f541b6b50574e..2f984ee52c7d018a0311c9f62d5cfa0fcc157d63 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -759,7 +759,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index a146b7ff21d0b5e1e4f7ba9ee27d3263769fe09d..15618123bdf60852c258792e1b1afdc019ecdf0c 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -506,7 +506,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index e5db3c59811911b2d27558be9b3b9c509c78aed1..bbcb2ca0f3317d44ed015a89e7a436864aac980c 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -818,7 +818,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 3a17fbf5826b4b1bfa2b3c5ef76ca93e371f9235..98d1ddba23de723d5d9e683996163f4db180d4a9 100644 (file)
@@ -93,7 +93,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -303,7 +303,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 3af77f7e32f3a8f0fe4e456546ea2ade73f942eb..da6e453a93aca611e1463a4b7d6931e0a2a1162d 100644 (file)
@@ -99,7 +99,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -438,7 +438,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 4b5598dd566ca27ff19cd311773d9f564d19b35b..71ad5ac07a4ae461f869a71a62a96e6fd44c0e5f 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -744,7 +744,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 9aded273d7ea3ffd46f6a522f25564628ce2065d..de714d93bba434307bb9c1af05139a9894575196 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -482,7 +482,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 5b6672124e4b3b51bf50258a0c5ffa08e7d41e67..faa92dbe40aca5251868a4f09242afa8180ee30f 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -794,7 +794,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index c77421e80e60fca9a1f0b2fc17ab0f03b01ee061..0fd46d0962c8ff1742d4bfe4a9f6affb9a1c34c7 100644 (file)
@@ -89,7 +89,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -275,7 +275,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index a1cc316dbdfdd6369cb6977a3278173b5bdc67e3..54c3a2f9b54e344e9d46fb513bb500c963b6177b 100644 (file)
@@ -95,7 +95,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -410,7 +410,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index bcaffe0c0c278c9e96e7ed2ffa06ecaadd8fa35a..03422f67e0c451b41a84eb1ff7cc808c581157e4 100644 (file)
@@ -105,7 +105,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -716,7 +716,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index b662e734c70eaaa0480af71128bd9892f39c7575..cc4101db3b8e83d68fe797823b653ad62360c54f 100644 (file)
@@ -95,7 +95,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -410,7 +410,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index a9016be23c96b0f4c25e6e0d026fe1e8b9814c47..6136c7b0d5e397573eb843fa1b7a5d09520dce48 100644 (file)
@@ -105,7 +105,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -716,7 +716,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 9394447fd7f0f964a82b9e7f003e212dce9c3208..ecc32b6a5fd79006b96d266e81da7039be8039d4 100644 (file)
@@ -90,7 +90,7 @@ nb_kernel_ElecCoul_VdwBham_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -282,7 +282,7 @@ nb_kernel_ElecCoul_VdwBham_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index d0c7e9f4c385d2f399ffcc8a6a4b29f6f4676dd8..253102afd5c8b548bcdb276d4edf48e45a8523db 100644 (file)
@@ -96,7 +96,7 @@ nb_kernel_ElecCoul_VdwBham_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -389,7 +389,7 @@ nb_kernel_ElecCoul_VdwBham_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 6067542ab41bda3dd4d21895613f6d90d26cb1fa..3a2bc1e637e59470c2caec96d6f09ce6e0872b08 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecCoul_VdwBham_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -611,7 +611,7 @@ nb_kernel_ElecCoul_VdwBham_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 6c344ec8d3174b5b1bd14c52c26b41ac738d79eb..ea7b62d1f9c4b4873ddcc5fd101d2ea16dfa8e96 100644 (file)
@@ -99,7 +99,7 @@ nb_kernel_ElecCoul_VdwBham_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -435,7 +435,7 @@ nb_kernel_ElecCoul_VdwBham_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 6b4b48daef67976a462521d3869c926ca52e2dcd..68342318f4755009fbe669219baafbd3fef0ec84 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecCoul_VdwBham_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -663,7 +663,7 @@ nb_kernel_ElecCoul_VdwBham_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 6bf15a215ea51dd0e5b2c32ec13082c20e446768..d2fd92fe5c9ec5651bf1f7afc207338223549ffc 100644 (file)
@@ -93,7 +93,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -313,7 +313,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 072d469d10cebbb71b4a079b41feec1101bbfc2e..2eeace810e0b57367c01a626931885e84999df39 100644 (file)
@@ -99,7 +99,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -420,7 +420,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 88561d0b9a628ca1a2bf6f15e764935e94724a10..57cc666f89dcd1c72639c926dfc4ce9ba1fcbba2 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -642,7 +642,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index a127f7d1da5e38573e536a6afcf20b47b7a9d439..f6ead5e379074f2322ab14944f1b54738e651aa5 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -465,7 +465,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index d4403cfdc58f17c47fcca80d9d1c167a45c60ca0..96d5a040066a13c8f4e69e41153deb23862ad7d0 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -693,7 +693,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index e5fc669c0d9edd3f4b6ead82ed67f8fb5d848c4b..963a19ce1700bed2bf52b8bb7d732697cfb15ce8 100644 (file)
@@ -90,7 +90,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -279,7 +279,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 263c801e69981a205798fadffbce9cfc7a6aa9fe..d3bcc5d9f860d31df1c35fc7d91b45ec494ac44f 100644 (file)
@@ -96,7 +96,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -386,7 +386,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 4a4e1deffe7dd02f3529ca62df279467b39e9099..c956349650e5be882b676b1d37793b5852b7551e 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -608,7 +608,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 8fbb7f8868b0e60fa69880960e9c3ff191e4dda9..a70fae292c0963f53f911b6ce27aacbf9930a4f2 100644 (file)
@@ -99,7 +99,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -431,7 +431,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index b0f4d8c62779352d3b0a324c3dae45e5ebb15b8a..b003d5821d4e1767ff79659f01065cb8395fa2ef 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -659,7 +659,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index d895ceda2ccbd1764fc51c3064930d589336e395..0311d664036b838670c6573e9a87ba9b8274f482 100644 (file)
@@ -86,7 +86,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     outeriter        = 0;
@@ -253,7 +253,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     outeriter        = 0;
index 81ca904b106f690b6deb9ef05d1c50d804237749..9954d5473db9bc1cf2e1579d6533a1b9e2f7fb37 100644 (file)
@@ -92,7 +92,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -360,7 +360,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index e6898b625f1560073bf86d550ab672c73b9a0f71..bad6d1b6a915e108bcea7d503093fb33da71d3ce 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -582,7 +582,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 6b0a6d9895b2847f58d2d9c9679be5c2cd48831c..912883cea384f4eefd7d64f7e65b30b5306ed4ce 100644 (file)
@@ -92,7 +92,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -360,7 +360,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index a15fc2bc8e674ef45c91f89a0dccf6207f892ca5..426d008ae33419151d19b2d3cd81485cb768f985 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -582,7 +582,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 16d2366aceaea675b7e72c3ce67f93852a35e7ba..a7db09fc40e02d57fb8eb5ee9b09b99acb4562c9 100644 (file)
@@ -93,7 +93,7 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -105,11 +105,11 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomP1P1_VF_c
     ewtabhalfspace   = 0.5/ewtabscale;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -312,7 +312,7 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -324,11 +324,11 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomP1P1_F_c
     ewtabhalfspace   = 0.5/ewtabscale;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 04864f09faa74f930b2d377265ba66882efb4f78..464fcf5e15b045bcc6155ba5871059222ed0cecd 100644 (file)
@@ -99,7 +99,7 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -118,11 +118,11 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomW3P1_VF_c
     vdwioffset0      = 3*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -447,7 +447,7 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -466,11 +466,11 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomW3P1_F_c
     vdwioffset0      = 3*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 8efb94ab66ca56b516840d870c80c5c1022a54ea..705ff3ab2f58dbd4d916b81a9af2ec68a081e2fd 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -145,11 +145,11 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomW3W3_VF_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -753,7 +753,7 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -789,11 +789,11 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomW3W3_F_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 1bc89905e4e3a3b494e96f1722ee00c43dbd9d49..69ffe9268bff269e817c470767cdba12e9ecd3c2 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -121,11 +121,11 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomW4P1_VF_c
     vdwioffset0      = 3*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -500,7 +500,7 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -519,11 +519,11 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomW4P1_F_c
     vdwioffset0      = 3*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 35440382829c8a4e7d9fb8c46f8c57e32ef64cc3..b6cebe684ca037b02730645054a592be755a9e96 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -150,11 +150,11 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomW4W4_VF_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -812,7 +812,7 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -848,11 +848,11 @@ nb_kernel_ElecEwSh_VdwBhamSh_GeomW4W4_F_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index b1af9e443fe636fe2de386f2be913ad70963e1cf..70ebdcf9560cfcb2879dd541bce91bbef8608641 100644 (file)
@@ -96,13 +96,13 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
@@ -113,11 +113,11 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_c
     ewtabhalfspace   = 0.5/ewtabscale;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -324,13 +324,13 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
@@ -341,11 +341,11 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_c
     ewtabhalfspace   = 0.5/ewtabscale;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index dc4b7ace6f6904a40fe0700e93b3fb8c8182b8d1..aebd0a3b924523347a63df9afe6d962d39d82d34 100644 (file)
@@ -104,13 +104,13 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
@@ -128,11 +128,11 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -463,13 +463,13 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
@@ -487,11 +487,11 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 6738fa23201b19035ed341eaefa1142817bcc091..b9069fe3e5922997438866d706592f42ae8a10fc 100644 (file)
@@ -120,13 +120,13 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
@@ -161,11 +161,11 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -781,13 +781,13 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
@@ -822,11 +822,11 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 3ceac0d20e06910edb7c4754c847bcb57936ec94..bcccd563e711a16bd8038bd0383b7b01972bc908 100644 (file)
@@ -108,13 +108,13 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
@@ -132,11 +132,11 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -518,13 +518,13 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
@@ -542,11 +542,11 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 12d2e72cac708b06185c859bf0f1fc1e921e58e6..9cee53c8dc852ea0adcd24ada3f6103e7d3f09bb 100644 (file)
@@ -126,13 +126,13 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
@@ -167,11 +167,11 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -842,13 +842,13 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
@@ -883,11 +883,11 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index e12bf37083d537889f898d801affe935df299bfb..aa3a4d814e90609c17de5724974a9e23c99bf668 100644 (file)
@@ -93,7 +93,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -105,11 +105,11 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_c
     ewtabhalfspace   = 0.5/ewtabscale;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -311,7 +311,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -323,11 +323,11 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_c
     ewtabhalfspace   = 0.5/ewtabscale;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index f54b51bea50c25261628c17b419b4c765b587115..d8f1cfedbd3abe79d8431db40991d65a9dd88d7a 100644 (file)
@@ -99,7 +99,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -118,11 +118,11 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -446,7 +446,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -465,11 +465,11 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index ebcef6fd7ad046d7bc1b5d1b3ce3e555bd83f22b..1b7cc90ca950f2ad2fff9303ba0bc625c7eea2a8 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -144,11 +144,11 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -752,7 +752,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -787,11 +787,11 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 3b36825f8b5085199be42476d0712b55e70f1a83..0a42f53a0c16bc0de0a78b7a1c06edd6f5656ad6 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -121,11 +121,11 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -496,7 +496,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -515,11 +515,11 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 32a7f2c007b361048a3074fd5fa91b7c64d3a3d9..5cefc91ac9f8c62dd9f5e465398b00ff61303e07 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -149,11 +149,11 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -808,7 +808,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -843,11 +843,11 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 461d50cf5db36d7114204d8c4b7977b4b7d299b3..4f6db97c4aaaeccab6a33af949f9c8015183f5e0 100644 (file)
@@ -89,7 +89,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -98,7 +98,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_c
     ewtabhalfspace   = 0.5/ewtabscale;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
@@ -282,7 +282,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -291,7 +291,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_c
     ewtabhalfspace   = 0.5/ewtabscale;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
index f98685802ee325591f3ceabcbe672230574662f3..405285cc121e8cd81b62a306eec3107d375f37f4 100644 (file)
@@ -95,7 +95,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -110,7 +110,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_c
     iq2              = facel*charge[inr+2];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
@@ -417,7 +417,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -432,7 +432,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_c
     iq2              = facel*charge[inr+2];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
index 9e41b49f0a1b5c0d97ff23fb1652ab670a3f157c..b3f42950a07efb46f114aa9d5ceba504782f2fc0 100644 (file)
@@ -105,7 +105,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -133,7 +133,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
@@ -723,7 +723,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -751,7 +751,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
index ced2a08fa3f522d5503a8c9b837ca14fe04441d7..92155263427653651c1e04fba62da4f6bafb76b8 100644 (file)
@@ -95,7 +95,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -110,7 +110,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_c
     iq3              = facel*charge[inr+3];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
@@ -417,7 +417,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -432,7 +432,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_c
     iq3              = facel*charge[inr+3];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
index 41cbff7681e9db0b5c5a0f1b56ddf4bbffcf486a..66cb2456afac21f619ac52e116f305915fdb52e8 100644 (file)
@@ -105,7 +105,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -133,7 +133,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
@@ -723,7 +723,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -751,7 +751,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
index 6ec920aa4c13287887af414bd57e8a42f469e7ac..c03b26715f2ae469cda102d4945907d59f97344a 100644 (file)
@@ -94,7 +94,7 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -106,10 +106,10 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomP1P1_VF_c
     ewtabhalfspace   = 0.5/ewtabscale;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -335,7 +335,7 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -347,10 +347,10 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomP1P1_F_c
     ewtabhalfspace   = 0.5/ewtabscale;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index 1d0e5ba2988a8289834883c0481a0853a62d5c5a..2428df49e005bfb611438e1cf99263218a171ad8 100644 (file)
@@ -100,7 +100,7 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -119,10 +119,10 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomW3P1_VF_c
     vdwioffset0      = 3*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -494,7 +494,7 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -513,10 +513,10 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomW3P1_F_c
     vdwioffset0      = 3*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index d533ffbff124a64441534f01a1aaf4957f22114b..2b8949bbda50d5f1bc372760615f49de28cccf07 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -146,10 +146,10 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomW3W3_VF_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -872,7 +872,7 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -908,10 +908,10 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomW3W3_F_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index 66dde5ea68c31be5387bf754d80296e23c5e2b86..c9c4c750d86ae881cef0cfd7db784e69d6024fb9 100644 (file)
@@ -103,7 +103,7 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -122,10 +122,10 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomW4P1_VF_c
     vdwioffset0      = 3*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -557,7 +557,7 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -576,10 +576,10 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomW4P1_F_c
     vdwioffset0      = 3*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index f32c745c379b64752fdbf820afc8336d89e07586..36e84442a498df0c2fdbf4cf7eeb0ea8725c4773 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -151,10 +151,10 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomW4W4_VF_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -941,7 +941,7 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -977,10 +977,10 @@ nb_kernel_ElecEwSw_VdwBhamSw_GeomW4W4_F_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index 521eb64acb0dde3beee77d3dc0d5610eebac9ff4..91d67e6ab40128742949c116381adf183b842abd 100644 (file)
@@ -94,7 +94,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -106,10 +106,10 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_c
     ewtabhalfspace   = 0.5/ewtabscale;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -334,7 +334,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -346,10 +346,10 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_c
     ewtabhalfspace   = 0.5/ewtabscale;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index 1377fbda137adc7d24ced6fd6fb209ab19b21d63..e4d6a12af81614b790c7ce06b5a0c50e71974d17 100644 (file)
@@ -100,7 +100,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -119,10 +119,10 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -493,7 +493,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -512,10 +512,10 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index dda77b0363895b637fc7917d68d01926b380b105..63c451f691dd331c019dfe2d5f93e28e29ec9b6d 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -145,10 +145,10 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -871,7 +871,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -906,10 +906,10 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index c6930a25bcea7fa4f0319815df7818d56bdb82eb..805f8afa7a9c32022a25493669497075acf974ea 100644 (file)
@@ -103,7 +103,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -122,10 +122,10 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -556,7 +556,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -575,10 +575,10 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index 253139cf6156eb74ef3c3a82cc90d265f73e7200..f0499a43a43c87a9f3f50192b6fdd979767047fb 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -150,10 +150,10 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -940,7 +940,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -975,10 +975,10 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index 283403d2072d5d617cac8c5a59a7a0297489f89e..7fd47557310f9b30ccea2c4b53f588af8466a4c1 100644 (file)
@@ -90,7 +90,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -99,10 +99,10 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_c
     ewtabhalfspace   = 0.5/ewtabscale;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -306,7 +306,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -315,10 +315,10 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_c
     ewtabhalfspace   = 0.5/ewtabscale;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index 1fec98a889d1c3fb05e12ce4687883637e9b1c65..6738c7e68c4cfdb1c6127462e43211ad75d185f0 100644 (file)
@@ -96,7 +96,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -111,10 +111,10 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_c
     iq2              = facel*charge[inr+2];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -465,7 +465,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -480,10 +480,10 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_c
     iq2              = facel*charge[inr+2];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index 193988292ef2f2b2e6a50b4eea47b171e3755344..e0b5628cb1b81907f17e3a85c643fb83c6ab03d1 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -134,10 +134,10 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -843,7 +843,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -871,10 +871,10 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index a18d3cd616c5050b96b66d1c65b962af2f660d56..a019357644e0c2c1e6f6d81660eec02f6e9e0683 100644 (file)
@@ -96,7 +96,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -111,10 +111,10 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_c
     iq3              = facel*charge[inr+3];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -465,7 +465,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -480,10 +480,10 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_c
     iq3              = facel*charge[inr+3];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index 5a850638e9acadd33521f4b0456217da18ef55e7..00863d2de781da311ddf7ce8b3ab4a08f653e13a 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -134,10 +134,10 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -843,7 +843,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -871,10 +871,10 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index 701c1a465b30a4d78ba0ff87debdc33d41656323..4291faf3c49fdefeabca4201280040997eb0c8fb 100644 (file)
@@ -93,7 +93,7 @@ nb_kernel_ElecEw_VdwBham_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -300,7 +300,7 @@ nb_kernel_ElecEw_VdwBham_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 5ba2d2c36fa9b832b0239ddd9056da5b29460d4f..00f4b2c553e8ccb93f3ebd4e07f0479f3bd543ee 100644 (file)
@@ -99,7 +99,7 @@ nb_kernel_ElecEw_VdwBham_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -425,7 +425,7 @@ nb_kernel_ElecEw_VdwBham_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 2e6b5561502c9e6fc03ce135dcb5486c44c902cf..fd2183f3664e9e5e84707ac3f53a6250ccf7e5b7 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecEw_VdwBham_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -701,7 +701,7 @@ nb_kernel_ElecEw_VdwBham_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index dc6e59b46e3288b283353fc50558ddd7c377dc56..049d4e8ab99fffb15c075e92d131ab276c0b71aa 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecEw_VdwBham_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -473,7 +473,7 @@ nb_kernel_ElecEw_VdwBham_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 8565ce07b43fc6e888ac59e9e1f65d14229d30a9..f6779d893629a3944c99fd142de66db733c4106c 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecEw_VdwBham_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -755,7 +755,7 @@ nb_kernel_ElecEw_VdwBham_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index b1689a317c48cccbe35910134c76e9c3e624488a..6fd17d0082614b0e03daa33f5089da248cfdb14c 100644 (file)
@@ -96,7 +96,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -331,7 +331,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 70ec28a1bf1f52c034f6986fd4e81baeda089c2a..c930005cc59192122db902dd2ddd70acb7ff3e8f 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -456,7 +456,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 61a86a4d1a016f08941de4054c73d0e421380d0f..c9ab6e672e47c1937957a1994fa529f6ef0eb70a 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -732,7 +732,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index efef0f223832b9d0c0408161edad0f9c3cb74632..be28414d5448c218a17c504a7ed487fb86013400 100644 (file)
@@ -105,7 +105,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -503,7 +503,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 347a30b75f071cd32b48310a186a7370d3f412a7..d46e2d0be05139ac2b02967b7bf406f3b7e76a8e 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -785,7 +785,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 5e2e3460a9b42d3e88b18fd17d572594bcc6693b..b2902b366458f5c20072f3192d3eebce28de26a1 100644 (file)
@@ -96,13 +96,13 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
@@ -312,13 +312,13 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
index aa2bb4422c495c92176fe4dd554bff2786da6d8a..72af8c3cad61ce417e5845fecb237ab6f338da74 100644 (file)
@@ -104,13 +104,13 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
@@ -441,13 +441,13 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
index c5190919510ec173caf6a75c5cd8073e960f7bff..d1e27fb16669c27c702051b81ed0dff391e261d6 100644 (file)
@@ -120,13 +120,13 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
@@ -729,13 +729,13 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
index cee1bd5e1514cad85c42c0629dd49bf8a5d8a6f4..d643ced4775e8b9b3af955a39143eaeeaf4dfb80 100644 (file)
@@ -108,13 +108,13 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
@@ -491,13 +491,13 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
index 2ed78f509dda70a33c9d1435ef52b54d07612a5d..0a20e76f5a0cc6bf08819d578654a5580ec65360 100644 (file)
@@ -126,13 +126,13 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
@@ -785,13 +785,13 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
index c2d055416c2b135f1d6938caa8f98062135ff4cf..eceda1b0ec1b36b0fe4f4420f30cb8b80e62ef7b 100644 (file)
@@ -93,7 +93,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -299,7 +299,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index ab133f182bf5e4ae57c8f7fa113c632add88589e..3cd55837510efa977d7371d9b3d42d2e1517a34e 100644 (file)
@@ -99,7 +99,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -424,7 +424,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 291ddeb15c6aa83b7f924519d1f928d1bc5ba1c5..c661cdf2ed4eee63a3ab9d9a75c6c8f5b38ae7cb 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -700,7 +700,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index c6355ebc9b896d42148eef5ce9cf97ed8f44932d..a6f1097635262f4720881313914c25127dcaddfe 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -469,7 +469,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index c43c342bb6439bb2cad7441fc872f10cfd9d30de..43702e70ffb700174af7e1b4b658e3f3b113679c 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -751,7 +751,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index c79f811b3866f1e642b6a2d483083d9b9051d132..012b915d0cbc9c94867817702f629758898ebf83 100644 (file)
@@ -89,7 +89,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -273,7 +273,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
index 49d7cfcc3c1aff2f33051ec343feeeaac5c402c5..15b5761e142a44039044f512d88c01f55b35efdf 100644 (file)
@@ -95,7 +95,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -398,7 +398,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
index 977db61c749b8488f05efbd1a40329ea83592a6e..717432010b6a4936cb9c1f3ab09d842212ac54a0 100644 (file)
@@ -105,7 +105,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -674,7 +674,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
index f0bebebdc748babd1a45d84b64253158c4b09007..314ca07a19de0349aab18a96f19cd7762c439079 100644 (file)
@@ -95,7 +95,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -398,7 +398,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
index b95f358f43684bbcf0b34377741f956a3858fc72..53793c2e99243d9991f7d7618111b1935f2db92e 100644 (file)
@@ -105,7 +105,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
@@ -674,7 +674,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     sh_ewald         = fr->ic->sh_ewald;
index 9135cc334d8f2bb8ba71e44c17e7253d89bbc393..343dd09dc49271c0a763ba69ef707aa90cc84323 100644 (file)
@@ -96,7 +96,7 @@ nb_kernel_ElecGB_VdwBham_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -106,7 +106,7 @@ nb_kernel_ElecGB_VdwBham_GeomP1P1_VF_c
     dvda             = fr->dvda;
     gbtabscale       = fr->gbtab->scale;
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = (1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
+    gbinvepsdiff     = (1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
 
     outeriter        = 0;
     inneriter        = 0;
@@ -333,7 +333,7 @@ nb_kernel_ElecGB_VdwBham_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -343,7 +343,7 @@ nb_kernel_ElecGB_VdwBham_GeomP1P1_F_c
     dvda             = fr->dvda;
     gbtabscale       = fr->gbtab->scale;
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = (1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
+    gbinvepsdiff     = (1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
 
     outeriter        = 0;
     inneriter        = 0;
index 0ea82ad68d8110ce293e9a44ae48fa539c15c32f..83a453f2916ec017eaac5fdb73ea7c5e30f13719 100644 (file)
@@ -96,7 +96,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -109,7 +109,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_c
     dvda             = fr->dvda;
     gbtabscale       = fr->gbtab->scale;
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = (1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
+    gbinvepsdiff     = (1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
 
     outeriter        = 0;
     inneriter        = 0;
@@ -356,7 +356,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -369,7 +369,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_c
     dvda             = fr->dvda;
     gbtabscale       = fr->gbtab->scale;
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = (1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
+    gbinvepsdiff     = (1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
 
     outeriter        = 0;
     inneriter        = 0;
index d243c45c26f3b6f3b79d9b4c7dba9d0160cf5556..bef77074393f59351df7d3bdb3388e751eb228a2 100644 (file)
@@ -96,7 +96,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -106,7 +106,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_c
     dvda             = fr->dvda;
     gbtabscale       = fr->gbtab->scale;
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = (1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
+    gbinvepsdiff     = (1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
 
     outeriter        = 0;
     inneriter        = 0;
@@ -332,7 +332,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -342,7 +342,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_c
     dvda             = fr->dvda;
     gbtabscale       = fr->gbtab->scale;
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = (1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
+    gbinvepsdiff     = (1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
 
     outeriter        = 0;
     inneriter        = 0;
index b0577208196917a668ef6066c7e2d7c3cacadeae..b8037245085d0057156d2b6cbf919e70ac913118 100644 (file)
@@ -92,14 +92,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = fr->gbtab->scale;
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = (1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
+    gbinvepsdiff     = (1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
 
     outeriter        = 0;
     inneriter        = 0;
@@ -304,14 +304,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = fr->gbtab->scale;
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = (1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
+    gbinvepsdiff     = (1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
 
     outeriter        = 0;
     inneriter        = 0;
index 65209a4d5c6d6e71d834fd93e0ddd43f8e28f8b9..54eca87b9bbc2c8e6bc1a67ce942ca5d63b2c2d7 100644 (file)
@@ -92,11 +92,11 @@ nb_kernel_ElecNone_VdwBhamSh_GeomP1P1_VF_c
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff          = fr->rvdw;
+    rcutoff          = fr->ic->rvdw;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -281,11 +281,11 @@ nb_kernel_ElecNone_VdwBhamSh_GeomP1P1_F_c
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff          = fr->rvdw;
+    rcutoff          = fr->ic->rvdw;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 486a84cf688157ad54e3e9287efb2f20ccb5e4f1..ac62f3f83965657e9e39b022c905f6eee0580265 100644 (file)
@@ -93,10 +93,10 @@ nb_kernel_ElecNone_VdwBhamSw_GeomP1P1_VF_c
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff          = fr->rvdw;
+    rcutoff          = fr->ic->rvdw;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -302,10 +302,10 @@ nb_kernel_ElecNone_VdwBhamSw_GeomP1P1_F_c
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff          = fr->rvdw;
+    rcutoff          = fr->ic->rvdw;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index ca28ffa73587f8e1a545a308b13a8569ebb06f07..16ca9748c643edd8343ba6e1ea50d6ed4e05a497 100644 (file)
@@ -95,16 +95,16 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_VF_c
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
 
-    rcutoff          = fr->rvdw;
+    rcutoff          = fr->ic->rvdw;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -293,16 +293,16 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_F_c
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
 
-    rcutoff          = fr->rvdw;
+    rcutoff          = fr->ic->rvdw;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 9e22898187d2495ecb4f6a165f05b510bb900e71..7de8bc01c6cc89387984827a8ea776e5ecad415c 100644 (file)
@@ -95,7 +95,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_VF_c
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
@@ -282,7 +282,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_F_c
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
index d1e119e235b20e4488879ea93da0f7e95d5094f4..ea4b7aa9d822a55267e0f7056ffb06d9e47591ab 100644 (file)
@@ -92,11 +92,11 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_VF_c
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff          = fr->rvdw;
+    rcutoff          = fr->ic->rvdw;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -276,11 +276,11 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_F_c
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff          = fr->rvdw;
+    rcutoff          = fr->ic->rvdw;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 8e3b2f00c8eb2544f1408109490b82c91590ed42..67b5db7faedbd21573799e66a53556bb28e5cf79 100644 (file)
@@ -93,10 +93,10 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_VF_c
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff          = fr->rvdw;
+    rcutoff          = fr->ic->rvdw;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -301,10 +301,10 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_F_c
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff          = fr->rvdw;
+    rcutoff          = fr->ic->rvdw;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index e5ccc1f81600f27f0fa35cf83ce6661719becad8..8d0fbfcca77e27b9baf21f345487f9b504982e8d 100644 (file)
@@ -90,7 +90,7 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -100,11 +100,11 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomP1P1_VF_c
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -297,7 +297,7 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -307,11 +307,11 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomP1P1_F_c
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 8cc3adce2141e2a74de87e1203d88f19406f8644..31aa4c8e344e2f8a00ef6b84a98b3587c3b5fc27 100644 (file)
@@ -96,7 +96,7 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -113,11 +113,11 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomW3P1_VF_c
     vdwioffset0      = 3*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -414,7 +414,7 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -431,11 +431,11 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomW3P1_F_c
     vdwioffset0      = 3*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 43b60a6a07bbc6cf43149764654ff0d003e74dc0..04537b2d319ac6af8421fd66a5eedfcc25ba28aa 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -140,11 +140,11 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomW3W3_VF_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -666,7 +666,7 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -700,11 +700,11 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomW3W3_F_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 5c3cf6bf9c8db2bf0632f19841bf2b934815c80e..a0a1ed55eb19e228b2a45689aae2ca923995da28 100644 (file)
@@ -99,7 +99,7 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -116,11 +116,11 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomW4P1_VF_c
     vdwioffset0      = 3*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -465,7 +465,7 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -482,11 +482,11 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomW4P1_F_c
     vdwioffset0      = 3*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 95086b6534f4d6e44ddd7d42efbfc93324e4d25c..23d4f63e809942ec371c1d9fa0dd6d0450b4ce20 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -145,11 +145,11 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomW4W4_VF_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -723,7 +723,7 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -757,11 +757,11 @@ nb_kernel_ElecRFCut_VdwBhamSh_GeomW4W4_F_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index e930efbac3d02e8699ad538b8dd6e34ecce38692..bb9afb242f00da15c8bb51a28e4ceea6777bd1b9 100644 (file)
@@ -91,7 +91,7 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -101,10 +101,10 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomP1P1_VF_c
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -318,7 +318,7 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -328,10 +328,10 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomP1P1_F_c
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index 0f8c3503fe3eccec2a081d274e2bc1ec31639c5a..575bd5e3214c4e5c24cedd679ff3703ddc55fd50 100644 (file)
@@ -97,7 +97,7 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -114,10 +114,10 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomW3P1_VF_c
     vdwioffset0      = 3*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -435,7 +435,7 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -452,10 +452,10 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomW3P1_F_c
     vdwioffset0      = 3*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index 2db8d3340c7abd1d6f04e0f2bbb80f9748577376..ebfae1164406d9978edaf6e7f9bef9ee508a586c 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -141,10 +141,10 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomW3W3_VF_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -687,7 +687,7 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -721,10 +721,10 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomW3W3_F_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index 276c50a7ea17655244af4ddccb1bd76da83bd075..9c188162bc5ffde1c6765ae6eb2731b73d49f080 100644 (file)
@@ -100,7 +100,7 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -117,10 +117,10 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomW4P1_VF_c
     vdwioffset0      = 3*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -486,7 +486,7 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -503,10 +503,10 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomW4P1_F_c
     vdwioffset0      = 3*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index e69f252f965a9a651d87477c52ccde93f11e889a..cd45b6ec004e45118ae6448aa54c38c52654c90f 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -146,10 +146,10 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomW4W4_VF_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -744,7 +744,7 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -778,10 +778,10 @@ nb_kernel_ElecRFCut_VdwBhamSw_GeomW4W4_F_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index 16cc6f32f9ce3ea91652f90002ad2e86e90279a9..52c596bf900228afb54ec6af4733becdb262c929 100644 (file)
@@ -93,7 +93,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -106,7 +106,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_c
     vftabscale       = kernel_data->table_vdw->scale;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
@@ -325,7 +325,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -338,7 +338,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_c
     vftabscale       = kernel_data->table_vdw->scale;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
index a85b1780f0952e8f075e3c7d2884b0ff0bc16954..d490bdd4f22f0f45a57b297d83656718c18b97be 100644 (file)
@@ -99,7 +99,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -119,7 +119,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
@@ -442,7 +442,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -462,7 +462,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
index fd95cc7754ea317923ba207badec1a2f1e5d47c8..e9f214f614e63e16badfaf929519f884b458f4ed 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -145,7 +145,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
@@ -694,7 +694,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -730,7 +730,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
index 47a1de5fb62bdddf54dd9a8c4c124032be4e97c8..41facfe684b732193430fd1b0e8e085ef9677ae9 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -122,7 +122,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
@@ -487,7 +487,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -507,7 +507,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
index 505eef54ead22e4b5eec53ba71f0ae8def013860..d9be262b00d513dc27871fb2fadc05bb47c9c43c 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -150,7 +150,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
@@ -750,7 +750,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -786,7 +786,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
index 12bce6f3c760a1bb26043024570254c0b8789e92..9a7dc84c2e4e611f519de1280e2c3209254365ad 100644 (file)
@@ -90,7 +90,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -100,11 +100,11 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_c
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -294,7 +294,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -304,11 +304,11 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_c
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index f8c5498fe2d8795dd40a4c79b544cf5608e42850..9125cb5bc40341d20d9066cc9afe316433db4124 100644 (file)
@@ -96,7 +96,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -113,11 +113,11 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -411,7 +411,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -428,11 +428,11 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index dc60b3c5833fb1a65db5bdb6693d20c6acf7a304..8e406b6168b6d460db2712b66c839171c7145f0e 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -139,11 +139,11 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -663,7 +663,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -696,11 +696,11 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 01354804a0f17dd7d31509c283cf59bc091ae35b..9724678cf3f8f839654525f0ae7208892130504d 100644 (file)
@@ -99,7 +99,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -116,11 +116,11 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -461,7 +461,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -478,11 +478,11 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 90c7bf1d2f4a0a84203abe2cede2568d8889a698..6aec32bdac1b243c57dc24e27c7f851923d9c852 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -144,11 +144,11 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
@@ -719,7 +719,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -752,11 +752,11 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
 
     outeriter        = 0;
     inneriter        = 0;
index 9165896f09f455149638fa50efedfe72dac1f38d..0611b15864e11a2715dda355f95ad6f6b5792609 100644 (file)
@@ -91,7 +91,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -101,10 +101,10 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_c
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -317,7 +317,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -327,10 +327,10 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_c
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index 8465ce770a77fddce4e6785271432d493c32193d..1589da66e318b5b04b55bc5fe27faacb1268555a 100644 (file)
@@ -97,7 +97,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -114,10 +114,10 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -434,7 +434,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -451,10 +451,10 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index 223f638aa9bf0feeb6e6db40759c4132e27389ec..6b502e9a4fbcda82a06c589bb19a8c0f202c5844 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -140,10 +140,10 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -686,7 +686,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -719,10 +719,10 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index f3d7a1681671feadaf4451e5792bf59e3462ff26..aaf0faf13b0d5fb16ee842070765a5cd7c6eeb2a 100644 (file)
@@ -100,7 +100,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -117,10 +117,10 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -485,7 +485,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -502,10 +502,10 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_c
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index bad5f932e5ef1f49343b72eec0e8ac7de085a791..bfdd9fbf2506b825eb602f2eca6a0860e8f77fa1 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -145,10 +145,10 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
@@ -743,7 +743,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -776,10 +776,10 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
     swV3             = -10.0/(d*d*d);
index 3af4a11a7f47670dafafe81ed68d07fbb37fe5be..1bbdadd0f7993674363db822e5ee5affb727e216 100644 (file)
@@ -86,14 +86,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
     crf              = fr->ic->c_rf;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
@@ -265,14 +265,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
     crf              = fr->ic->c_rf;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
index deb7fc1996aedfc1382c321e7496a75a8ae1aad5..262b7545d332240e7607d5706f89ff1ec0a770d2 100644 (file)
@@ -92,7 +92,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -105,7 +105,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_c
     iq2              = facel*charge[inr+2];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
@@ -382,7 +382,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -395,7 +395,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_c
     iq2              = facel*charge[inr+2];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
index 629d69517255a478e9d13cf48b2af544e296d131..263a7f34f3f1ea406c63b5c2386ca37827a95f59 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -128,7 +128,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
@@ -634,7 +634,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -660,7 +660,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_c
     qq22             = iq2*jq2;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
index 43903f1f4957f6273b61e315a7295985df0194a6..b3419a577a1c2390f0a33aae18dc33b12085aa58 100644 (file)
@@ -92,7 +92,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -105,7 +105,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_c
     iq3              = facel*charge[inr+3];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
@@ -382,7 +382,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -395,7 +395,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_c
     iq3              = facel*charge[inr+3];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
index cb7b10409635e984bf92d77f282b4797cd917729..f53ac69557b20099fb402d56a243b7c702cb42cb 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -128,7 +128,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
@@ -634,7 +634,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -660,7 +660,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_c
     qq33             = iq3*jq3;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     rcutoff2         = rcutoff*rcutoff;
 
     outeriter        = 0;
index a2b38d8b7a3781c0f897ea1b400df6ead4cc57fd..ca26501a13578d626017e8e0f9d49c6264fbe629 100644 (file)
@@ -90,7 +90,7 @@ nb_kernel_ElecRF_VdwBham_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -285,7 +285,7 @@ nb_kernel_ElecRF_VdwBham_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index 9082c3702ae50b363fed5ac0b7f9ea0de2787792..097177bf43f2dbe28920ab0ffaa28a83f6d859de 100644 (file)
@@ -96,7 +96,7 @@ nb_kernel_ElecRF_VdwBham_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -392,7 +392,7 @@ nb_kernel_ElecRF_VdwBham_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index cd38791b6e6b2a637aca91bc5826fbbd34f08faf..39ebb7678731f3b0d92b33763269f3ecf93ad444 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecRF_VdwBham_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -614,7 +614,7 @@ nb_kernel_ElecRF_VdwBham_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index e005883e268de1995bc770d715adf604c05ee9f3..a7a69bc87167f9a5195a73bacfc9c6d66b3618e6 100644 (file)
@@ -99,7 +99,7 @@ nb_kernel_ElecRF_VdwBham_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -438,7 +438,7 @@ nb_kernel_ElecRF_VdwBham_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index d300af7a9deff90d6b64d42860364bbf5f47b032..3b7639234ea715803369de34f3fe1a0c159e6cc1 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecRF_VdwBham_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -666,7 +666,7 @@ nb_kernel_ElecRF_VdwBham_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index a089882588a191be56745385406b56e6cdb170e3..6c73b764a23c19502a8c11dd8b5929af7be61001 100644 (file)
@@ -93,7 +93,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -316,7 +316,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index 037341d580942092aaa661fa471c9a3c91fe9b3c..4f765bcf0b686f0d9dada7551113d1c9554f6a61 100644 (file)
@@ -99,7 +99,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -423,7 +423,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index fa278111d0ceabe9058580c177965c100640ef1d..6574dcc813f78bf3a8f3cbc79183b8f501841971 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -645,7 +645,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index 30aa9977c0919e152409d2eda25494e6a772947c..f4bcf35c7e4c9b91aa0f9a5184723d44a7cd468d 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -468,7 +468,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index 7d1f53fc57d34f7b4f146c09432191208fefbaf2..55852a118bd54057b97d68b4cee74013829aeb20 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -696,7 +696,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index 77bde448b95e63cf0405644609c8cb9d24f600fa..e2a709afe90d6e8194de2dca02325a3d8b7aa8b5 100644 (file)
@@ -90,7 +90,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -282,7 +282,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index 186e4f040ab540bfe0f551d587026f0be10b13e0..f62725d7d8712924511d2535e815b01d0dfdbb3e 100644 (file)
@@ -96,7 +96,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -389,7 +389,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index f6d23d0d5020f2eae7d0b002d90f97e41fa90539..c55bd70d64bb7968de7e136f712d88f4b593d896 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -611,7 +611,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index af559cfe1d5ee4433a00b5ed056b981ecc9f652d..677f5271daeedcc543fc8869bdc85f7bfdca0278 100644 (file)
@@ -99,7 +99,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -434,7 +434,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index 6f527d222882e672cde5cf2c1257e5972dff7317..cab0a587a204b1001d51abd595cf8b8de411e853 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -662,7 +662,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index ee97049cbf818fc3ffce1ab899aef13dc7f22325..a26d63d65e990d19a66d9bad8701a9b8b2fd5309 100644 (file)
@@ -86,7 +86,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -256,7 +256,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index 933b4fa75ca4f51fa46f7e4a19beb3b8e490c2fc..3e79d47408df126b7dfc08ab6a4e4f5630c4df71 100644 (file)
@@ -92,7 +92,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -363,7 +363,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index d8494fbcacfbf004a6a6b9c13185e277c8862548..b238f9a134613a322b997f190c1bf0f930653832 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -585,7 +585,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index e0407a0aeb21d77b404e8e67ef0ce1c3d2e9d420..64ddcef99ebca69dcab2e2380ebb2dc70ff9474b 100644 (file)
@@ -92,7 +92,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -363,7 +363,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index 563121e88840e87060fea45cfc716e42411916db..835ecd591dc8bc3133664cc18ff7933c7fe9177e 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_VF_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
@@ -585,7 +585,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_F_c
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     krf              = fr->ic->k_rf;
     krf2             = krf*2.0;
index 9e1e281dcdf239888860c77792cd0322b99339a4..71ea2135a8d97b9b8fe826f49795b41d1b893b0e 100644 (file)
@@ -276,7 +276,7 @@ nb_kernel_allvsall(t_nblist gmx_unused *     nlist,
     f                   = ff[0];
     charge              = mdatoms->chargeA;
     type                = mdatoms->typeA;
-    facel               = fr->epsfac;
+    facel               = fr->ic->epsfac;
     natoms              = mdatoms->nr;
     ni0                 = 0;
     ni1                 = mdatoms->homenr;
index ceda39c8b53d1150b07389aa4e13eaa7e95f898d..c1a27143dd4f150bedf96872161900d27d1fb4ac 100644 (file)
@@ -286,8 +286,8 @@ nb_kernel_allvsallgb(t_nblist gmx_unused *     nlist,
     f                   = ff[0];
     charge              = mdatoms->chargeA;
     type                = mdatoms->typeA;
-    gbfactor            = ((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
-    facel               = fr->epsfac;
+    gbfactor            = ((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    facel               = fr->ic->epsfac;
     GBtab               = fr->gbtab->data;
     gbtabscale          = fr->gbtab->scale;
     invsqrta            = fr->invsqrta;
index 9c6b4c14f9f12e267cbf249063535733119d33e0..11c173e2a97eab0f24aafb5f53ac566d9bf3fa71 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014.2015, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014.2015,2017, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
index bf9b8385e732e114fc5a6625a48b5be8be2b7a18..20cf4af2efccda1cca085fbcbc26e2f535b62b77 100644 (file)
@@ -187,7 +187,7 @@ void
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
     /* #if KERNEL_ELEC != 'None' */
-    facel            = fr->epsfac;
+    facel            = fr->ic->epsfac;
     charge           = mdatoms->chargeA;
     /*     #if 'ReactionField' in KERNEL_ELEC */
     krf              = fr->ic->k_rf;
@@ -202,7 +202,7 @@ void
     /* #endif */
     /* #if 'LJEwald' in KERNEL_VDW */
     vdwgridparam     = fr->ljpme_c6grid;
-    ewclj            = fr->ewaldcoeff_lj;
+    ewclj            = fr->ic->ewaldcoeff_lj;
     sh_lj_ewald             = fr->ic->sh_lj_ewald;
     ewclj2           = ewclj*ewclj;
     ewclj6           = ewclj2*ewclj2*ewclj2;
@@ -237,7 +237,7 @@ void
     dvda             = fr->dvda;
     gbtabscale       = fr->gbtab->scale;
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = (1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
+    gbinvepsdiff     = (1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent);
     /* #endif */
 
     /* #if 'Water' in GEOMETRY_I */
@@ -282,23 +282,23 @@ void
     /* #if KERNEL_MOD_ELEC!='None' or KERNEL_MOD_VDW!='None' */
     /*     #if KERNEL_ELEC!='None' */
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff          = fr->rcoulomb;
+    rcutoff          = fr->ic->rcoulomb;
     /*     #else */
-    rcutoff          = fr->rvdw;
+    rcutoff          = fr->ic->rvdw;
     /*     #endif */
     rcutoff2         = rcutoff*rcutoff;
     /* #endif */
 
     /* #if KERNEL_MOD_VDW=='PotentialShift' */
     sh_vdw_invrcut6  = fr->ic->sh_invrc6;
-    rvdw             = fr->rvdw;
+    rvdw             = fr->ic->rvdw;
     /* #endif */
 
     /* #if 'PotentialSwitch' in [KERNEL_MOD_ELEC,KERNEL_MOD_VDW] */
     /*     #if KERNEL_MOD_ELEC=='PotentialSwitch'  */
-    rswitch          = fr->rcoulomb_switch;
+    rswitch          = fr->ic->rcoulomb_switch;
     /*     #else */
-    rswitch          = fr->rvdw_switch;
+    rswitch          = fr->ic->rvdw_switch;
     /*     #endif */
     /* Setup switch parameters */
     d                = rcutoff-rswitch;
index 63faa4d9d247cf3411eaf54ae1fe1585cf362993..b52b35b6ce8e4afe32c8c24ad26ab2a7d738d2ca 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -456,7 +456,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index d65432f68a1e3f3e9166a77ef050c88d2770bfc7..c1d617c537b66ac885c9ad659bbef80a0f269fc8 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -704,7 +704,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index fa9888787b9b4317cc8b96c454cd32312e7a070c..ec83cd57b7cc14e9da85fc55a87e1f03104ebe7b 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1315,7 +1315,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index a7cb40dfda8712a7a9974e965db08f32a462e37b..2fba5896e54676b5f3061ec166741f6eeb77bd5a 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -787,7 +787,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 6156b28a08d55226d037eded776d8b53b1c7d63c..dbb13dc90ad9722a74e0d7681d511bcaa636877d 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1406,7 +1406,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index aedb7b4611a4f149fc97aae03cad7fed0e6b8aa3..889ca9f9d0ba28b333e887ec81742ab434985ec6 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -416,7 +416,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 89d4c809a2badb1d73f570b0a6956e367f78e80f..a9db0b6c88a6701f47dd01e45ce4442fff185838 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -664,7 +664,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 0776562faf3e65739ad728bf05b42de853d2bf22..8720b902c7a05f1c18aad40fadb1674a39406c4b 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1275,7 +1275,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index d224c4b501971036b100e6484c64e21e91f24218..d1d55b924b072021ee242cc4e67c9baa8b0fa3c7 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -721,7 +721,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 467004aa662f276925c00be67022fcb41cbe53fe..fb22560c1d60a7534f7e85524997a5d35baf102d 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1340,7 +1340,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 693af7c59e1c481b45940920e4c72426f3e7f594..7add86a4e2ff9b510384ac7946ceddd3c300ee1f 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -368,7 +368,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 12c63c8cbed5364d0472974b0e258cbd1415ae77..078954bb46465f6de81a00e426dd2bdbaa39d513 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -616,7 +616,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 2d7a457ebb6af04fd0750434bf151c9d6032aa2d..3b5596f8b214e19f980f9dbdf37af738ede6a5b5 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1231,7 +1231,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 8a9a81af266a41ee421d64056f88c02d1a97c26b..9850d04ee0021bae3ac1094cd3c1b403f4b24f18 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -616,7 +616,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index d1c8198021b184d9007dd5d866852eaa2292fa2d..018e0ba8f3b6739c860f04fbf7d825010bbfd909 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1231,7 +1231,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index ee4b67591b119f5c6f5446e021d3ed5434069699..55eac0a23ae70e5654729c4c432b8a3fcd206712 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -438,7 +438,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 8453b395a30e1166a6e690f99559d5cb4fff40bd..e126f839e790293f189370a46b7f9f1ca036750a 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -606,7 +606,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 4dae3d8cbda77375efba5c2b5bae0f8f5333bc69..2f4930677257881d57a82af348fa1b1ac4af50e1 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -977,7 +977,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 72e17014e34a172c8565aaa462a4e878a92f3947..a39cd5769bd8380e47cc58bd8abc010774397fce 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -665,7 +665,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 303997e0256548b11b2e4f70ca0bb08a921afb29..4c4558fadf14cd9a4d0b6cddc3d89e790e597e87 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1044,7 +1044,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 009307a7a3d157f5c66dc879454c543650402601..f6df8e7c98d2184fada6ac88fba3cb4e74c7b2fe 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -367,7 +367,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 706c7fbb7ad804d024ff36c3235172a1eff442a5..d90c45d8ddad3a28f36183dc942dae4be6d95aca 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -535,7 +535,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index cf61dd656443ff3ccdb9a13a583483a438b93847..93719835e4c9e802c6d40e5ac1c595296f7c143b 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -906,7 +906,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 21241aeed5268893dfb7b0d0c8294fb83c95f5ef..a82b6079733ca8299eaa592d8132f511afb64702 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -594,7 +594,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 2d813ccba06a4a17c6561e3b1eb105c4a9d0598f..ce099f37c442844a2efa133f366826cea8a859a7 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -973,7 +973,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 0c1a120239ac6c6da86b4c47e1e783e1bd7e33c5..7c7e386c3ab20336fc7b56e8bd67c21165353070 100644 (file)
@@ -100,7 +100,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
@@ -323,7 +323,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
index b9420453a003bc0c92b8b2f875e164bc380f7d8d..eaf3d011435785f4e41e65c4e4af1d8824bb39a4 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -491,7 +491,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 5947a28bb994080041ee2dfc2a7f7e4b2ae2a221..ff1d4b74cb433ea1c940087b21f9dd3d36d443c3 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -866,7 +866,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 2a2a1ef423fa719248636921bead697a3aa9ae5d..75661a61b1e916b6b8e6d3639b88ffe2338e42db 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -491,7 +491,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 6c2b211b2351ed9a436fdc46848f719cbdf76d68..017aeb89a1767db8ecd97efb287258c38f15670f 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -866,7 +866,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 6210ef21e9766b751e9ef57f17419c0e7de16074..1d3400e9a66642e62f5ec51c2400b0eb54a7b9b5 100644 (file)
@@ -113,14 +113,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -129,12 +129,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_sparc64_hpc_ace_double
     ewtabhalfspace   = gmx_fjsp_set1_v2r8(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -474,14 +474,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -490,12 +490,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_sparc64_hpc_ace_double
     ewtabhalfspace   = gmx_fjsp_set1_v2r8(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 6e4773b4c4688a941b82515c568473a56e9f27af..f8ac73b8aa8ba0db0aea1a54b0eab97075162a4e 100644 (file)
@@ -121,14 +121,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -144,12 +144,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -754,14 +754,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -777,12 +777,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 4b08eb1bf5fd548f60c16a013ff6232ae666de8a..15c55f0c3bbc15380d214659dedb4a6b584d0a92 100644 (file)
@@ -137,14 +137,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -177,12 +177,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1456,14 +1456,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -1496,12 +1496,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index cf1c9080dba39bf27de608e93d98795e4cf5c8a8..760f7aef1db887177bbe4a742e805cae2d2a2d0c 100644 (file)
@@ -125,14 +125,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -148,12 +148,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -839,14 +839,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -862,12 +862,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 6abdb83bc349013a65b23db560baa7b06ea5b774..79611bb8332fddc022b0e29a76684ca19ad79af0 100644 (file)
@@ -143,14 +143,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -183,12 +183,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1549,14 +1549,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -1589,12 +1589,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index ecc1a5f50010b8029ad99d89d06b431de86c5a5c..79d60b395f5c779163c9341da19c00b9eae64ce1 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -120,12 +120,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_sparc64_hpc_ace_double
     ewtabhalfspace   = gmx_fjsp_set1_v2r8(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -442,7 +442,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -454,12 +454,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_sparc64_hpc_ace_double
     ewtabhalfspace   = gmx_fjsp_set1_v2r8(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index c76adaa7bb6985bc88dd73d88dbc2a3d8abca87c..e7678df26ab4cbd3d6a535505876e3092eab43c6 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -133,12 +133,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -718,7 +718,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -737,12 +737,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index b5e615d805a6f07a42fe29e45272c22bf56fe4d9..54dfff343d23b389e83fcc8c63c3ec5d2c150a4d 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -159,12 +159,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1413,7 +1413,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1448,12 +1448,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index c8c1c24022f3a791f94d9adaddc80d6c57cbfd8a..d15e8bf8cc2a6b8ed2e0737dd2cff7d23c5530d9 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -136,12 +136,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -795,7 +795,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -814,12 +814,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 5f271a4c7944c1e87d9098c4ece69c572163c28e..25fecbc51e3ddd9cb7ff360534b3df172eb89214 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -164,12 +164,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1498,7 +1498,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1533,12 +1533,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 40b243e2f1785ca63c27c39788c8c91590fe955f..b98295f62ff78f5bee3e7b777eb1b3ba3f07e802 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -111,7 +111,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_sparc64_hpc_ace_double
     ewtabhalfspace   = gmx_fjsp_set1_v2r8(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
@@ -391,7 +391,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -400,7 +400,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_sparc64_hpc_ace_double
     ewtabhalfspace   = gmx_fjsp_set1_v2r8(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
index a4f85bd533a46ff71654b9c98e1f50417682b4a2..ba24bbe9bd5eaa45dc2c6245deef98f7d41da3d1 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -123,7 +123,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_sparc64_hpc_ace_double
     iq2              = _fjsp_mul_v2r8(facel,gmx_fjsp_set1_v2r8(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
@@ -667,7 +667,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -682,7 +682,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_sparc64_hpc_ace_double
     iq2              = _fjsp_mul_v2r8(facel,gmx_fjsp_set1_v2r8(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
index c160d5c1d0b809734c81c95b7c91490a17de5d07..df8cf42943eeeebc08abb0ca8a7d1b079d9d7f4e 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -146,7 +146,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
@@ -1366,7 +1366,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -1394,7 +1394,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
index 2fc5a89c2f479c4dd2a8fc3563bf3b0abdd46210..1c80e42467c0e97f8e21726b91629cb4d01cffe8 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -123,7 +123,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_sparc64_hpc_ace_double
     iq3              = _fjsp_mul_v2r8(facel,gmx_fjsp_set1_v2r8(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
@@ -667,7 +667,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -682,7 +682,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_sparc64_hpc_ace_double
     iq3              = _fjsp_mul_v2r8(facel,gmx_fjsp_set1_v2r8(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
index 2fe2faeac02de002491e88595e3054333bac0900..8fb2c805519ea82837eb53d91c9e65846be37460 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -146,7 +146,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
@@ -1366,7 +1366,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -1394,7 +1394,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
index 2cec3cfa4d0154a600a1b769a4279a40f0c78591..86d03d72d6c2f73e352357510a0cf46ac7a0e5db 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -122,11 +122,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_sparc64_hpc_ace_double
     ewtabhalfspace   = gmx_fjsp_set1_v2r8(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -479,7 +479,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -491,11 +491,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_sparc64_hpc_ace_double
     ewtabhalfspace   = gmx_fjsp_set1_v2r8(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 26c590032f58c3dc2bb6fe0e3e5ba7240ad3cfe1..bd495cf5e56bb7fb3587fed6ae2be7e61e6570e2 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -135,11 +135,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -799,7 +799,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -818,11 +818,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index e89a5908d5fab190bf30217feb931692b5b43b4f..f75a9a80a9bbaf367c151f6e9d4ac38cee997c02 100644 (file)
@@ -126,7 +126,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -161,11 +161,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1626,7 +1626,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1661,11 +1661,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index d4c65e130bbcb41a3141bb5636a8f5f9b072a89d..5028f3ceb177a4353ab5a2e4b65605af3126999d 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -138,11 +138,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -900,7 +900,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -919,11 +919,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 7070440f80d741807eaf52587d18eae374fc24b2..aa8d7f870e060d636fc8d9d265a03c05c9e530d4 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -166,11 +166,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1735,7 +1735,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1770,11 +1770,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 52d6dddd5a467b4492bf835bc2d9a39f808524e1..752c76b6f889a48824b39b9dd1329a5719c89768 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -113,11 +113,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_sparc64_hpc_ace_double
     ewtabhalfspace   = gmx_fjsp_set1_v2r8(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -429,7 +429,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -438,11 +438,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_sparc64_hpc_ace_double
     ewtabhalfspace   = gmx_fjsp_set1_v2r8(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 0e02aec6d02f64468994e90c8cb4f161669f6f6d..36e9492ae730b37d0f9419706edf7e77bced37a6 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -125,11 +125,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_sparc64_hpc_ace_double
     iq2              = _fjsp_mul_v2r8(facel,gmx_fjsp_set1_v2r8(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -749,7 +749,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -764,11 +764,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_sparc64_hpc_ace_double
     iq2              = _fjsp_mul_v2r8(facel,gmx_fjsp_set1_v2r8(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 5168a2ec40296c9ab7867aea4134d71277398b33..e9fef630941fdeee0ed3f3fd2f430170b7e16741 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -148,11 +148,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1580,7 +1580,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -1608,11 +1608,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index da2f166128b3e25a95e5128265d93c94513049b0..0eddd4373b74a1e68a950403bc7ba146ab035bf2 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -125,11 +125,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_sparc64_hpc_ace_double
     iq3              = _fjsp_mul_v2r8(facel,gmx_fjsp_set1_v2r8(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -749,7 +749,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -764,11 +764,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_sparc64_hpc_ace_double
     iq3              = _fjsp_mul_v2r8(facel,gmx_fjsp_set1_v2r8(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 5e947d0aa63b4b17effc2ac1b1b7ffbd24fb6690..5c4c74525f33f3202cdcfb37c63b1d782e2c8b80 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -148,11 +148,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1580,7 +1580,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -1608,11 +1608,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 76fda495f14a07d966d0b80afcb7d05728ae81c8..a77d3d6b4092bcc1dcc24e187a0499e6591b78b8 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -477,7 +477,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 0b64b2cc02d1dcfd9bf00681174f5d0426c57a46..3e577613af8e8e3824d6b11cebdf39b88f244950 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -713,7 +713,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 05b3fdb3c7225bc219ca0f3538d499aedd174fd4..6ee190c67b0bfc9fabf0fd67665ee9cea7467cc8 100644 (file)
@@ -126,7 +126,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1288,7 +1288,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 900200627402e000dcaccc4140d1c879c60a454e..42d5e7a9417a3bad633a83a5fe1440616be7f7de 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -776,7 +776,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 63b27da8d082910503dee23a15f17a1800c31aa9..c9817bf6da9a3fd6e37e46f8cfe9a27de9174e74 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1359,7 +1359,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 0758ed845f73615624f46d14ede3f7df64594b09..a3be69c1604e0bd8cc1ce56715e80f741608493f 100644 (file)
@@ -113,14 +113,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -442,14 +442,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
index 6b35c0bd2662aac3792dc84a2eb6123b75dbe2a2..d3e71875d2255c323b1f04a011ff296bd63ef04d 100644 (file)
@@ -121,14 +121,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -682,14 +682,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
index 34ebe42db8b39d332e04cc5df3ed8e6b7586f4b8..f76dd72a85ba588becfa91fd3e6e9e90aee23ed3 100644 (file)
@@ -137,14 +137,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -1264,14 +1264,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
index 7cfa02b0dfbceb3f062e00ff10827e56b54c05c5..0df3ae864dea4b83e98ac6b28407d727aee88e7f 100644 (file)
@@ -125,14 +125,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -749,14 +749,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
index 2da6403fa0daebb049d614f3eb21c97173562857..f587be294418945c94d159632f2f6eb95c861d23 100644 (file)
@@ -143,14 +143,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -1339,14 +1339,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
index 7de71a80abd39e57d7f651c0213617dc01e101ca..d928ee49f1f0d40d3a19e7ccc3a77ac8b2e08ef9 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -410,7 +410,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index ba1ce3fe88f5f91fd6833a1550007a63e9a9e268..be3ce2fe22dd9a7516b8bdc9885b517106efb009 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -646,7 +646,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 521823ae64272e705c0921e76772c4ef808dd10c..e4a34148697a9723f3f74bdd23bec31bb289b623 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1221,7 +1221,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 70145de6581198fce3c83411031db41a5b92b4cd..fa98db99ba12d51e66b9a6376e4db26a28f9e2d5 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -705,7 +705,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index e31b5cdd6f7d9811489a0eeff0bf8db1b8eb241f..4ebbf7afa0027c6bf066d7f17465f0c661621449 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1288,7 +1288,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 7de7e84415630c3115f23f630c1f2695f8c979a3..f5d4d07714a9763b8ec38262e17f60cf4efded0f 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -366,7 +366,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
index 09da860ee98cbbd30dbeb73a001ab1d717e7ece5..dc36dff7e6332d1edcb491e5c279ad7d218e968c 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -602,7 +602,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
index 24da62fe7753cebed204760c861d3cab7539d031..8db689f1398fa6e20752cdca6c2cc048b2acec59 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -1181,7 +1181,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
index c8a9eb1a35bd36bd389a93f08ee533066db31fab..ef40cf94594ab441dd4536f447709a6af817099e 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -602,7 +602,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
index 3928c819ff7ced5184db1b0addffb89e60e55acb..2f5d9c964df9609d68b9ea225bcba754b4b0d812 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
@@ -1181,7 +1181,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = gmx_fjsp_set1_v2r8(fr->ic->sh_ewald);
index af66e91dd4dfa4a3f64e711ebb21fc3c4ad3498e..4b3e5b68f08c5b0289bae2788c2de224a473cff9 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -124,7 +124,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_sparc64_hpc_ace_double
     dvda             = fr->dvda;
     gbtabscale       = gmx_fjsp_set1_v2r8(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = gmx_fjsp_set1_v2r8((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = gmx_fjsp_set1_v2r8((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -513,7 +513,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -526,7 +526,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_sparc64_hpc_ace_double
     dvda             = fr->dvda;
     gbtabscale       = gmx_fjsp_set1_v2r8(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = gmx_fjsp_set1_v2r8((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = gmx_fjsp_set1_v2r8((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 9688988e4d6a92f195e1dc5bd56870b742b12ba6..ccb3de73c105903bdbe8c46e7b985b4339536266 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -121,7 +121,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_sparc64_hpc_ace_double
     dvda             = fr->dvda;
     gbtabscale       = gmx_fjsp_set1_v2r8(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = gmx_fjsp_set1_v2r8((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = gmx_fjsp_set1_v2r8((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -454,7 +454,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -464,7 +464,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_sparc64_hpc_ace_double
     dvda             = fr->dvda;
     gbtabscale       = gmx_fjsp_set1_v2r8(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = gmx_fjsp_set1_v2r8((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = gmx_fjsp_set1_v2r8((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 785a777d2ff0852127a19ad98b82f83b90693329..5d52647624285c96e81590cf329a22795faef1d8 100644 (file)
@@ -105,14 +105,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = gmx_fjsp_set1_v2r8(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = gmx_fjsp_set1_v2r8((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = gmx_fjsp_set1_v2r8((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -406,14 +406,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = gmx_fjsp_set1_v2r8(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = gmx_fjsp_set1_v2r8((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = gmx_fjsp_set1_v2r8((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 4f0a215153be01c5a17f7748f6e0cbf109c54234..9a90f4f52d45009011bed0d6e6f56e82b75e64b8 100644 (file)
@@ -114,15 +114,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_VF_sparc64_hpc_ace_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -413,15 +413,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_F_sparc64_hpc_ace_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 544c6be9e3e9031d176e5677bde742a2ec6d6075..7e28346eaa0059a48bd7248f9abd4f443fa7306b 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_VF_sparc64_hpc_ace_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
@@ -384,7 +384,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_F_sparc64_hpc_ace_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
index f6fa566d1333ea0b0de8afebc3cd830725d781ac..930d98d5817a3b94429b4bf315707e8c30adb69c 100644 (file)
@@ -108,12 +108,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_VF_sparc64_hpc_ace_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -372,12 +372,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_F_sparc64_hpc_ace_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 18b9bcd4743f6e9346833c796a069a5d7936846e..d5b31bbd5c8bcb630bb6490baf81b5d3b5e88221 100644 (file)
@@ -110,11 +110,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_VF_sparc64_hpc_ace_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -413,11 +413,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_F_sparc64_hpc_ace_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 3aa6c27059cf09f08d4c12813ba4de09dbebd45f..371b9163c4e421e6d0d8a1c2a7503db71cfa2fd5 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -121,7 +121,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_sparc64_hpc_ace_double
     vftabscale       = gmx_fjsp_set1_v2r8(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
@@ -468,7 +468,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -481,7 +481,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_sparc64_hpc_ace_double
     vftabscale       = gmx_fjsp_set1_v2r8(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
index b05c3ab7a2b8b976a83e68eba32008835eec3d4b..d2b3b347dfea388a70a9c7a2eb0b126a37708fac 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -134,7 +134,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
@@ -676,7 +676,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -696,7 +696,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
index 61deeee46a0e95982fea2e8e837e4a7632ffcb0d..7d581a2174b6cfa09c4a066a4af74bff445c75db 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -160,7 +160,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
@@ -1167,7 +1167,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -1203,7 +1203,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
index d89556cb0697fc67f448790ecf558e654377ae66..de7da5f62297c24498e2759d580588ac2c897195 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -137,7 +137,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
@@ -733,7 +733,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -753,7 +753,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
index 9e723235409746e1623f78824f64e5b0a8061bfe..b87a4783cc9dfc3b2eb273ccc6fe0373a195b2ea 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -165,7 +165,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
@@ -1232,7 +1232,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -1268,7 +1268,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
index e06274a96b9d6724f77722b51a2826b0bd0d4334..1abfcd0f9f1c9ea2ece9b9d9090cf99b1be4f064 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -116,12 +116,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_sparc64_hpc_ace_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -402,7 +402,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -412,12 +412,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_sparc64_hpc_ace_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index b992d13af4af90b7f81ad05b4137dfc7dfd9c38f..769acd4e72801c7b3235e40fb0e74fb518d2e319 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -129,12 +129,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -610,7 +610,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -627,12 +627,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 4cff3299fbc1f00662b75d7ec36ceb06384cfadf..319da60b9c8997b388603827b21049a2f8307e2d 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -155,12 +155,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1101,7 +1101,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -1134,12 +1134,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index d8f6ed49ca986e466659e8d6102539d48a004096..b940a1eb484330cf6c54b75928d44c82cdc4847d 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -132,12 +132,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -687,7 +687,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -704,12 +704,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 6ba46b780984b056a396ad885c12c8c788369822..468edd7f2563d04cbc5392bb797722ea967c7beb 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -160,12 +160,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1186,7 +1186,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -1219,12 +1219,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 628951487774d2653f5a957a219185881211ac57..ddc29272ea6bb695ff4eb2d9f4a72d43bb674bff 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -118,11 +118,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_sparc64_hpc_ace_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -439,7 +439,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -449,11 +449,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_sparc64_hpc_ace_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index bfe9bb3b912b2c989da71baae7efd246b2f141dd..0a93a145ae02da177df5dd12067d3b521d073b0e 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -131,11 +131,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -647,7 +647,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -664,11 +664,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 984dd08da3fc8ea92403ab92dc6ad0aaf73f9be4..4f849b5016c72170617e5b4d4362c8999928a8d9 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -157,11 +157,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1138,7 +1138,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -1171,11 +1171,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 94e5c48461c247d85a2cf2217788173321a6c474..6afdf18bfac84f6d6571a5231cef7dc31332577c 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -134,11 +134,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -726,7 +726,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -743,11 +743,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_sparc64_hpc_ace_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 4015f43ebe5d5aad9ec0d739e5bdff31267590d4..402f606a78ee4bff8e16468fc7e37f892db43671 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -162,11 +162,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1225,7 +1225,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -1258,11 +1258,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index bb80ece6d5012b23b92e4a346bd530b584e8ff19..6b59a91d27c8895d840aa7e5b16963f9b348c8ee 100644 (file)
@@ -100,14 +100,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
     crf              = gmx_fjsp_set1_v2r8(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
@@ -351,14 +351,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
     crf              = gmx_fjsp_set1_v2r8(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
index d61401fd4fb9f3e432ce861312b683de8ea54ddd..e28d5f63dd3b1499bde7bf0094c957f39d2a0dad 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -119,7 +119,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_sparc64_hpc_ace_double
     iq2              = _fjsp_mul_v2r8(facel,gmx_fjsp_set1_v2r8(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
@@ -559,7 +559,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -572,7 +572,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_sparc64_hpc_ace_double
     iq2              = _fjsp_mul_v2r8(facel,gmx_fjsp_set1_v2r8(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
index dcab03da333612511e2bd4b34766328a24f57035..9a1ab04a06563a6aa49322c31279815d56ddaa9f 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -142,7 +142,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
@@ -1054,7 +1054,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -1080,7 +1080,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_sparc64_hpc_ace_double
     qq22             = _fjsp_mul_v2r8(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
index 11809afdb3f15deed3f3e2da3464534bab2daa88..af4931a6d2ae632418bb20ba4823ef599fe64bf8 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -119,7 +119,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_sparc64_hpc_ace_double
     iq3              = _fjsp_mul_v2r8(facel,gmx_fjsp_set1_v2r8(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
@@ -559,7 +559,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -572,7 +572,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_sparc64_hpc_ace_double
     iq3              = _fjsp_mul_v2r8(facel,gmx_fjsp_set1_v2r8(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
index 89ea6d5989affe70725c46c419c8a1acdb3cd0ee..46537ca74209b390319074e35ebad825d5b24faa 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -142,7 +142,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
@@ -1054,7 +1054,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -1080,7 +1080,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_sparc64_hpc_ace_double
     qq33             = _fjsp_mul_v2r8(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
 
index 4f1404f7ee574143650f6774ea1cffd25a96f8e5..55fb90d4fcd743e9277e7aa6bf2fa5a3a03ef9a2 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -441,7 +441,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
index 9973111ded40f022b8a22a33465bc2778e2676ac..e6aa3104bf217733c9208fae62b13258f7f02f04 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -609,7 +609,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
index 603e7dbd7491d1a7efc4b61e07beaa6c879091b1..26287ba4a7ef907a8063e6a020cfd70ed33e65d0 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -980,7 +980,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
index 148bdb9f30a2010ad215e3dc78bc7d40887cdb12..619253904c5141a6dfc1c9bfc3c14f242f318f1c 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -668,7 +668,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
index 0cb449f8ef203d7ad302edbd1a42166bd47d4fb9..cea35e46817ce832a434a45d3825b5a10545266b 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -1047,7 +1047,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
index f1027a489bc753f3cc203658b6a284dd73785e09..44ccb12ba01a5097a4333c08383bbdb8a6259d76 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -370,7 +370,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
index 20d57176b4c212806eb3325e5c3984d032b3a51a..f439f17fcb5e064e57a88d776536ad6297dfca04 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -538,7 +538,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
index 5369ee287c3bb48c802c4b27c9c30f1838ae998c..0a63aaedf20e07118190b0ffc0906798b7063bf0 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -909,7 +909,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
index 81ce72df6d1f589083d86e1bde1ebd80db84bfb4..af4b2c0bbec26824c13ef7927b9dab5b4cf91cda 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -597,7 +597,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
index d960d9a2cc28a140f423a7efdfbc38725e636699..18b3c7fc0dbaeccfae18064da891c81b4086dbd8 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -976,7 +976,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
index 90e69ebdcc3dcb4a04d96976ed69f54148b8468c..b6038ccde7e27fc6ee49ca7d30e5ac3f3604339d 100644 (file)
@@ -100,7 +100,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -326,7 +326,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
index bf0f6a884c65b58a2e58659d12690bfa33982e92..b0aa1ac656fffbd18008527dae8fac5c24014dd2 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -494,7 +494,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
index 241a216a190e48e72552d7804f5bc8052f83e92d..9de61e8c539a85f5320468df53c340861583946a 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -869,7 +869,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
index ebb564c03413332550adf3232888088ab2698342..ae481cb18dd652fb979b6f1da9f17f2f839f705e 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -494,7 +494,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
index f3ec5659294a1c2d4e52352a09ccfacdd4311a1e..ba4701ff87c29fdb8a82b5a68b7ef5fc12e09094 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_VF_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
@@ -869,7 +869,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_F_sparc64_hpc_ace_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
     krf2             = gmx_fjsp_set1_v2r8(fr->ic->k_rf*2.0);
index fb93c1a0d6df72c66238673bbb2d9546ba8750c5..8b9f035c13b6409f406b37c716f869932af59be3 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2017, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
index 1855e9ed4e987153a196d2b39f2a52ce4b266101..dd9cdf8e8cf05040f45273fb233ac877441e0959 100644 (file)
@@ -180,7 +180,7 @@ void
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
     /* #if KERNEL_ELEC != 'None' */
-    facel            = gmx_fjsp_set1_v2r8(fr->epsfac);
+    facel            = gmx_fjsp_set1_v2r8(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     /*     #if 'ReactionField' in KERNEL_ELEC */
     krf              = gmx_fjsp_set1_v2r8(fr->ic->k_rf);
@@ -196,7 +196,7 @@ void
     /* #if 'LJEwald' in KERNEL_VDW */
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = gmx_fjsp_set1_v2r8(fr->ic->sh_lj_ewald);
-    ewclj            = gmx_fjsp_set1_v2r8(fr->ewaldcoeff_lj);
+    ewclj            = gmx_fjsp_set1_v2r8(fr->ic->ewaldcoeff_lj);
     ewclj2           = _fjsp_mul_v2r8(minus_one,_fjsp_mul_v2r8(ewclj,ewclj));
     /* #endif */
 
@@ -229,7 +229,7 @@ void
     dvda             = fr->dvda;
     gbtabscale       = gmx_fjsp_set1_v2r8(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = gmx_fjsp_set1_v2r8((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = gmx_fjsp_set1_v2r8((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
     /* #endif */
 
     /* #if 'Water' in GEOMETRY_I */
@@ -270,9 +270,9 @@ void
     /* #if KERNEL_MOD_ELEC!='None' or KERNEL_MOD_VDW!='None' */
     /*     #if KERNEL_ELEC!='None' */
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     /*     #else */
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     /*     #endif */
     rcutoff          = gmx_fjsp_set1_v2r8(rcutoff_scalar);
     rcutoff2         = _fjsp_mul_v2r8(rcutoff,rcutoff);
@@ -280,15 +280,15 @@ void
 
     /* #if KERNEL_MOD_VDW=='PotentialShift' */
     sh_vdw_invrcut6  = gmx_fjsp_set1_v2r8(fr->ic->sh_invrc6);
-    rvdw             = gmx_fjsp_set1_v2r8(fr->rvdw);
+    rvdw             = gmx_fjsp_set1_v2r8(fr->ic->rvdw);
     /* #endif */
 
     /* #if 'PotentialSwitch' in [KERNEL_MOD_ELEC,KERNEL_MOD_VDW] */
     /*     #if KERNEL_MOD_ELEC=='PotentialSwitch'  */
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /*     #else */
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = gmx_fjsp_set1_v2r8(rswitch_scalar);
     /*     #endif */
     /* Setup switch parameters */
index e89a45619834fdb44f4ccd3746b47046b8ab92a9..de235457dc40278ae7b00a1a39a733894e1363fe 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -463,7 +463,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 220c0ad243ceeee6322a9dad62c7dd58920d6904..c34db607311437e20e35bdb17dffe3eea0674b35 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -719,7 +719,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 9a253c7dcc656b510e03fedc63e03eeec9d2859f..17b59d12b4cb3db2ef0ad06fc8a537d3cb0ac51f 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1355,7 +1355,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 963fca56644b5627a9b5a257e0de47877f4e2d9c..7b24dc0b551a218eeaf9e1158655ab81e047fa0b 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -804,7 +804,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index fd6cf36cd725070b3f4e2583cee09b999ad5be8d..4f5ef34e12c834ac05686d045c76e10358256408 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1448,7 +1448,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index eeab12ba4efbcfec3769a1b80a455a3439d1ef59..90b440a0586fcbfc47b7a990c3c9f478a6d211ad 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -419,7 +419,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index c9b71a9b96061405934554cc480069e0ceafa9c3..91fc08f336f7061a62dece202b62f31cbe1cdd19 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -675,7 +675,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 0d9feba7976afab0dd656257ee6da0c58a34f612..07fe4bbdbbea76dbf97e7441eb1b43fbc6562a0b 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1311,7 +1311,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 2b085f9b2aa8071ec56c026787988120923031db..e5e3949f435c11e4677800a302a44cb790b20770 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -742,7 +742,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 46e50ad884e2e746d353cc0fb8e133cb34e00c06..744fa851a534b4d562b8a7020c7b90ffdd67e456 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1386,7 +1386,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 96700a0ee684dc29652a450c00709ebec82742af..70279ed4ff7985dc2778494b8a723d43f1eb7812 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -372,7 +372,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 3c0ddc9764674d1ab9aa13f6fbbd313f687d7874..3af8ba313194a89d9b8689221523895dc1a1e61a 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -628,7 +628,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 03857a7fb312c1b8c6cef7d2a581b715982f6017..558c9074aa6a7f8dbb136c1da67b96d68ab7c7d1 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1267,7 +1267,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 8a8a97c7ea9c286562ae47f33d6db0af9abd2811..6675da5eb5af38f4edebd878e9c4ad7dde8dc659 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -628,7 +628,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 296e02c6aee7f08971b61189ced6a41834f4f194..cb0587227b6f70e7bccf7bb9cdde6b722d4ef281 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1267,7 +1267,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index e18b8e4c52cf589c7db7c6e921ff62fb4b145398..4d70301c15f625b58ac20706eca64c02f03489fa 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -445,7 +445,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 8e487a90fd1830512c450ebda1f9a3e2a895109b..c24e64fdf75bf8c7cdb352b7b106c12b89c49fda 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -633,7 +633,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index b49b0e1d8f10c6b573a549a3d86aa0342e13c295..2a722f63c99d8eaf38e1c44f66e191adb1bcbbbd 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1065,7 +1065,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 329b9a36b560a5fd17c0eacabbaf978f54727eef..24d418b3832f9f368ffbe6dcb08027d95a68845e 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -702,7 +702,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 5673b27ca3175cdcceb3ba3dcca8fe0cce6215a3..b99e2b4bf57c37eb33db677336eacad1ba754411 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1142,7 +1142,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 3a47ac8914b22ff457efb668e96e755d2146e45b..51cb170988c4a3005c97c5f1f23ae964dd2c448e 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -372,7 +372,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 6c1942300f01a04a531f073d84fb3eafe2dbcf6a..a75d1240c6e06345e2037b9f0ec7f607aa6f6686 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -560,7 +560,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 7871da9a93a60882c3c31fd8d2b06fd44963ae0c..496f6a49b5856cf2c7e80f4597dcc9a8fe658444 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -992,7 +992,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 67acb9aaa1f8f3e0fb69bfdce03cda2fcafcee97..47ef89c1a9fa66bfc4031b4a8bdfd9c8b1f26d41 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -629,7 +629,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 9d8581e0babc71d32798a04bcc48b20e26268ea5..80d839d8f86c3712e7769c68d1c80a7914ab4acf 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1069,7 +1069,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index f85418dc215188e9ac4b03645977064e1c4ed02d..213fc61fb64cfada8ee0aad463f5b18ab611b6c4 100644 (file)
@@ -98,7 +98,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
@@ -329,7 +329,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
index 57e207835922bd616f4c9ae9d030d39b238e5b45..0374d109dcdbd58cb274f863fd040f80879e7666 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -517,7 +517,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 4f3cc873d6eb2e42b7a29fbcf89f0204727ea6f2..90f98c66cfcde7ba13319f5f2642623f86475b01 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -952,7 +952,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index d2132f1af514c64c27b4f8c9d812422b7762591c..7ba891f85100ea1654736a5ce13b79b3db0f67f2 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -517,7 +517,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 476de03ab5b8d93b82befff06beb8527c70f3200..143bd747082ef7ebd8d15ee83e3f211c1eeae7b7 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -952,7 +952,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 2e2bd4f48264120f00a018a52a4ac757fcb26fa7..f52982a55dfae5c66d4b8eea3b83af0dc90bcfb4 100644 (file)
@@ -112,14 +112,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -128,12 +128,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_sse2_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -478,14 +478,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -494,12 +494,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_sse2_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index fe050a5ba8b5b46c28783cfb067c1480be33c7ed..a56cb922e8c1d1003cf2681d0d6968d460ab7c5c 100644 (file)
@@ -120,14 +120,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -143,12 +143,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -774,14 +774,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -797,12 +797,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 9a201c520e2b3a11aa405ed2cc9c333e0a068072..6b6c6aa295e840e77b9b16fcd8e183ec240456e7 100644 (file)
@@ -136,14 +136,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -176,12 +176,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1526,14 +1526,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1566,12 +1566,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 9969680e34833cfbec597e3809d2a1dee3b954d1..ee12ca533669d9641b8014f5cf04f1dcfcb75e1e 100644 (file)
@@ -124,14 +124,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -147,12 +147,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -869,14 +869,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -892,12 +892,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 9a0a46548e4b41b5307f1d2becc993edf67d6c60..ac626822792e0785f66994f09addbf352dc8aec9 100644 (file)
@@ -142,14 +142,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -182,12 +182,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1629,14 +1629,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1669,12 +1669,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 67455313a6dfe995b52549e1419a8c40c0feff33..cbff883d4e85d783fa4dd0023ecf2993bf29de6a 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -119,12 +119,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_sse2_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -447,7 +447,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -459,12 +459,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_sse2_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 8d2edb25f3e0adf523bce76c17e1783f6fc8194d..b4ae72e3a412ce5693f85fb2329f9302c74eb1ba 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -132,12 +132,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -739,7 +739,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -758,12 +758,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 5b20fd5dc5abd00253f60a8cc911439921d9ad0c..b84d96a6a1908f12de3fec3ebcfe892d8f38bc39 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -158,12 +158,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1483,7 +1483,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1518,12 +1518,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index f56b4d94f324a4c26cf3d6b27e825a5604b9c2c8..9842459c98e0dcfc6492270a379f8421ab8ef909 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -135,12 +135,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -826,7 +826,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -845,12 +845,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 0c80cdbb532ceec5056aa78817f76f2c794a7e51..9529597ab06dbd4ed368e3567306582f8cbc05d3 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -163,12 +163,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1578,7 +1578,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1613,12 +1613,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 5c308edc1aa2a9b4ee50733a3793c0db4445d9d5..a6497e7e317611627d622f15e6cc52e56677c6bf 100644 (file)
@@ -101,7 +101,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -110,7 +110,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_sse2_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -397,7 +397,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -406,7 +406,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_sse2_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 2a8fa78a22272f59ceaa29822490fe6d18ca10c3..ab56eca157b3b1c2a77760ab31af5917ab4b21c4 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -122,7 +122,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_sse2_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -689,7 +689,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -704,7 +704,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_sse2_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index d9f9701f48c97f95c4ca347f039e377ae0c7fc74..a2c9611c7db22abf371bae3e909d47a7a9b8e1bf 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -145,7 +145,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1436,7 +1436,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1464,7 +1464,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 4f089f124f28e353efa5980b5855e1dedaab43c3..6ae3f162c2f4fbed441436ec9cb17e996eabc152 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -122,7 +122,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_sse2_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -689,7 +689,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -704,7 +704,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_sse2_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index be14894d473b0fb0641eed40df1fdafbfb75cf17..a3e2c539da89d4f27b13e768aaff44c195e24fee 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -145,7 +145,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1436,7 +1436,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1464,7 +1464,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 6cb2dc91c21f3c48e256b542167a6778f79196df..9abe8033135b13bb3729411f08c61cf6e5d8a54c 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -121,11 +121,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_sse2_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -484,7 +484,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -496,11 +496,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_sse2_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 66242c7fb5b42df523bda35aa717bfaa0d51c5bc..78a7b2403dbb643039ea0303bf82cc15969e8e1c 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -134,11 +134,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -820,7 +820,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -839,11 +839,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 2b531744bd6cda1e50da81e0e82e2d0114129b4c..5015a08e6d8fd9583c7d67e66661805ffc95db26 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -160,11 +160,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1696,7 +1696,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1731,11 +1731,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 4f9dc00c30cd630646f966d48ec8577b28db1857..a6766501d9fd1e6c15ae81bc13c4c8788ee0d364 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -137,11 +137,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -931,7 +931,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -950,11 +950,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 67ca3e2c2c835a3b0f3216540863b877aaaf014c..e652dd0ac6c1f2a21fd832011b2379d90f8cdca4 100644 (file)
@@ -130,7 +130,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -165,11 +165,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1815,7 +1815,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1850,11 +1850,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 55dc1da0487bc68f864bb3aee5dc5f6563d494f9..ac233376a45a44eee74146267d68cb329d38b05c 100644 (file)
@@ -103,7 +103,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -112,11 +112,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_sse2_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -435,7 +435,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -444,11 +444,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_sse2_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 765ef68b41e85b2e45b247947d2134baab6b8057..58b95efe7680866edfb9543a3a97d9dc3be1cea3 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -124,11 +124,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_sse2_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -771,7 +771,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -786,11 +786,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_sse2_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index ecd47e1e4482b677f331352d28e69e5677e6cf09..1dd219ffbf9ab7db9f5b7b354cd178556d20c635 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -147,11 +147,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1650,7 +1650,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1678,11 +1678,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index c9ac8374009b043d7988c126d48058f5965ca6f1..d1fd70211790543d1f44326440b2872bc978d8cd 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -124,11 +124,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_sse2_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -771,7 +771,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -786,11 +786,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_sse2_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 8ba483aa5076d31b4da71a1e42cfe12f3650ec94..5fe0fc30af2515a35093dca524ba33e72925a221 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -147,11 +147,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1650,7 +1650,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1678,11 +1678,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 3e2168abd8dde79283db885253fb2f1a992aed63..8598d663151be71d7ece4aee0662984204c0e0c2 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -484,7 +484,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 42b7c18856b610dfde9ec42d4c1275d4afd7e5c0..e380b1f8bf058a9785d5bd740e71d1545414ba3b 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -736,7 +736,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 2f4fd45589877c910994abbc06194b49786a1a4a..fa66e57270a6aed118a3603606544dd305abb16d 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1360,7 +1360,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 676791b63e009b62c0d27cdb5e41aef26bbfec85..c6f251650198893315f9670d5c4794086a36ae89 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -809,7 +809,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 7d82b83efee5d75b4f513dc2c3feff766d494565..6adcbbeec7d75138d335099963e2a52968935ab3 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1441,7 +1441,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index a73c609c274b50c17530c3415a76f6e9111c76ff..33ad30ca56f97cf75d866d93a178e72d6eed6b76 100644 (file)
@@ -112,14 +112,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -446,14 +446,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index 3c91435e79d2321c9546146dafb832adb9a6d234..323bfa9262fcdc7c0b8e71ade0ae5afd104c4561 100644 (file)
@@ -120,14 +120,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -702,14 +702,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index 52ff173cd60647a144369f08b420dad191fdcf5b..cd4f9fc923b902578895711b64a95fd202196862 100644 (file)
@@ -136,14 +136,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1334,14 +1334,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index 693d9ef0a1d5c0c2fe351f7fae1697a6af5d9e1e..1755b418838a2dccb6be32ac066e97657c15b127 100644 (file)
@@ -124,14 +124,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -779,14 +779,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index 91cd03da22f686678c856f1d4aa38135ddab5fff..493a88cecac80b542fa5d49ea26d77eb771215c4 100644 (file)
@@ -142,14 +142,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1419,14 +1419,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index 0f3d86659d4889d42f8e46ad23d11bbff7eddba7..d00057d754bb9bf5256763f1a404675ede3cc50c 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -415,7 +415,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index c56626bceba49c8b2128c9fa3586930448279f15..192f39dfa6b8d74ecfe223669c82b56f44908fa8 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -667,7 +667,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index b03e34cd8f7c15d7d8ec266127f4d239caadc020..ab66485be73263e8b7f8d6d3ccd2a2ca575c66de 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1291,7 +1291,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 46502a56865e7b320982bc8fa0780c5495a1fb58..83bcd2f319a2b685677d1b51c2877979872b7d75 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -736,7 +736,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 6096385d5dc15e1bd2edcaf15ace756aa70366c4..0b374802d50c744cd40259d7a4604522c3feeb00 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1368,7 +1368,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 54100af8662b304d38d19bca14a594182bb4aa6c..29b02eea155d45d35e62f5141e4e0f27d1beb403 100644 (file)
@@ -101,7 +101,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -372,7 +372,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index af18fa4025cc59a6d4b193c636a90d107ba8cb19..0ef310c472fc815dc3a71a96065091c9a785556a 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -624,7 +624,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index bc6496bbc915d73fe94c53d33147928c32779e97..0dd75011feb2e20738f86bd97a976505a119eaa0 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1251,7 +1251,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index 0cddf2ab1b96b6fdda300a0c596c622792062815..55e3e7166e8f03cda76f98f56d8f621795445e0a 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -624,7 +624,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index b60c53fa7cdca2d834b8720cc1a977abce1d1414..5e321e1fca321e59debee3b7db3a4ed994c375d6 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1251,7 +1251,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index 4ba62a043e5798687792d2da611bfb4cb0ab9a95..9f96a56a0490b828a464e74aa9b453b6e6b6bdf4 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -125,7 +125,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_sse2_double
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -523,7 +523,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -536,7 +536,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_sse2_double
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index fdc3ebf7591790041ae4a8357a45f2e65473186d..36956b410f12031e68c004f7f740b98c83f72b3a 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -122,7 +122,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_sse2_double
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -466,7 +466,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -476,7 +476,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_sse2_double
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 64002a44210f66364230a7005da07a863d080ce9..b8c4480865fecc75526c008a406d48690e5b604b 100644 (file)
@@ -106,14 +106,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -419,14 +419,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 4805ca270c76f8e46db02af798e553591539e138..96ef9eef93d92b1fefddaaa22ba1f8d938d15a99 100644 (file)
@@ -112,15 +112,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_VF_sse2_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -417,15 +417,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_F_sse2_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 85a7a61d5d3556428e00eed10bd88fc885aeabb4..00cefaba8602cbe50df1e103fa7c3d010e61b459 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_VF_sse2_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
@@ -388,7 +388,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_F_sse2_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
index a51a732c1178720f5788df1522bcc4e654da544a..b4cc7157c3439f24571ec233c4f1a79c099fb65e 100644 (file)
@@ -106,12 +106,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_VF_sse2_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -377,12 +377,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_F_sse2_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 6cb0a794db799be6a5b7578f2c0d8f24acb8ef13..93dfac0ffd87a18afe74584c2d28428778f8fee1 100644 (file)
@@ -108,11 +108,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_VF_sse2_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -418,11 +418,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_F_sse2_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index b64599261cbb9fa69ecaa37abcefe5504fe32a35..d76739e3e096efbe5cd3e33ec8b1c456d45768a2 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -121,7 +121,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_sse2_double
     vftabscale       = _mm_set1_pd(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -475,7 +475,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -488,7 +488,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_sse2_double
     vftabscale       = _mm_set1_pd(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index c54e1921463ca44a8820445d1242b958503d75c1..f093e91411dc5c60915da0d5b7593e87e01e813e 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -134,7 +134,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -703,7 +703,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -723,7 +723,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 2b5563e89576698f395d849e26d5b5f3c0c45a14..c0b1a59575e2852c224414ecf52afd275232e7c7 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -160,7 +160,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1255,7 +1255,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1291,7 +1291,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 6627e0d82c4efd9af04f408cd717b2818bad2af0..7e865a71c8c35a9d60eb0ddd128d19a6d06ece33 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -137,7 +137,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -770,7 +770,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -790,7 +790,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 286e2e2f7eb60d1ce06e648cc4ce927508019cfb..05cbb7b5eb5c7a7ecac678ee422c2f4f4b06c3bc 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -165,7 +165,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1330,7 +1330,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1366,7 +1366,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 1d0f6505b044d47c6b7f7ed7230d6bc6a379ed0a..6b1dca8f48452c4ca197b7e26b1de52e154ddc53 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -114,12 +114,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_sse2_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -407,7 +407,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -417,12 +417,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_sse2_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index c59f2752d28e17a11a5af5bd73544a31e3745c04..f1e4d2752caa6fbca2b98affad6b6cf3bd834954 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -127,12 +127,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -635,7 +635,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -652,12 +652,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 1488265114990ccad2b0d8fb159f407f0907e3ca..38410748e7c12e9e9f882d4a296fe46488d2a1ee 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -153,12 +153,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1187,7 +1187,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1220,12 +1220,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index bed484f8a92a94328ec399a59e5ad66646ef3858..7061c4efea1665e91f2f690c24c364125d58db89 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -130,12 +130,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -722,7 +722,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -739,12 +739,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 902e2112cf14104ea95ae35b12d6fd5929810770..7a8e953f010e7687c7bf31eb017b8136ead7b043 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -158,12 +158,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1282,7 +1282,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1315,12 +1315,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index d5e8e7f4b52f2dc41d5447dcc5a7c90e5ebbc053..dda7b8f62d31d4ac96bdad1a703e9b389f6e7cc9 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -116,11 +116,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_sse2_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -444,7 +444,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -454,11 +454,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_sse2_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 577b404b9e047150d15c009731233d6647255b37..c60e601dac23e43653d4ee1b6131e76503125078 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -129,11 +129,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -672,7 +672,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -689,11 +689,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 2ecc113c85faedf4da53b53be2ab5224184d16c2..0d05e11efd3e17484053df2e1ee987700f90f15f 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -155,11 +155,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1224,7 +1224,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1257,11 +1257,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index b55bed19bb5b102b75a17b839d23a2fc73936075..a12d6de4ca3d15cfb833c2cb26f5089525991c49 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -132,11 +132,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -761,7 +761,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -778,11 +778,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_sse2_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 1bbfc92f80c51cbeb8b4304d22b05a19bce75750..830d8f2b936ee2543a5c6e067b17af99b21f8241 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -160,11 +160,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1321,7 +1321,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1354,11 +1354,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 7fc2372caa916d2fc622d58c9763ed0febde6870..51d9bfc53d298bae3686d69202677b6770603e92 100644 (file)
@@ -98,14 +98,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
     crf              = _mm_set1_pd(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -357,14 +357,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
     crf              = _mm_set1_pd(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index a38c9c9ed25937dea94303c2f7e6d01bda17f112..ef8fd4369ceaec8cb673df88c010c8b2454b4451 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_sse2_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -585,7 +585,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -598,7 +598,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_sse2_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index ea7289278e54571302a6c3f230dd6eeabdbb29c4..7e71802be8f9ba6e84ee94b2c58a29ae996fd44f 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -140,7 +140,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1140,7 +1140,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1166,7 +1166,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_sse2_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index c830f21053c1ead45dced4d9a5671b3b15056535..98537201be5d5e0cd176f2a3e82de2fbbb583aad 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_sse2_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -585,7 +585,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -598,7 +598,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_sse2_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 88a20556650dd081620876c098239e634bd9115a..f5de1d6c7506f250d65f829acf3f17230639c2d7 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -140,7 +140,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1140,7 +1140,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1166,7 +1166,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_sse2_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 18960c339b56a214b6f06973c02e2e05d0bc1e8d..c63e1c71fa12df8ea97f06ff4ebd16eeda78cf1c 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -448,7 +448,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 60e7512a7c688a55687c6f25d5d0518f792890ba..3360308a697a699dd281483e0c285ff717e9ee4d 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -636,7 +636,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 644527871c3c8622d50099ec2b3920183b299963..646097ba479134066e3d6a197d3ab0becb28db6a 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1068,7 +1068,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 4cb2afb6d7f4fd1395f928b93f474668d92a4ec3..0752d046767eec5177c2a7dfbd483e69fef776a6 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -705,7 +705,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 9e954a9b94b7d76874c173df418b7a14bdfbaf90..94a578b6796408170b652cfe32c23345f9211b99 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1145,7 +1145,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 635cb8ec90c33667f78a5ef2161fc1daf6888f9a..ff4f71ea203f15e6bed4ae30bb2b736e72020238 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -375,7 +375,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index c0efc8b606173b8aee912bcd55364c0855bb64c5..591290a28b90c2ff9354c4c659441fda71de109f 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -563,7 +563,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index a1a44cdccac654539df35b5619c52f2281794a2b..2f2e387d733337d1677b8b7510f39a57b0e05c40 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -995,7 +995,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 06f1bd8658fa88db68f1d6e469c59dd58b31f795..933a2801e74560f81e8660e2e769bcd67ed1403a 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -632,7 +632,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 31afac1de1d333cf0f8210a5a2e826bdd8831f7d..6cb31d744b5eea08e4dea92b09def2ad18ec409f 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1072,7 +1072,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index acd673f422a1824f833e3f121387c8a20663d738..9c5d879615f5a23da546d272e318cbd2c3416ff6 100644 (file)
@@ -98,7 +98,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -332,7 +332,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 3e3177ee98e53d4bb68fb84d259ed8f05d595663..b540321e18edf82e078b9d3af92a19b9873282b2 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -520,7 +520,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 1cc423f29b09aeb536c59a81de5e2e48585f9d50..a8ce734cb11e71105715c941dbe6149c4cb76070 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -955,7 +955,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 7344aed9348253e5d1225925090a8daca79aef0d..5cfbfad034e60999aadb511b0bcee6649c166e23 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -520,7 +520,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 522115770bb10a4a7983383788b9648b2e59d591..1b91383908d4b3bbb25137bae1a8dfe381359ca7 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_VF_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -955,7 +955,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_F_sse2_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index ce36e1c56d528cccc2970d2b2a9fc50d0fe8cf3e..29bd977bac7bf177db725ebdb2ecda6b6ca14780 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2017, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
index 1a4e0861dacd99727711ba04d70170466f0a568a..15932a11d2b71bdc87ee1fcc0cd66bf0b40c04d5 100644 (file)
@@ -182,7 +182,7 @@ void
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
     /* #if KERNEL_ELEC != 'None' */
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     /*     #if 'ReactionField' in KERNEL_ELEC */
     krf              = _mm_set1_pd(fr->ic->k_rf);
@@ -198,7 +198,7 @@ void
     /* #if 'LJEwald' in KERNEL_VDW */
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
     /* #endif */
 
@@ -231,7 +231,7 @@ void
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
     /* #endif */
 
     /* #if 'Water' in GEOMETRY_I */
@@ -272,9 +272,9 @@ void
     /* #if KERNEL_MOD_ELEC!='None' or KERNEL_MOD_VDW!='None' */
     /*     #if KERNEL_ELEC!='None' */
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     /*     #else */
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     /*     #endif */
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
@@ -282,15 +282,15 @@ void
 
     /* #if KERNEL_MOD_VDW=='PotentialShift' */
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
     /* #endif */
 
     /* #if 'PotentialSwitch' in [KERNEL_MOD_ELEC,KERNEL_MOD_VDW] */
     /*     #if KERNEL_MOD_ELEC=='PotentialSwitch'  */
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /*     #else */
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /*     #endif */
     /* Setup switch parameters */
index 6a978b5cc4b5641f994d35e9c6bce369f263b929..33e79f62a6f5811e132288f657095d8e533e1843 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -515,7 +515,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index a64eb3875261e16c046b065e910490af82afd85a..2bf124e3d70648950b82e34ca53202abab571fc1 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -771,7 +771,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 0cc97e6a5bc5a741ae28dfaaf11eace882f8f9d7..c2b8fd258a0f929dcadc930ebb997b0ce9a48629 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1389,7 +1389,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 04b518c4735ab9f99c3078b79dc12a7f18d5b67e..0668a161b0a06a4b072eb5fe21f681c1375c0148 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -857,7 +857,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 92f879b357f46329c9fdb1fd21c268f2b76eafdd..8242b1aba6784f6e44e4028f18e5761e0ef86a5a 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1485,7 +1485,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 9f18c89bb3068af4fa50152deb770208f293d764..3c09fef27659638e22a1e41f53f38cf6904f6cb2 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -475,7 +475,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 3e6dad91c81fd3eb4798bfe32a7a768864e8c36a..6104c41302afbed37c3d64d65512738b76bf7d7e 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -731,7 +731,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 8545955625a8d8f8fa46614c3a78733f4db9670a..65bfa5e96a08ea21163a4159c47dd187276a352e 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1349,7 +1349,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 9dccebb7ddb35584eefe8a23513acd1e4faa1659..d165e6af4334de9694e8b3735347e6e0f474d8a0 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -798,7 +798,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 1f2cdb404fa261c8d5f7d4b22b70c5df1f4f74c5..4fb7726a5bf38c595aa112b652b24e067723a241 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1426,7 +1426,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 3cbc71afe7cc048ef4d6b2e6c9d8d0f5df966ef6..150eabaaf7df0bf205d8f3e7de482a9c3b94d836 100644 (file)
@@ -105,7 +105,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -416,7 +416,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 396afef4f57b0aaeb435899b450f3ddefa538b20..6c27327972781234bd1ef9f8acda52d789977cbe 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -672,7 +672,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index a634ec170289effa639d64ff5dadad7367fafabe..691fcfc593200729274b8919ef7283c7b2831dd9 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1305,7 +1305,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index af2ee4fc63b8d173ce810d6d4fe73fa533865619..439965f4e27382049d0a60a342680d16f77c7050 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -672,7 +672,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index d207e399eb1d5dac4d4f4780fe8aa3a3055ca7f4..1ca6480a0d945793de2d8004c6c9c0489caf92b5 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1305,7 +1305,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index b39f7862b613ade8a625d2fab0fef30ba2fbd381..0881511f03d94d77084a7182995b592985ebb91f 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -499,7 +499,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 9d56c4b8d177f29b437f6c56adebfcea1b3f59a1..2d172b5ed4dd068345520ecb7ac18d8cfe58f62c 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -689,7 +689,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 43c8f01f15517dd73298b4435cd0a08c41d290f2..a8a27a259bc1292ed423b038b82dd48f0cce832d 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1109,7 +1109,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 517fd1e03ecb5b8a534d0a8a37889f02133f6a90..289fadbfeace0d430507a4bb56c25ffc58310144 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -758,7 +758,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 20c70972544ea25c59d6250b423608dfa87e92c9..027414c57926cf07a65c610b45a169d35c1078ad 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1188,7 +1188,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 18ff1d16f15f5db30dfd0881fc1da5eff6f47f0b..94eb68655010a781106e0d579df043a155eb5d51 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -429,7 +429,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 7e7bec36de56116174a1ba6f00cabee1b471ed73..7e27582583d7083ae359ba3406528eafa9d4a2ac 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -619,7 +619,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index c13c55aa689fdabdccdf903bdc8b49bb47a56942..aba3e8c7d57d75b5dd527d9aa81e7dfb112051f9 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1039,7 +1039,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 065fe76dd97139e2d70381f1dd0c8420ddc01b2f..8572d6161b0788c1b0ed5f6d8a701bf9857539a9 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -688,7 +688,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 9152bb038b738c25ded46a4add3f3ceba76f8a8d..164ec735f7a7b915c65226343cbb106977f83855 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1118,7 +1118,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 8dcf6c6a054117e55cb82be52da9d46a3e58f7e6..ae1df29edf4a3af28b592e81a6756581349dcb83 100644 (file)
@@ -101,7 +101,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
@@ -374,7 +374,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
index 1e7dbc35807617a3a879c1a565111574b5cd8efc..e295aaca349d1e188f067db8bae7df9a891dbecd 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -564,7 +564,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 9bec395cb4d3b18b5081d4218151c20588c3eb5a..01c2411f79ab7779830e8c9788ccc854b94f395f 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -999,7 +999,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 05e0a9936eaee6a7ce9196d10f04765a6c758e6f..b10ed95ce54a852745eb515cd6dde946eb6ac997 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -564,7 +564,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index e8b39724ced9f748101aa69163368e846ed033f2..4b65ab24edaa42403639c11e61b6fb810239822d 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -999,7 +999,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 53e4e5412c2297577599b5e684cb6d8d104d2e6d..2dac9b91f8be9a9073be7a931c5d207fc39d475c 100644 (file)
@@ -115,14 +115,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -131,12 +131,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_sse2_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -537,14 +537,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -553,12 +553,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_sse2_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 5d8d728abec5c5218cab7c748a0279b05237a64f..25be3bc600ab90128477d2705f21c6cd8d877121 100644 (file)
@@ -123,14 +123,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -146,12 +146,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -833,14 +833,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -856,12 +856,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index e455555380eb2ed099f84afcd8696bd26ec56560..e11056b87f41f97c5641d39806b6ca3406186b4c 100644 (file)
@@ -139,14 +139,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -179,12 +179,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1564,14 +1564,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1604,12 +1604,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 62dae76ea32398e94db8b1285274a39b44bc8b92..7cb410f5b4ecc55b568d4d6636cc30bd5eb5011f 100644 (file)
@@ -127,14 +127,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -150,12 +150,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -929,14 +929,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -952,12 +952,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 4d78c850fb98c9e30351ed2dd2fa6c0c6742c4c9..bf088764c2ef7913ac6f4b988f50606fcfa1cc5c 100644 (file)
@@ -145,14 +145,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -185,12 +185,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1670,14 +1670,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1710,12 +1710,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 63f148f118ab3293f3c472e437daa0f7625ea77c..680431afa8e60f1581181efd537264adda7cd6ab 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -122,12 +122,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_sse2_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -503,7 +503,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -515,12 +515,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_sse2_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index b37af4a18fc1ad3d0d409dd471c25e062d829cbe..5e361abec19492afbd2ae17b4272a15bb68be2a0 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -135,12 +135,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -795,7 +795,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -814,12 +814,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 8f1a04121148ee9dc52f2ff8287482d08eb6b4fb..e640231969358a6498019f30261adbbbdd973cac 100644 (file)
@@ -126,7 +126,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -161,12 +161,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1521,7 +1521,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1556,12 +1556,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index f4af2dbd15dd786ef7be8089f2a57f046b9c5163..7241881729bbc19c7b690238ddc6e06fefdb8330 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -138,12 +138,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -882,7 +882,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -901,12 +901,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 82b68bdc296f6fae3601055877fe69f2cf31e6e4..aabc56b8a3170ba5e13967accebde23ba29757f0 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -166,12 +166,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1618,7 +1618,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1653,12 +1653,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index d24f594c087198d0f8e24d9c60d84c5ee7933fd0..e2222477a205d4e3b4bc75ed41a82d3014ae777f 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -113,7 +113,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_sse2_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -441,7 +441,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -450,7 +450,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_sse2_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index ad0b430d1f4b229121859e2daa033cf14f1a822a..8d43804b63705e480091a079ac0f16f0897162aa 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -125,7 +125,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_sse2_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -733,7 +733,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -748,7 +748,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_sse2_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 9c126ac7567c047edf4bfa514b9c25a2acfc5be4..6c1a2aaaea1c468ad99282666c6da000f13c6964 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -148,7 +148,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1474,7 +1474,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1502,7 +1502,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 839c3a754e497b70ac2ddd678a3297c8e7f9785a..e81cd2c982444132f2fdc30aabee6f37263ba3e5 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -125,7 +125,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_sse2_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -733,7 +733,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -748,7 +748,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_sse2_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 8578fbf4acc751e115ed359db5c5a3e48ebe832e..65c9d445d735520e8b0f7695cbacf854b56b3f8e 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -148,7 +148,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1474,7 +1474,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1502,7 +1502,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index fa93f74291c045718fdbfe00751e7ee72d1e7fc4..145ee9390a29b52f46419b4709302107956e537d 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -124,11 +124,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_sse2_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -540,7 +540,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -552,11 +552,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_sse2_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 8774dfbf0eaa1e8198e5bbe247bff8885291f7b8..97d4b04a5ca4512d68ace38b2ed567384bea9d8f 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -137,11 +137,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -876,7 +876,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -895,11 +895,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 370d107ba6e60541281a099c815ff098cf028f0d..1311c02abfc131eb29cc45c4d0b927d2ea069c23 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -163,11 +163,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1734,7 +1734,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1769,11 +1769,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 08b8c14017315a1b3f638d1ccb1c79216f2a1c8e..a1db5eb118c3174a0fe4f0477add0f86eea3fe6b 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -140,11 +140,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -988,7 +988,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1007,11 +1007,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 9b2ce3f47ee03d260d38bac0baa04e99fed979e7..9b2f97cd661c7f739219f3e4790907b5f973614c 100644 (file)
@@ -133,7 +133,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -168,11 +168,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1856,7 +1856,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1891,11 +1891,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 2558e59cdee9a81bd0ea47d67b3a2546fa7d303e..7d77238c7157ef9f6671e67d3d98d724a0de88ca 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -115,11 +115,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_sse2_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -479,7 +479,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -488,11 +488,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_sse2_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index c2915573e38d5423c44f908efeccbcdd6d911911..216aa1cbea6456ef1457f6f7d0a23dafc27a3cd3 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -127,11 +127,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_sse2_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -815,7 +815,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -830,11 +830,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_sse2_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 40a4f7858441c6f514a76ea414cf34772357a2a3..196c3cb4b8e0f4bfe7946241bd9a068d486af7d7 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -150,11 +150,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1688,7 +1688,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1716,11 +1716,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 270d2b60d7f5465f11fd139ae8832101e2b9938f..1e22520e3564b4da1cc9a24795e62cac8453665e 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -127,11 +127,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_sse2_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -815,7 +815,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -830,11 +830,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_sse2_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index d33597ce42cffd49ff81fc23bb5613ba7d028266..3e7361401dd3d28482874d820db75eb4ccdaecc1 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -150,11 +150,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1688,7 +1688,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1716,11 +1716,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index b90da7c333da5eb20c040a9442bd68c31d8ead56..0cdb6eab70f522a20db4d33bdbb04338ba6341a3 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -536,7 +536,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 0614d33d325c3c8b93571a3f81852f77416d2bde..6f393981821a2a5eb2faf570793cb2ab1865efb4 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -788,7 +788,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 54a5d9db2ddd781a61b45cc48d13524d7d724013..d840fa889b68cea989c0f65247a7010646748d37 100644 (file)
@@ -130,7 +130,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1394,7 +1394,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 696d69c8c8dbeba0eb9b7a7eac61a3ec14d02cf8..9f3a414ada73553e247db0e645c6b9776f527c2f 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -862,7 +862,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 912da388326b8ef5e9ba651840413a0221b6370a..78889fe59e18a5b59375184f75fdac29ebf9fd70 100644 (file)
@@ -135,7 +135,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1478,7 +1478,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index e1973f13ec1fe3e5a3a915394eebfe10f84f4ae9..9dfff4dbdf53da3974746e442a411a0ef1634a7c 100644 (file)
@@ -115,14 +115,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -505,14 +505,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index 366f15de995aaca63b48d7a2f924d3a986b61b88..f40884660eb84d8ec39e527d60255b7a8c716508 100644 (file)
@@ -123,14 +123,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -761,14 +761,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index 3d5c9d1ded705a90ea98323cc7aea3a92212a095..9ee1bcdfac1ed467aae3de026c1d1e33bb10c8c9 100644 (file)
@@ -139,14 +139,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1372,14 +1372,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index f67e36ba7e0a80bd85b10c023e81070535afbd25..529bb050d11678ba923fd4fe9e7741fb6936c2ba 100644 (file)
@@ -127,14 +127,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -839,14 +839,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index 569143418d077b423eb86fbc8d9483b4e947c136..6ac73142aa157ebb7a4962a335a930eac30f5990 100644 (file)
@@ -145,14 +145,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1460,14 +1460,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index cd37f2bb21a5ab0e6520b338573da47f67f50c22..6bea59d00ba12a12de3f4aba18ef17c44045c409 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -471,7 +471,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index cc70234907385ec1af6125241de7aeaaaebec2cc..073753dc1baf3a82a2b60bce43d7903cf7dcf79a 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -723,7 +723,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 5a148e98dd8a05407038c03f60e3016db662a836..5b716ded60e9884afcb609330e94bfdc172bcaa5 100644 (file)
@@ -126,7 +126,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1329,7 +1329,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 2ba23156813e2bcc21eb014b9cacef2357cbb0fa..0897733e5836104bd0264ef96c7feda6b1c9e6c8 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -792,7 +792,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index df73cf0be103b821b041201cf8e8683136ffea1c..f738d4f294495e53741b2a50bc3e93635a365cf5 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1408,7 +1408,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 545482a1aa4a9cf991bf82fea890b3bb1548c997..8d819bfb4f62a384ff78209c1fcba3c4a3ab2222 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -416,7 +416,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index a1babd40b6236304998d414e392e440884ae13ce..870ce82569fc365273a26a07c9fb90c9bff5f94b 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -668,7 +668,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index 7a5b2d1a282367b8b36389458bea9201ae29a2f1..d771c01cf560fd8316ad2dadd451de60643d03c0 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1289,7 +1289,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index fb20e9eb888aa4c427ab06e3890a60fb0c35deff..1a0b5e1500de953f22a8e049576f8c60a919a0af 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -668,7 +668,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index 805725569c7cb5bfceae3c744bead53258bc7461..350bab76be4ca651bd03d70c04cd459e50a24eaa 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1289,7 +1289,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index f120da09a7e3e40d6fd9f293383ec3c875f7f51a..2dd1b08824cc028fb43216351f2d6d15d2785973 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -128,7 +128,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_sse2_single
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -586,7 +586,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -599,7 +599,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_sse2_single
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 13d798b212de741b99b823fc41efa5ce996aee25..137dd21fa8c814044ba9d938645c0de57ba96609 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -125,7 +125,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_sse2_single
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -533,7 +533,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -543,7 +543,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_sse2_single
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index f340e2bcdcd166f5f350379f50cebc117b008613..36268cd47e680b05a494417dd42beab82bdc4a77 100644 (file)
@@ -109,14 +109,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -474,14 +474,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 4ff9acaa1ec6061069394741cc0936735abf4790..c989239f330d350849fb47603419201b81b072b6 100644 (file)
@@ -115,15 +115,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_VF_sse2_single
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -476,15 +476,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_F_sse2_single
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 4e8d01c25cc4fc7dae4099477f3f1933932122ed..6d04306a92e39de5324fa9a8d6b783e9dad13134 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_VF_sse2_single
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
@@ -447,7 +447,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_F_sse2_single
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
index 705044c1472b58aa4380a36dcbff97c0cc4fa7b7..0052dc93b5bfa664a1241fb380434200a0f5770a 100644 (file)
@@ -109,12 +109,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_VF_sse2_single
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -432,12 +432,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_F_sse2_single
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index af286de91975640e0c5329e202d3924a89fbce71..9256d8535aaf88513f00b04faf3b9fd4110b4b2c 100644 (file)
@@ -111,11 +111,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_VF_sse2_single
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -474,11 +474,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_F_sse2_single
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 0440bc9f7ffba01c80690f7bf32ace5eaf5272bc..5e7d7f5418a5a7893be1cf825f89652048c42341 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -124,7 +124,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_sse2_single
     vftabscale       = _mm_set1_ps(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -529,7 +529,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -542,7 +542,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_sse2_single
     vftabscale       = _mm_set1_ps(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index c45c3e3ea44f2ce2bc34bb4528f21daa9ff683e2..404a4df149e218448088a5c27cea481664e24323 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -137,7 +137,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -759,7 +759,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -779,7 +779,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 6589ca44a2ca4021f1b0844fb3373b0450025e0c..b1f675a6ce6de46a5acd5d0487cf8cacf8f60348 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -163,7 +163,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1299,7 +1299,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1335,7 +1335,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index ed9850179d4645eb219a7449521cad9fa06ae81d..76b43b5769d05089c9043bc68e0ad09a7271f80a 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -140,7 +140,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -826,7 +826,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -846,7 +846,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 2ee3ebe303bbac47d40e01615ffe6bc45e65acb9..893311745446194a3fe6743b614d4b871cdfbeae 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -168,7 +168,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1396,7 +1396,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1432,7 +1432,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 2fa396adc2dd577f2bafb5ada13cee113dbe8a47..a80a76d10b60875d72f1c3a89d87f1efb626d289 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -117,12 +117,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_sse2_single
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -464,7 +464,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -474,12 +474,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_sse2_single
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 91bfce08cb3c7d659a58d358901cde9ca07ddc88..85ae37dc08f64b4b209faf97957019796776493e 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -130,12 +130,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -694,7 +694,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -711,12 +711,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 45d2ff73670b426caf81baf56099a3bd90a3ebec..f329bfa6cd5690d23e54e2e8bf30b46c4ebdb419 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -156,12 +156,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1234,7 +1234,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1267,12 +1267,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index bd22453f3cc07f8433c2a05b62ced34a2384c618..e1271870ac44cd013e5f9a8fe2c65e37a8dfaae5 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -133,12 +133,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -781,7 +781,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -798,12 +798,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 928541365341a457456e9a2af399d2c3bd248e10..5f5a7c174d6a8afbcab8a825eccbbad620307d25 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -161,12 +161,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1331,7 +1331,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1364,12 +1364,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index e0ba449f02eccbfd453934f41286e44aa3abd59a..e5442a0ec1b1a5280509018da8d9c60fd9b857ad 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -119,11 +119,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_sse2_single
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -502,7 +502,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -512,11 +512,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_sse2_single
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 9109a0abe680a3bb54162e3f3d92145360ff337e..525bb8b821e68bf5dd16c8cc176d501a24fdd6e1 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -132,11 +132,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -732,7 +732,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -749,11 +749,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index d8d81a135267842cf0e62f5e84dc7f1644a8ca8e..2ccbceb81769596f8a64ceaea3388082bcec5b6e 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -158,11 +158,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1272,7 +1272,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1305,11 +1305,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 6f159706f565405fde6191cd27432556755f82da..fff35c4f821232364101b131d73d5234038d26f8 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -135,11 +135,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -821,7 +821,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -838,11 +838,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_sse2_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index d8c114ac832c2016403dce3c9798969c5834912c..08a0e16f83d23b5570f8d1e45e8a6e540d61bc6c 100644 (file)
@@ -130,7 +130,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -163,11 +163,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1371,7 +1371,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1404,11 +1404,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index ac8f02b2d9144200195329050fdb11f15be11849..d4b7617fc3432fa9b2a32a553e3f70f16d0de7ca 100644 (file)
@@ -101,14 +101,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
     crf              = _mm_set1_ps(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -402,14 +402,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
     crf              = _mm_set1_ps(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index cfd729eb6744399f640c6532a44ac7991036dc41..d7c1098a4a6a9a4dedb9c7e2e7dc5a2561df55fe 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -120,7 +120,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_sse2_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -632,7 +632,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -645,7 +645,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_sse2_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index fef4603d532f1d70a8a46fda098e50c11f895771..b8ddccb30e0bcd8e5ce95eb13734bd973e7cf390 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -143,7 +143,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1187,7 +1187,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1213,7 +1213,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_sse2_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index af403d3b6ca670f60a5e2d7a31f2ee16e90386b0..53fe023bda4cedc5396e548263fd3f74f61eb1f6 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -120,7 +120,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_sse2_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -632,7 +632,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -645,7 +645,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_sse2_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index eda582f59ec67ede348664428a6c127e9e33ef34..6384b1456f1cb85eb19b2a1e435614faba8607ca 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -143,7 +143,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1187,7 +1187,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1213,7 +1213,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_sse2_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index ace43e2178b146d4137ad23ec2458b6f57bf1713..84926aec05bca0c68138685848b01efe20a60588 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -502,7 +502,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index bb12173903f96d4786d4f9998fd43d1f078f0863..23a66bad14110d5f6b925beebc57fbfb14b0e59c 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -692,7 +692,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 2a2145df82607f53e5001a73125548429aa89462..ecb6b1b4df18babbf77d397958c2c3d08eb440a0 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1112,7 +1112,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 43acf71e03c19e339d37154f83f9a59f312d37ca..d753991c0f1d409bb079ac2e5076d651d52ab3af 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -761,7 +761,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 38f9b2f6f8c97c3cfadc0aea4da81b838873676d..ec79b493a5ed422d8adfc0ec668b672e2685ce24 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1191,7 +1191,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 2edebb088bbd7fe6db75e3e6f3e0e2bbc1f913c9..9f2a9a775b600dc0efc693011dac949bbdba1aa5 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -432,7 +432,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 31c715987b5dff0dd4c4c1327b28f0b4472e21ee..7d25bd27e2a80f9d4635f60b05186e0114b66bd2 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -622,7 +622,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 14e770137c60134e4af8c5d5c8647f19ddef3a24..e98600297b684e9552c87a1f0f2dc3ab4a8b0d62 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1042,7 +1042,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 249031959ea5eb7968917c0425d2ed8b5498a7ad..9e098f1cea42234df236cd04e6f2e839cce8c2b8 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -691,7 +691,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 6f10ac95902a7192d9821d6f0981f0634167a408..e9409fad5e68cc0710b67c9a646ae1f7455a4ba4 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1121,7 +1121,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index e3702bd8e27b207bc0d96bf76898a8c121077a8b..3d2c667db916c501f5d13a462eda318d0431f3c4 100644 (file)
@@ -101,7 +101,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -377,7 +377,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index f268e200f0ede575ba13ef006264f7e274ac5f3a..356c7be4be54ce84f290e7efb723e2db1836b953 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -567,7 +567,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 1ddaab3624e6494baa99f4edf9d6e9b255c528b6..e0830a0ac67d563397c2f79dada7b54f6ba00f34 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1002,7 +1002,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 8623bc8656cdae85f463867b1aa1993f7c710fe2..beaeeef3488102c9bdad4e3673de6b9f663a9a9c 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -567,7 +567,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 2dce5a402706b2c9971f09e7c7335dab3e0ef686..68e14c855a87ae145204be7ac61cb05367d09e01 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_VF_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1002,7 +1002,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_F_sse2_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index e86523bd2e4819d8a989858e31e37316142de08c..324c1cee561c515277d2e9d42f512733c3de19cf 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2017, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
index c59ea77633491e7d3016c6e088f4505fa1b26738..2ee376dcac34a53d927a66fa2259fb0edf6f8f53 100644 (file)
@@ -185,7 +185,7 @@ void
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
     /* #if KERNEL_ELEC != 'None' */
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     /*     #if 'ReactionField' in KERNEL_ELEC */
     krf              = _mm_set1_ps(fr->ic->k_rf);
@@ -201,7 +201,7 @@ void
     /* #if 'LJEwald' in KERNEL_VDW */
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
     /* #endif */
 
@@ -234,7 +234,7 @@ void
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
     /* #endif */
 
     /* #if 'Water' in GEOMETRY_I */
@@ -275,9 +275,9 @@ void
     /* #if KERNEL_MOD_ELEC!='None' or KERNEL_MOD_VDW!='None' */
     /*     #if KERNEL_ELEC!='None' */
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     /*     #else */
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     /*     #endif */
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
@@ -285,15 +285,15 @@ void
 
     /* #if KERNEL_MOD_VDW=='PotentialShift' */
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
     /* #endif */
 
     /* #if 'PotentialSwitch' in [KERNEL_MOD_ELEC,KERNEL_MOD_VDW] */
     /*     #if KERNEL_MOD_ELEC=='PotentialSwitch'  */
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /*     #else */
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /*     #endif */
     /* Setup switch parameters */
index adef7b87250d1bbe18e4a5c0f557354d2a3a3716..57a92624003d9039d2159580a5e149e223f5d0e5 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -463,7 +463,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index b7aa8e0d6694ef051e4f268b51fda80235e17713..40a8f713f2bc3fffa9a6639ff0ab01b997ba9601 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -719,7 +719,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 279296e52538b849b760b98c2fba8dc8f152e614..6e6de31653c76b21b8e9597e6d8a82cd93f3eba6 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1355,7 +1355,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 77f79963ea40a6112aaf5b712544f0ed51f8c8c3..324c7c860cd8e32952472f575f698e1b93138260 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -804,7 +804,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 13e44472615d893e6ddfccf19bba47a3fcb04ce9..ae1fcb5fa6ba1ee15fb2e94e3bb1a7e35ac97e8f 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1448,7 +1448,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 5e28a2db9a002da5947bc35767c7e3fe73c031a9..c8245f1665db7adf33155b312c0c60714e7e8d3e 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -419,7 +419,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 6642658c5c327423f068a549bb5a505c20d2530e..957e0e76de4308e57467e1c390c77138f87cf8b7 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -675,7 +675,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index e7e8c64cd919141c161437e8c715a2f1b78de520..4822354a843496f975922568240d21ac7bf99b74 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1311,7 +1311,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index add00a012658648a030b9f33e68a9a95d46ebdc4..49e13c5c373d85b23acaf549384dcb02542c6dab 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -742,7 +742,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index d76e29347556c599d17108624a1f5a8de0a9a8a6..a69c3d4173f41df5a3f5a2a343b861026d0d6f0e 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1386,7 +1386,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index d42982cb6a1bcbf7a7d8b58068c9df2f47887277..37f64d9e6e01b7749ca19e5b2f03e8910a16079f 100644 (file)
@@ -102,7 +102,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -372,7 +372,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 23b4a857f8c9c7995f3d6e421a070f06d232bc90..edae11abff4507fc02fa0166df26b4d4af448b4d 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -628,7 +628,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 0bfa7ac5230dff35ce8d15799e7922730d93cc67..c45f4db95c7ee4456ed974b2f153ea208a78c2c3 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1267,7 +1267,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index a9fc753a4e84ba3ea420dff684dbba08d4d57bb5..6a555dd5d454cd6996d0f53d25650ca8b2b142b9 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -628,7 +628,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index d383391746255f2710ad385819bb67e458cbccc9..8041caa2c3c68bf819386fceea2026a48739d749 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1267,7 +1267,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 5d8e48c0328a7806f7c55095c998b805d2e482ba..b89dbbaa2c62a924d37974a10e73c12eed1407dd 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -445,7 +445,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 18fc13f679dfb4739c6f591766199afb4d846804..a9f1d74739be7bb7ccb692f5f59bdccbcc181758 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -633,7 +633,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 1172bc31ac14a97045ec29c8218f9a94dc33ecc5..0585099b54459f1496000fce7d353ef10c93d3d2 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1065,7 +1065,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 499563a297e0abe53b97aae7d1ad6190fd8a99d5..4cfc487a53a315e1e3c0a4cb2bd1886edef565e0 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -702,7 +702,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index c74d432a312a5d3a7e0f23eda02eedf7790f2bec..81280f3267e8109c589f08bb8484ebedee35d184 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1142,7 +1142,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 2053eb8147dbe9996f412131516432e2df52ddb1..f5f9afaf8b6f98e20546592770d950c3fc47d7b2 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -372,7 +372,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index f136a3c32ceb967d5b6805e3dbd0c9b3929ea90b..2bbefdf47c2d96c69f3ba809f06b6c8ed3d5354b 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -560,7 +560,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index c4d4aa27f3a5ffd95aa5f3bcdb22c96469dccee9..b64566c174ca98845f90785c431f4dc9d0a9c4b7 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -992,7 +992,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 1a3170d7614e11cc5b77a6e117574ac3d669b582..69d52aecf19f102be45830620c40fc904602ffd9 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -629,7 +629,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index fd84bd05c32acc04886d0ac6c91f846bdb73f454..47f4b4d8285299bcd5ca3200448724b31a757e3e 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1069,7 +1069,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 05d1c9090b3d75fafad4296f4b8a4fa0f251ec28..f0e4eb4dbcf06e6e48b268f7e3dd825d4dabe358 100644 (file)
@@ -98,7 +98,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
@@ -329,7 +329,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
index d8f76109e0c861b06bba1dc21aa024d19126c91d..5e77c79fc8d80f372533aa248080225749fc8181 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -517,7 +517,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 06f0f96f71b382338ea65f3087e104727461e264..262a3f09c68d412b71ed3b9182606aece260ae04 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -952,7 +952,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 389b2f1634e84ed34f8005a2809e5874712e2d6c..9ed64cb57acd7fc30df92c0bcf601229e41e98ae 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -517,7 +517,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index b143cee3f7ea2f20adf1f2fc98a59de0d6a873b8..7b4a32a5e3437bd041c3d62182ef1b106ea27654 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -952,7 +952,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index d152cb7c71059c0f6d84ae559600f9bdc5f5cecc..d459bdc22768dadd03eaf40857f61184decf3eb8 100644 (file)
@@ -112,14 +112,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -128,12 +128,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_sse4_1_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -477,14 +477,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -493,12 +493,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_sse4_1_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index f6c5d1a2f02be6bfefca2627d0605f6fcf6389ea..8af2baad601c26b1b6d86999d8b282bf2b5ee1be 100644 (file)
@@ -120,14 +120,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -143,12 +143,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -773,14 +773,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -796,12 +796,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 5a77b8dc4213658992e30a04d8f6f859fa0f5a68..0989aa975eac3536b05ecd7a2c85016f4390be76 100644 (file)
@@ -136,14 +136,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -176,12 +176,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1526,14 +1526,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1566,12 +1566,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index e3dc18d8a6cd0fc0207e8a1a339bd2070d1b60aa..f1f3fb63af12cd5c01f913f130912519bcb5c512 100644 (file)
@@ -124,14 +124,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -147,12 +147,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -868,14 +868,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -891,12 +891,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index cf88b0055b9dad0c3e37d68565bbbcea80e658ec..eb61b3fcc2d87995384925ec0efc488b15cf2ce3 100644 (file)
@@ -142,14 +142,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -182,12 +182,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1629,14 +1629,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1669,12 +1669,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 20ce4f8d6f026f9c5e280390b91bb0b849c664ae..f84cd007c98eae78d83c55152539673736dbcc3a 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -119,12 +119,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_sse4_1_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -447,7 +447,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -459,12 +459,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_sse4_1_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 334e583a9089503b50a42865e88ffe84dfcdcf52..0303f6ffe0b0bade66f6b9241d6c7767e85ebd59 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -132,12 +132,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -739,7 +739,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -758,12 +758,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 6e2cd506161acb2f011330b09536d5be162de2f4..4b7b4638d36f4484e86bea6a50a9edefe262e05d 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -158,12 +158,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1483,7 +1483,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1518,12 +1518,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 98a21df4123d5a06af61ffc918ef7b76973a7335..30f545c094138947e0b4bc38e5619b33cc869db7 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -135,12 +135,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -826,7 +826,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -845,12 +845,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index be01f847416e9ca3ff57f7c68fd49c27a8e7ec20..8c45cfdf0e35f1fd69133993e84cc7f901fedadc 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -163,12 +163,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1578,7 +1578,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1613,12 +1613,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 1dbce65b28e670d14f042e195937dc816ec3ee05..f1737c84ee594519216e71e0e6ccb73d408aa118 100644 (file)
@@ -101,7 +101,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -110,7 +110,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_sse4_1_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -397,7 +397,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -406,7 +406,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_sse4_1_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index fdc029354f09d19c53db533ae6a7164a3245288f..3e34bc217ea59f409527e244d91bdbefebc95c30 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -122,7 +122,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_sse4_1_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -689,7 +689,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -704,7 +704,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_sse4_1_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index e6a8efa32c30669813925b0811d7a79c854ec830..e8d4b901cfff90985d7d7b2c37ebfee60217be11 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -145,7 +145,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1436,7 +1436,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1464,7 +1464,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index d17fb1fe5f924adfdcb25ef910a6a1e05f37eef0..ee271147e0a1e35419d2c106f9d6b0155c646e4b 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -122,7 +122,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_sse4_1_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -689,7 +689,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -704,7 +704,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_sse4_1_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index b47ee81bba6eff4edcbae8e7fbe413c09a141518..64edebe7eb692f3b3325fae084755217016e550f 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -145,7 +145,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1436,7 +1436,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1464,7 +1464,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index da4a8e514a1fea71986aef3979a218c62dbd2bd4..0470f2e22a87dc3aa9d484895a8033ab2a7b2413 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -121,11 +121,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_sse4_1_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -484,7 +484,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -496,11 +496,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_sse4_1_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 191e8609d99aa093a33ce8b291acafe7dce6386d..378ff54f3c21ab59948fc5ebf8a29460811f38f0 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -134,11 +134,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -820,7 +820,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -839,11 +839,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index db5e74416b3743dc71f66e0daaf85677d1d518b9..e8124491e90f7c727a0f9a787cd40fa41dd869d6 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -160,11 +160,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1696,7 +1696,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1731,11 +1731,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index bde798864baac71d15f2f7c5bbf621c018f058e6..6946b9a549f199b26a3eb43b07732cc339812ad3 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -137,11 +137,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -931,7 +931,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -950,11 +950,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index a9220d19239831926eb5476bae4bf87942c02456..4d64b3c9796df393616e47ec230000e44a462661 100644 (file)
@@ -130,7 +130,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -165,11 +165,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1815,7 +1815,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1850,11 +1850,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 3e66bcc9b16fd5c928269ce804845a96ae2b88b4..f03b2f05dce084a40a3504ac9f4c889c31c319f8 100644 (file)
@@ -103,7 +103,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -112,11 +112,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_sse4_1_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -435,7 +435,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -444,11 +444,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_sse4_1_double
     ewtabhalfspace   = _mm_set1_pd(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 3ee6599d79d7710f8e7b5cf4d590a6937e085712..e4496c994790ddb044e39d1f99f816643299cdd1 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -124,11 +124,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_sse4_1_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -771,7 +771,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -786,11 +786,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_sse4_1_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 74a67a4cec7eb074bd2b0a8a6f2e296473b70e0a..e404136182326816369530e7d614aa121895da5f 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -147,11 +147,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1650,7 +1650,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1678,11 +1678,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index c7df10c1663cc576dbb0ab58a53a6bb267e53352..8120d79cefb5539fd0807cc157e7548c1743638a 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -124,11 +124,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_sse4_1_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -771,7 +771,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -786,11 +786,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_sse4_1_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index c0d86c07b211cacf79fbc477d0916aa6569230c6..817c749a0f22d39d2b93a8626871e7aeadb59009 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -147,11 +147,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1650,7 +1650,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1678,11 +1678,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 0e1f9495db92520bec764c2fb22aec30ea6eca41..b5690748434ec736a3ac0d342d88b0f498edbb2f 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -484,7 +484,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 61ee158a648de38ac30b92008721ff8ab6b11642..78a997029f312936623d70547eb462c7f47877ec 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -736,7 +736,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index c0150d6863cc6c32269e8dd181c297d468bb7ecd..d01d6dc9c9306418a5e6c38f2872e3965dfb3931 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1360,7 +1360,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 5bada2d31b6dd1b436456909c5df2c061c16e259..af463cd3e7387f70992f6e545cdda6c68a1e5507 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -809,7 +809,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 1dc8026a1a63e2b23c087643a43a0363d1c429ff..fa4f7da985aa0f1d41c5d51d16541bcc129be3e7 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1441,7 +1441,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 855a7b8b03197e4ce9ca4439f1460b4e7ec0273f..22c08cbbf8cb9b2351534c3a4ae8f55b891ca812 100644 (file)
@@ -112,14 +112,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -445,14 +445,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index 59891109f9c7394b28d303829d00635fa2214fcd..4c4791932461b360ea5990316b2e4be7e5d2e4d9 100644 (file)
@@ -120,14 +120,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -701,14 +701,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index e374efd8902e6bf075a0e1e38c4639f85ecd7df0..468a5e0bc02fbdd612e94ae9bb69c0c2994d576d 100644 (file)
@@ -136,14 +136,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1334,14 +1334,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index a1fa4198f3153e1fc9589ee3a93f9fd20a693029..7f8ba0783cf54d36c4259c299a5ae503c62f39fc 100644 (file)
@@ -124,14 +124,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -778,14 +778,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index 2116cb646de8e35eeb3c4037c1f903d18c6b3466..11ee9a385af4e1174e1db0e529c6425267e3d42a 100644 (file)
@@ -142,14 +142,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1419,14 +1419,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index e38469da69f144e7d9229660d5f4d610c9604c18..556b32b7ed6ee5d966b91a8de94c1982618cb531 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -415,7 +415,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 81b5fc0334a83f35edd0e8ff1afb17d4d8a2912f..07bd9098e07392cb5256985f5f5a8a8b16b87376 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -667,7 +667,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 72bd4932a5b3181c1e1fd6acf39ebab119b94409..5c98738f10ae97aa318f1a3c8da9b12cc06ebff6 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1291,7 +1291,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index c0669bdb8078db04b69d0711377f6e88b6ae154d..550e6ee56225c82150672b0441ec87b7c752c7d6 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -736,7 +736,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 1b82e737a76455e3c51906b145568faee8076017..74f90e41c91c165791eb052b2e688d127d640a8b 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1368,7 +1368,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 4e6dccd461e93c73f319619c7e1c5357a44bbfb6..e18c4767313beb323f5d5ef06967d78f784da3f4 100644 (file)
@@ -101,7 +101,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -372,7 +372,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index 614a87cef5af7b73fd8a3ee4ff5198f5fc7dea65..69a5392a3961b270e971066b04578605615bb4b4 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -624,7 +624,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index d306a1dbb66275c512eb7805cd6f5ebed8458d35..1d2cb7b5ef1e27fc7969ba917e9363ac62d34141 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1251,7 +1251,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index 1cab099404d51a4f9d2e95d8ab87f5494f8f3495..f7a1ba0fec18cf6fd3619bfd4b72d8e907748851 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -624,7 +624,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index a6674910de24a2210f61b978a37e500f53ef44b1..7b55c0bb0aadedf17a1ac8f8843d6fb731f08790 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
@@ -1251,7 +1251,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_pd(fr->ic->sh_ewald);
index 7c26c26406ec07c8db0ce057f425d50ff2e36d9a..316e11ee854065b1967097fa732f0dbfdb3d6839 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -125,7 +125,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_sse4_1_double
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -523,7 +523,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -536,7 +536,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_sse4_1_double
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 9ae2332dd38744212c9a83938b489fde679874c3..3a00b01263b45a02ba2ee26037f6f9bac5ab225e 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -122,7 +122,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_sse4_1_double
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -466,7 +466,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -476,7 +476,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_sse4_1_double
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index eb2ba0c6af3a657c28b175d3dd721c04005fc568..b78bfe89e932a55d53ffd6d9e8ec9d539c06b7cd 100644 (file)
@@ -106,14 +106,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -419,14 +419,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 1fe4fad07180be85ef3d8d188e4c2babd83d1fbc..37060590c90f1df2dd3eed1ff10288b79a25cef0 100644 (file)
@@ -112,15 +112,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_VF_sse4_1_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -416,15 +416,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_F_sse4_1_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 3e51a34fdf2bb52bdf360528cd377bf714fcd307..c08f885a8497424a7c43babce54c9edec515e123 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_VF_sse4_1_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
@@ -387,7 +387,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_F_sse4_1_double
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
index 8d2b9687a79f2915348f64405cf96707fe27bda5..eb2b19942a972a08279b09a773900e3559c1f2cd 100644 (file)
@@ -106,12 +106,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_VF_sse4_1_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -377,12 +377,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_F_sse4_1_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index bb24983119b8ff6f04f547ebb8ab2499804851ea..b8d7259ae5d010dda8f4bccadf483884337d77ac 100644 (file)
@@ -108,11 +108,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_VF_sse4_1_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -418,11 +418,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_F_sse4_1_double
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 5cbbaf280d4ccfad97497182cad65253e0f444a3..a15ecf397cdbc3e3e4d9ff8cfa94d13903cf84d0 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -121,7 +121,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_sse4_1_double
     vftabscale       = _mm_set1_pd(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -475,7 +475,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -488,7 +488,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_sse4_1_double
     vftabscale       = _mm_set1_pd(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 5acc5fd4143fbaf6f0a6015f8232191b27510ba3..fea3b5a861b07df72727b40162c62c1b14ea3391 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -134,7 +134,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -703,7 +703,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -723,7 +723,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index f451aee7029d8964307f1685802f035bf59b9b5f..1d167b5e0ff969302bc7e883398131b494604ee7 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -160,7 +160,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1255,7 +1255,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1291,7 +1291,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 76ae25a60da1d67527b5e61f044dfae6a6a802c0..effb07fb6008f4cee002fdf0e3e7e7eb901925a4 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -137,7 +137,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -770,7 +770,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -790,7 +790,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index f827533ab9fd822ab8d4899460c178a6cfc7ab58..5c267b38bbc22fb00ccaba04ad04073764f9f696 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -165,7 +165,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1330,7 +1330,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1366,7 +1366,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 78631d121a10bf540ca79a0702bf63c0a2920f47..a073116f4e05f846b56b68a34182df833b654c3d 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -114,12 +114,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_sse4_1_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -407,7 +407,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -417,12 +417,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_sse4_1_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 446dc1122631070965493f96a3ee293075220533..affdf3612b30e34142101daa8253c700f8cd9d38 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -127,12 +127,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -635,7 +635,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -652,12 +652,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 186ff66ad409150067ccf94c35d3ab5c72f4333b..90713073acc5823b583ceeee2dd9ba6078f4c5de 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -153,12 +153,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1187,7 +1187,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1220,12 +1220,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 69ee98c40b1e3bc9cb28f5d037be8acc2f05b45c..f9e82695f4bfdaa2f95501767eff63e070ee2d3d 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -130,12 +130,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -722,7 +722,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -739,12 +739,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index 36178adc11926e54a5376a47b16c540603523a3a..7b64e2c9c28707e06ced3432d2b0c03c450c6739 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -158,12 +158,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
@@ -1282,7 +1282,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1315,12 +1315,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = 0;
index e0e554f9844cc5bc5e795e733e85359b9e75c6ac..7eec6a665509c6ce0dd5e8c9c4d53aec6498a192 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -116,11 +116,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_sse4_1_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -444,7 +444,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -454,11 +454,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_sse4_1_double
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index d601c98badcc81988711a2516a3776d113c126b1..e488fd37583703ecb09ca5e86cfa7cb9084b94da 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -129,11 +129,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -672,7 +672,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -689,11 +689,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 799f35f9f4af75b8cf2ac494d715b88b93dc5331..22a47072975d4a1fd01eb6cdda8de66427e0417e 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -155,11 +155,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1224,7 +1224,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1257,11 +1257,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 415fcaf3d20f8899cdb1a49f2ab50216e0ba9788..3fc4fcaebba3eeb645cf648d8e8a00c96980899e 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -132,11 +132,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -761,7 +761,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -778,11 +778,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_sse4_1_double
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 2b580e780d1358a8d15bf2c58adf2aa1b6845027..f1a24afec080228c164744e8661b6a5f0e45f310 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -160,11 +160,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1321,7 +1321,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1354,11 +1354,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 60fc48bce5c43641bf3b2b7578a1e5fcf7f85016..e4e43433db74fd479094da64f1fdc418a86b7f1f 100644 (file)
@@ -98,14 +98,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
     crf              = _mm_set1_pd(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -357,14 +357,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
     crf              = _mm_set1_pd(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 39e4b3c848705f5b2068928abf13f69dc0053f74..82c5547cf874349162751239c3b1f1b136082ff2 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_sse4_1_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -585,7 +585,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -598,7 +598,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_sse4_1_double
     iq2              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index c83215983ad26b5178a9cfebeab6972908357d6f..901e468c9a42a7f4da3cb906b771d9e97d12470b 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -140,7 +140,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1140,7 +1140,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1166,7 +1166,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_sse4_1_double
     qq22             = _mm_mul_pd(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 4d926078a141f956d5cd5f6f4b8547b7ea3d4325..c83be3bba5f185103eb209b3a201b50b0724bbae 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_sse4_1_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -585,7 +585,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -598,7 +598,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_sse4_1_double
     iq3              = _mm_mul_pd(facel,_mm_set1_pd(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index e583ea3512bef014b67adda2c72db7bed5518b1a..04e9085b1e0840ed91befbd3b9e5a9570cbbc07b 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -140,7 +140,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
@@ -1140,7 +1140,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1166,7 +1166,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_sse4_1_double
     qq33             = _mm_mul_pd(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
 
index 27e77e7ecb2f12543c116f8f757a85234ec01253..ead15f3e41af3499fcb17874b355b2bd0d47271a 100644 (file)
@@ -108,7 +108,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -448,7 +448,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 67f87b0c10629b8964878eaf1bca3db3649b47e7..71e4569b43576bf74f62e38de648bf5fc88ee1b6 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -636,7 +636,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index ed7e5f3a2f792874969749fa4a16fc4dc9c39f9d..3c8b6cba4620496a060e686d6b0e445943784713 100644 (file)
@@ -124,7 +124,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1068,7 +1068,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 406d46c9d1b2d1efe568be1bc9c1ee89154b9d6c..b7429d7b09141d6a344f92e3e43458363b309e15 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -705,7 +705,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 7919fa5b180863ff26a36869ed27041f1b99b06f..75b5db8bcde9a81b98d281873f7cdcedbf59e0f6 100644 (file)
@@ -129,7 +129,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1145,7 +1145,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 716c1bbf07b26ec1fdd93c46cd3f4a217525852e..d050f5158059a4182c5071d13917e57a7009b42a 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -375,7 +375,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index b8bad89bf8eed202bc059a5003a26c94d5b84e79..6e69885cc40c083a8f886f0ce213cb3be5ca2c32 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -563,7 +563,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 5127183ab887ef7bbb8680648df0510f6d042cd0..3052784fd1733f789dc8a27f5cf5f42a68dab48f 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -995,7 +995,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 3ba519c05dff642550b2fa81539850968c0b9f03..f4be6df0b3a37b03dd0bc9f9e1b3a91e942ede98 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -632,7 +632,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 57f65ea45fe1b77a98afbad50b727d9430e91a88..f949a3b9d34fa96c5244aea0b81bec0cc69c79cd 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -1072,7 +1072,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index a1b0e1e39d88614f261a853b1a511528e8616882..33e1f66c92b5b4e94d89851625e9844755c7f612 100644 (file)
@@ -98,7 +98,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -332,7 +332,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 900a44fce7f375e837521b2ac48c855a9f295921..034d21a9fceb9fa139a965a2d57826648f8da13c 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -520,7 +520,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index eec43af5dc81fc470eaa7fa660f482096f22754f..100b8a9898fa962ccd8494502d3034a2072e4e7d 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -955,7 +955,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 19ef26af2b794923c9630cfd93f67045c4491bf4..7c124fa39eb9c841ef57c767377c261e710fabb2 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -520,7 +520,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 4605d0fd0746db97c87fbeb0c62445a0f24ec5de..5364cd30200bf42249db2b30ec5abf5e7dce6611 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_VF_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
@@ -955,7 +955,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_F_sse4_1_double
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_pd(fr->ic->k_rf);
     krf2             = _mm_set1_pd(fr->ic->k_rf*2.0);
index 90bd78a291da93ef8d3eb35e9d15d0d83b57221b..99801883935159f30b835b335637a32bf36f52ce 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2017, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
index c607f2950d66faa80d841aff457a5f9ab385cdef..2115c8ef5e0b4e7c04617c3c5a102a2579966df5 100644 (file)
@@ -182,7 +182,7 @@ void
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
     /* #if KERNEL_ELEC != 'None' */
-    facel            = _mm_set1_pd(fr->epsfac);
+    facel            = _mm_set1_pd(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     /*     #if 'ReactionField' in KERNEL_ELEC */
     krf              = _mm_set1_pd(fr->ic->k_rf);
@@ -198,7 +198,7 @@ void
     /* #if 'LJEwald' in KERNEL_VDW */
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald      = _mm_set1_pd(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_pd(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_pd(fr->ic->ewaldcoeff_lj);
     ewclj2           = _mm_mul_pd(minus_one,_mm_mul_pd(ewclj,ewclj));
     /* #endif */
 
@@ -231,7 +231,7 @@ void
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_pd(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_pd((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_pd((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
     /* #endif */
 
     /* #if 'Water' in GEOMETRY_I */
@@ -272,9 +272,9 @@ void
     /* #if KERNEL_MOD_ELEC!='None' or KERNEL_MOD_VDW!='None' */
     /*     #if KERNEL_ELEC!='None' */
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     /*     #else */
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     /*     #endif */
     rcutoff          = _mm_set1_pd(rcutoff_scalar);
     rcutoff2         = _mm_mul_pd(rcutoff,rcutoff);
@@ -282,15 +282,15 @@ void
 
     /* #if KERNEL_MOD_VDW=='PotentialShift' */
     sh_vdw_invrcut6  = _mm_set1_pd(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_pd(fr->rvdw);
+    rvdw             = _mm_set1_pd(fr->ic->rvdw);
     /* #endif */
 
     /* #if 'PotentialSwitch' in [KERNEL_MOD_ELEC,KERNEL_MOD_VDW] */
     /*     #if KERNEL_MOD_ELEC=='PotentialSwitch'  */
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /*     #else */
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_pd(rswitch_scalar);
     /*     #endif */
     /* Setup switch parameters */
index 20d9a65d9abc8ebac3f95a0d67b10d5e76814283..bf32895b3e03525ed10444eba4e732e0872f8c32 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -515,7 +515,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 382b1729a7f9468973591b693ce95cd5e382cb87..9fac14c80374425328658674be03489c0c51addc 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -771,7 +771,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 747e1cfa6e04dabca39e3190665ebc19d09e7f0c..796dfeafd1f7dfadca2fa4059db0a68339a7a95a 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1389,7 +1389,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index cac8092f325d5529955bf768cb7db126df34555b..26088cff32c64fc8ce06aa07ca3f8681186a9683 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -857,7 +857,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 2a7ae754c995cec6c83e474d9c6ee86154e32d03..2cc0e2aecfdf7b84a7adb261222fa54f0db6948e 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1485,7 +1485,7 @@ nb_kernel_ElecCSTab_VdwCSTab_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 92e7c1e2e202aa05e184c631c690d5642d3d9eca..3b83d9c61d22a6bef3891ebe3bb4bd554db591b3 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -475,7 +475,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 461b4ff795228aa721a72cf1387fb63468c29cb7..74e431d15b266a271b51c4ba56dd487d2e1acab0 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -731,7 +731,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index d065285af8a58fac94651fa87797402fcee463ad..60957dbfa887142f550826a3303b0a7ecdd74981 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1349,7 +1349,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 715b659a37f05a5090457ed4e6a7ade0c3c3d69d..982d0c150d9ba3f4a841983602b534abe04a744e 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -798,7 +798,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 6812c0606d1cb096ff779046cf91979b67a88233..b79616b616bec8e89de7263413cafce9204bdde1 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1426,7 +1426,7 @@ nb_kernel_ElecCSTab_VdwLJ_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 76e2afd76e45c3834c9bf3a03229d2225a194b60..1d01d3ef206b6cbc4cd30836df9d262dbb8c8a6d 100644 (file)
@@ -105,7 +105,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -416,7 +416,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 89f5a309c7ce01bf98c01ff2d07e2d5d5d43dd68..5c1218cdbe5684aa425c20c8433c223deff62bad 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -672,7 +672,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 9d31a49941b10915e571d982474b9002f4d4bf69..f981cdc82ba996955bcb82088cf9e8ff391c89dd 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1305,7 +1305,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 01649d5bbac2d566056012db1a945ddfaa3022b4..5f3c3c28df49ece57c2221c794996c723583f655 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -672,7 +672,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index c0cc593832d1ecad5d168de94d945c96c509f5b8..ec361e571958225d9755c8ef3a154122d3ace9de 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
@@ -1305,7 +1305,7 @@ nb_kernel_ElecCSTab_VdwNone_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     vftab            = kernel_data->table_elec->data;
index 066c7da4d65613f17663d682b18a2622b6100775..2e21920055d504db3d952d63c30475adfbb56814 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -499,7 +499,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 368501203047840aa69d8f26e7844cab658db6fb..c2bf2c449a5e67f769f7bd7a2cd209a103007396 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -689,7 +689,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 0b75564150b989d90886378cb5a28244e8d080a2..dd37c5171ddf0a57ec2b184e93ec0a0b7718c83a 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1109,7 +1109,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 00e97475939100d1e1dbe5dac2c15b9142f4352b..5a6904bfa7783558b357d24fe78424517448f131 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -758,7 +758,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 861d6bab116693e919fee4ac3ecee031b0cd1c5b..0c21067d05aa20d18713b97593ec776d1b8c432e 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1188,7 +1188,7 @@ nb_kernel_ElecCoul_VdwCSTab_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 95599520c8978a16094918a4fcac872657a7e070..90001df5aa33bd60cef9f274bd1e4364216826f8 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -429,7 +429,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 6d7c3fb0b41b79f16564a3e9106f5eaa95a4def8..d70cfaaff70818a295b141ef2db5bda1a86da2e7 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -619,7 +619,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 60ffd5e842aa80f516316f7acf9b30b337d83a79..5cf02ab7756bab121cc1fd226eaa472fb7164fb5 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1039,7 +1039,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 09f07227213a660644f88c8da65351e1fcb98875..42ecc4d15d3d8589b80690ff26989af2882d72af 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -688,7 +688,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 63e31526f7fec198c78031b9252893f412ee6f8f..712083669ee29cb853fa820e690b8f3ea14ea3e6 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1118,7 +1118,7 @@ nb_kernel_ElecCoul_VdwLJ_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 337e2619f8e6a5a738866f76f199fc7330d22eb4..cfdaedaccebd27284b60049ef414cb081aeb23e3 100644 (file)
@@ -101,7 +101,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
@@ -374,7 +374,7 @@ nb_kernel_ElecCoul_VdwNone_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Avoid stupid compiler warnings */
index bd43453cc342ca18df309e5b251ffecd6422e8af..65018488bf53fd8477c92e4dac34bcd1828ccd95 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -564,7 +564,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 965d6cde240d53db442909af7ee38821c46489f9..4e91f8b78d9b2837f7e6caf347563ca229c543ec 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -999,7 +999,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index b4ca63bf14642d90c85096c45d8f643c603b49cf..8be463cd59f0fda4fd669131c22303d16a7982c4 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -564,7 +564,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index 5cb0e34b07f672b27ecab358e2defd5787e04c5f..fd3daad2ed60792ffd7873768fc44dc21d7ccb21 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
@@ -999,7 +999,7 @@ nb_kernel_ElecCoul_VdwNone_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     /* Setup water-specific parameters */
index bb936975874df11a04920d1ffce46780e64e077d..c08a21ab033916da1b0f0c7e819544f0fd034c26 100644 (file)
@@ -115,14 +115,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -131,12 +131,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_VF_sse4_1_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -539,14 +539,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -555,12 +555,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomP1P1_F_sse4_1_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 4ae515a3e5ecf0b1bbcb246e5a9e438ff125eb4e..a9f80fdd0a97c8d088e2fca1430b1b0ddd5865d3 100644 (file)
@@ -123,14 +123,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -146,12 +146,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_VF_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -835,14 +835,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -858,12 +858,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3P1_F_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 31c35a160403be4593a0c42fb843f04f0f478784..719e4c790db75ab0996634a9a64bbf6cb8ab6a78 100644 (file)
@@ -139,14 +139,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -179,12 +179,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_VF_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1564,14 +1564,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1604,12 +1604,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW3W3_F_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 5f62aa61034125c3331f5d5fcdc347066a676d36..461f901ad38fae1e84e3e033154bf41d1caa4d51 100644 (file)
@@ -127,14 +127,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -150,12 +150,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_VF_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -931,14 +931,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -954,12 +954,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4P1_F_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 446c70e4a6fc8509cba0100af429c072dce331d6..1e9844d156ac1933f466f5e1fee0eafdde90f41b 100644 (file)
@@ -145,14 +145,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -185,12 +185,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_VF_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1670,14 +1670,14 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1710,12 +1710,12 @@ nb_kernel_ElecEwSh_VdwLJEwSh_GeomW4W4_F_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 1af6577f6cea064e353407bf2d328f656ae8fd0f..3d50da122a34fc67c44adff02c511516a3d93ab7 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -122,12 +122,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_VF_sse4_1_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -503,7 +503,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -515,12 +515,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomP1P1_F_sse4_1_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 6618b49adc812022e50a879cca152729ed957596..ec0de378b9bb0027b744daa17a077c94c0c8b379 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -135,12 +135,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_VF_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -795,7 +795,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -814,12 +814,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3P1_F_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 7daee90ef69e4bc7cefe427b3e04f1f03585b368..5d5e9e4b34dd1b8150686ce5469281d5dd2600c7 100644 (file)
@@ -126,7 +126,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -161,12 +161,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_VF_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1521,7 +1521,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1556,12 +1556,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW3W3_F_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 3afea5d7cd8034f64611104d1fb9cf684b5bada7..5775a20b29dfcddc21e52891779130c5befe8683 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -138,12 +138,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_VF_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -882,7 +882,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -901,12 +901,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4P1_F_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index afa02ba193f5230eee73447e209209f4e6b0bac1..340dabdecf7a7ccd091600b9c31e97ea196e9a7a 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -166,12 +166,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_VF_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1618,7 +1618,7 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1653,12 +1653,12 @@ nb_kernel_ElecEwSh_VdwLJSh_GeomW4W4_F_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index c4cb9966ee5476ad08272f5ef9df94e916c523cd..d531f41c227e9bbe643f3fcb13e2e3eabeb189a2 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -113,7 +113,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_VF_sse4_1_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -441,7 +441,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -450,7 +450,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomP1P1_F_sse4_1_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 4df45c431c14e6594bcb5d33a2ddad1394f84286..5fc48b05734eb1d0efc6cacc31ee8b2122cf73d2 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -125,7 +125,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_VF_sse4_1_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -733,7 +733,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -748,7 +748,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3P1_F_sse4_1_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index f2ef2c7f64256aa6e79edf10b9e658d004ff133f..e25778634f04c677ba7f201bf82429d0b112cedf 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -148,7 +148,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_VF_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1474,7 +1474,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1502,7 +1502,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW3W3_F_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 23da9f20db679679d473e148da6d2b6733ba1512..75b21f302a9c52cb301893c58291aa31261df719 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -125,7 +125,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_VF_sse4_1_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -733,7 +733,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -748,7 +748,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4P1_F_sse4_1_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 520044eb9da7199dc625a3cd43d2fff19f347989..91c9ec63186c6961e34a7fbe91454498615e5409 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -148,7 +148,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_VF_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1474,7 +1474,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1502,7 +1502,7 @@ nb_kernel_ElecEwSh_VdwNone_GeomW4W4_F_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 4bda51e551690e58efdd2b4ec79ff2ecc5fff3ae..c7c4ecbd164c5da8aa78f4b8465680a54de76bcf 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -124,11 +124,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_VF_sse4_1_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -540,7 +540,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -552,11 +552,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomP1P1_F_sse4_1_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index ca906e67ee1e3aeddb2925bac5900fe6ffd07ab5..728866ce90e3a4cf51025fba61ddd086ef44ef9e 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -137,11 +137,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_VF_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -876,7 +876,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -895,11 +895,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3P1_F_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index e8720c7ceca322e96baa277e090dedce27ef08c7..f467e69643f8c54e068ddca3bbc5e2d5552be2cc 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -163,11 +163,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_VF_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1734,7 +1734,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1769,11 +1769,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW3W3_F_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 66201c28d414c6478508ab61713a1e4c882e8102..e1efb13df1c2ccee1a8dbccf780cc6617133d9a4 100644 (file)
@@ -121,7 +121,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -140,11 +140,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_VF_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -988,7 +988,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1007,11 +1007,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4P1_F_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 06a8860963ff584ec0f293ff11977d7635d5b384..9e211584b2317fa8f183f989ceb2e73304360c2c 100644 (file)
@@ -133,7 +133,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -168,11 +168,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_VF_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1856,7 +1856,7 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1891,11 +1891,11 @@ nb_kernel_ElecEwSw_VdwLJSw_GeomW4W4_F_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index dc00e65e62d74ce0264e8dadb04a4c0d3cafd115..a5648865985765b689264243bfe0b609e0fc8db7 100644 (file)
@@ -106,7 +106,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -115,11 +115,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_VF_sse4_1_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -479,7 +479,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -488,11 +488,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomP1P1_F_sse4_1_single
     ewtabhalfspace   = _mm_set1_ps(0.5/fr->ic->tabq_scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 4982a17a7faefb269d94e6b26ec487ca0039dd35..2cce7575b0f97d26ef4cc490b27cbd760f87029a 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -127,11 +127,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_VF_sse4_1_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -815,7 +815,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -830,11 +830,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3P1_F_sse4_1_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index ca413ad6a76d5946550a266777f020d090e16175..1a0c5468ca95ceb00ebab855766bfe31afb6df96 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -150,11 +150,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_VF_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1688,7 +1688,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1716,11 +1716,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW3W3_F_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index a16bd5543d7f76fa0cf8af3224cd8bf3384eb498..5788de19afcf9b6e9b9a2e90345db85d27a3f2f5 100644 (file)
@@ -112,7 +112,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -127,11 +127,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_VF_sse4_1_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -815,7 +815,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -830,11 +830,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4P1_F_sse4_1_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index e7343ec22f2e8ab7fe6d53e3273c8bd748f0241b..659eba2a49a79417f983bf59dc21f308df867d53 100644 (file)
@@ -122,7 +122,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -150,11 +150,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_VF_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1688,7 +1688,7 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1716,11 +1716,11 @@ nb_kernel_ElecEwSw_VdwNone_GeomW4W4_F_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 505853483731cf16e55b464e1389dca046e37014..5a943b6d74a01ae304ecdee654fded3ed983795f 100644 (file)
@@ -114,7 +114,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -536,7 +536,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index fd1e8bcfba2d34765f0b9401ab2cbe082476e9db..a8d31605cba4f641134746d37ca57ce50a366fe8 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -788,7 +788,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 50fa47dbbfd900324ca82b4e4770ac04f6d1215b..5c33b4067016be95212fe55b889505260cd65faa 100644 (file)
@@ -130,7 +130,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1394,7 +1394,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 4e9b090c73d78a1175a33e23b0cebc17c1d9dc93..9609de3a5f593eab792d3aa17d0ad1cf157c05b0 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -862,7 +862,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 72d4af0bb50d3258db16bbc6ce7476ace53a888b..847faf9a16f7e3521cb81de0d16bd422590c0e7a 100644 (file)
@@ -135,7 +135,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1478,7 +1478,7 @@ nb_kernel_ElecEw_VdwCSTab_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 5222b0e77de5e0cabe7f143e4ada353e11f87690..0c57927fb9451b6da853007ce0c50dff48f5f72c 100644 (file)
@@ -115,14 +115,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -507,14 +507,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index abbcfada47203f8b4abb2b543fe43923033ceffc..199ecb22be5fba3fbe545334b3aed2b0752b882c 100644 (file)
@@ -123,14 +123,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -763,14 +763,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index a9085e40c2a8e3236fbe05f103960ad07d11aae0..ccb33cb59d7b88b0b66cf74edb57032261ee2e1e 100644 (file)
@@ -139,14 +139,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1372,14 +1372,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index 16a021ed73de3c0a0f615c90ace401c437cc7af3..3d2daccdf3bfa1b7e7a86902ecaa0411aa854adc 100644 (file)
@@ -127,14 +127,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -841,14 +841,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index 05af10eefa2ebca69c2ac7b73b0392d7e1a8c644..51d24699545c5efbc40d91fcadf98fa65962bc1e 100644 (file)
@@ -145,14 +145,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1460,14 +1460,14 @@ nb_kernel_ElecEw_VdwLJEw_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index 72a0cb8461d7619d1bf75d3c7e61f5b505d5483d..38b13cc327c84b67be55a48ef3fda271a9368a58 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -471,7 +471,7 @@ nb_kernel_ElecEw_VdwLJ_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 08b69ade870c6c8d38ad35c8cb31dc6059022d5f..4d85602a9be638060b59aae7acc8a51413b311fc 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -723,7 +723,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 60c189a5b80409be8f5ba9c9e8e1229f10c57525..7710001a5249860644ea8e7c97e9553cb9d75fe7 100644 (file)
@@ -126,7 +126,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1329,7 +1329,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 784184d1a4f99039de10f88190c80d2528e8165b..2b66c39b8708a8a95bd8ad5ec38ac5710b6d6e1c 100644 (file)
@@ -119,7 +119,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -792,7 +792,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 0457bb57f3f2e0625695c240e797adc6421165df..9129e60f8f0cedbc2836d6540c11fbd7bdaff2bf 100644 (file)
@@ -131,7 +131,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -1408,7 +1408,7 @@ nb_kernel_ElecEw_VdwLJ_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
index 37aa63e1359af658a93b89327ac6e36d79bc20aa..0e66a1303715d2a3aa3992b301f68b55ae8aa16e 100644 (file)
@@ -104,7 +104,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -416,7 +416,7 @@ nb_kernel_ElecEw_VdwNone_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index 910fb87d3f033a9d031e81023c1f09078a48fc60..3131f357cf385595404b0e07a219a9a782b6a16b 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -668,7 +668,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index 148d494e01d8c6a5df29b087c312a7e1e9bb043a..c11c8a88bb8db8e22c8ee3c18bbf9244eabcbd79 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1289,7 +1289,7 @@ nb_kernel_ElecEw_VdwNone_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index e929fd894c8ac36361c0ff33ffc8de0abdadad79..c123f676140eacb61f9a58aa08c0636600f5b7a3 100644 (file)
@@ -110,7 +110,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -668,7 +668,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index f983622dd688623850ce9d74f88347c2cdf9688f..84335d9bf7e99832d1cafec7cc0b54be13c80e18 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
@@ -1289,7 +1289,7 @@ nb_kernel_ElecEw_VdwNone_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     sh_ewald         = _mm_set1_ps(fr->ic->sh_ewald);
index 36f2ff536d132a7bf36b3a7d148140d1819c9a38..88351ac65a6ae74e40ce42ebc61b96ff58bca801 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -128,7 +128,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_VF_sse4_1_single
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -584,7 +584,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -597,7 +597,7 @@ nb_kernel_ElecGB_VdwCSTab_GeomP1P1_F_sse4_1_single
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 293c680a276c4c664aaecf488c4c13053e85226c..8437ac268d13066dd0e7bf857866052ed78ade44 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -125,7 +125,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_VF_sse4_1_single
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -531,7 +531,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     nvdwtype         = fr->ntype;
     vdwparam         = fr->nbfp;
@@ -541,7 +541,7 @@ nb_kernel_ElecGB_VdwLJ_GeomP1P1_F_sse4_1_single
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 9bc65d6b07a325d018d866cc157685f6ae3b3c50..3b150dddcb2cb94bfc728d92a079144140564bfc 100644 (file)
@@ -109,14 +109,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -472,14 +472,14 @@ nb_kernel_ElecGB_VdwNone_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
 
     invsqrta         = fr->invsqrta;
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 915d003c0dd2c964f8b8d565eab2baa6b4c1178d..fc41e2e48a4930a3d63bd3b438542e9ba928e16f 100644 (file)
@@ -115,15 +115,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_VF_sse4_1_single
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -478,15 +478,15 @@ nb_kernel_ElecNone_VdwLJEwSh_GeomP1P1_F_sse4_1_single
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 9ab3970b3cc5c82dc3bbf016f094c9ca2ea8c43a..b12d88b3f5f93a9d7540bd435bd1fe8e865acdfc 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_VF_sse4_1_single
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
@@ -449,7 +449,7 @@ nb_kernel_ElecNone_VdwLJEw_GeomP1P1_F_sse4_1_single
     vdwtype          = mdatoms->typeA;
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
 
     /* Avoid stupid compiler warnings */
index f00257d89c12b2fb7a173dbfa4c5b4d4fdf920b3..717e01a8e65bc393cf63aac212388c329b3257e6 100644 (file)
@@ -109,12 +109,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_VF_sse4_1_single
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -432,12 +432,12 @@ nb_kernel_ElecNone_VdwLJSh_GeomP1P1_F_sse4_1_single
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 9cd0fea739c7c83a86b50f0638a470e3d3fc80d0..da4fa7676a88d1a138ef98c478270f330457fa92 100644 (file)
@@ -111,11 +111,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_VF_sse4_1_single
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -474,11 +474,11 @@ nb_kernel_ElecNone_VdwLJSw_GeomP1P1_F_sse4_1_single
     vdwparam         = fr->nbfp;
     vdwtype          = mdatoms->typeA;
 
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index c151637ac28a7bf20ce2fe7a62c516a767d4b2ba..736412e17cb26a4eb5502f4d9823d3afd166e15b 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -124,7 +124,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_VF_sse4_1_single
     vftabscale       = _mm_set1_ps(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -529,7 +529,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -542,7 +542,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomP1P1_F_sse4_1_single
     vftabscale       = _mm_set1_ps(kernel_data->table_vdw->scale);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 10ea983867f025d81393d1009d96935d3a14df02..51930bbd0c55d06cd94032b392bffd7878e47a5e 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -137,7 +137,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_VF_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -759,7 +759,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -779,7 +779,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3P1_F_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 84ff9024e9a2fc7a0278b796f3cecb995b00d2ca..b53b9fe3b8c0b4b9560cecca3dc8e204aeac3ab1 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -163,7 +163,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_VF_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1299,7 +1299,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1335,7 +1335,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW3W3_F_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index f8d1b9094fa3b239658a8811d13745fd883eefa6..5c6cd909bb63ef1ec04914a1937c4b8ab7f81d8c 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -140,7 +140,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_VF_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -826,7 +826,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -846,7 +846,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4P1_F_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index ca1682ad354378ef4e24938d4074b95215619511..cb7369c7e7dd77c146f3bb8742d0cd320c103f4b 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -168,7 +168,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_VF_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1396,7 +1396,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1432,7 +1432,7 @@ nb_kernel_ElecRFCut_VdwCSTab_GeomW4W4_F_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index e7d883a6951e79ae441ff06d6024ac5a208a759a..76225a2053a0b853714f95da8d955830a3b24f90 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -117,12 +117,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_VF_sse4_1_single
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -464,7 +464,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -474,12 +474,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomP1P1_F_sse4_1_single
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 7b3aa4c3f5fda9c2610e49796bf4aca8cb104403..df8f9b61ebeb6392ad1249a9d62c2d151d8080a7 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -130,12 +130,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_VF_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -694,7 +694,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -711,12 +711,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3P1_F_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index dd1f4f89ace774fc48b179ba99474bb38353b020..fb97e235cb605335faf5321d74ba2e2696b86be5 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -156,12 +156,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_VF_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1234,7 +1234,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1267,12 +1267,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW3W3_F_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 6503765302f80e1fd4024d7b7b30c656649cb7d5..704118a366ac47ffa315a4788796091e104c267e 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -133,12 +133,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_VF_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -781,7 +781,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -798,12 +798,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4P1_F_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 6d1ea3797d2f02cd42fb694b79b3dfcd35f35519..60eeca5942707e4c9dd0681b667314ccfa35ec5b 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -161,12 +161,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_VF_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
@@ -1331,7 +1331,7 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1364,12 +1364,12 @@ nb_kernel_ElecRFCut_VdwLJSh_GeomW4W4_F_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
 
     /* Avoid stupid compiler warnings */
     jnrA = jnrB = jnrC = jnrD = 0;
index 0666ad3d9494bc145aa8649b3368a5574e73a313..879b3e64c2aa3f304d4b2ebec7aa649e942fe3ff 100644 (file)
@@ -109,7 +109,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -119,11 +119,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_VF_sse4_1_single
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -502,7 +502,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -512,11 +512,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomP1P1_F_sse4_1_single
     vdwtype          = mdatoms->typeA;
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 6687795609c9c68461dbf3b190a58d11ac51e9cd..226be67c81f6e12ece61d73ab2710407b4728c51 100644 (file)
@@ -115,7 +115,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -132,11 +132,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_VF_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -732,7 +732,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -749,11 +749,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3P1_F_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index efe1115da63d60f44577d234fbda9f25095b5bee..75161e2fe79c2de3ff1593fe8b2f1d17b9200b9b 100644 (file)
@@ -125,7 +125,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -158,11 +158,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_VF_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1272,7 +1272,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1305,11 +1305,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW3W3_F_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 1291014b4af58918fd2e62ee5f4c8316c5ebb270..24617b38db5e7a7dd734654c46e8b67a104b91c7 100644 (file)
@@ -118,7 +118,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -135,11 +135,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_VF_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -821,7 +821,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -838,11 +838,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4P1_F_sse4_1_single
     vdwioffset0      = 2*nvdwtype*vdwtype[inr+0];
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index 6c3a3272872ba2d1fdb474343a93d509718f24e8..986a70a933e40460cf4bd85313f762180cb797f3 100644 (file)
@@ -130,7 +130,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -163,11 +163,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_VF_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
@@ -1371,7 +1371,7 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1404,11 +1404,11 @@ nb_kernel_ElecRFCut_VdwLJSw_GeomW4W4_F_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /* Setup switch parameters */
     d_scalar         = rcutoff_scalar-rswitch_scalar;
index bbf6b4d26c3777dbcf9ebfbf46202e751990707f..1823fb31c4b64e2528ee046b58f45b12b72e263a 100644 (file)
@@ -101,14 +101,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
     crf              = _mm_set1_ps(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -402,14 +402,14 @@ nb_kernel_ElecRFCut_VdwNone_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
     crf              = _mm_set1_ps(fr->ic->c_rf);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 3a0e910fb7e959871807acef8f20f91805caad1c..60d790a908f2080e46a6f2ebce42789a9c659292 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -120,7 +120,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_VF_sse4_1_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -632,7 +632,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -645,7 +645,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3P1_F_sse4_1_single
     iq2              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+2]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 46c590249c280cdd54fdcaae8e035e0bb5d2f899..0664bfffb5b876602dea28cedbf29793cfe60528 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -143,7 +143,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_VF_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1187,7 +1187,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1213,7 +1213,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW3W3_F_sse4_1_single
     qq22             = _mm_mul_ps(iq2,jq2);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 7de52daf0219c25dfa2aeea3fdab396ecfdb5692..b3dbcbebc0e6d2d833be7d5a9b703da254831826 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -120,7 +120,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_VF_sse4_1_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -632,7 +632,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -645,7 +645,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4P1_F_sse4_1_single
     iq3              = _mm_mul_ps(facel,_mm_set1_ps(charge[inr+3]));
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index b65bbeb00041f47eafb2dc9e8f2e119bbb992137..8be4d534adc07545d79613306f7ed997cb5f8025 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -143,7 +143,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_VF_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
@@ -1187,7 +1187,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1213,7 +1213,7 @@ nb_kernel_ElecRFCut_VdwNone_GeomW4W4_F_sse4_1_single
     qq33             = _mm_mul_ps(iq3,jq3);
 
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
 
index 910842b6297c31e86cef42e3b13610eac432802b..7058744bd4bca7fd48afbb91be03ffad6123fd1a 100644 (file)
@@ -111,7 +111,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -502,7 +502,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index ec21d92bb263750cb29beaa5980f1bf3a140227b..b150d4ca56d6d9930f8ac8f3a965eb23df0252aa 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -692,7 +692,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 96599a3fdf3a4844f4be1b7d917345f637dee92f..2b8182749154f20229eaa78201507a82396dd4ea 100644 (file)
@@ -127,7 +127,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1112,7 +1112,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index f74bb1452981b418ddd1be51e4abc76807b8ed66..48a241e2e132752db2874103c13f3f1528ad3e95 100644 (file)
@@ -120,7 +120,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -761,7 +761,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 30ae5f340dd9f2f666d8678ce9b85b4dcab0bca1..30be3d0846f6f355db2a3f27b498484a475ff340 100644 (file)
@@ -132,7 +132,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1191,7 +1191,7 @@ nb_kernel_ElecRF_VdwCSTab_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index e5e8fb066593300d180e3ffe566ce4ed64fe6f41..3a2a79d20351d5364031be81b25a322a77636282 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -432,7 +432,7 @@ nb_kernel_ElecRF_VdwLJ_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index ca7ace6e589942617782a62810f96c3a0e38520d..49dd12a2a44dc45b18e31da266c2dd6eef141a0c 100644 (file)
@@ -113,7 +113,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -622,7 +622,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index f7873e4648323bfdc7903d0579031456fdd99e82..0fe89de77d902022ac8c55c0ad921bd318548523 100644 (file)
@@ -123,7 +123,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1042,7 +1042,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 6d597c7e4a51e8064ee6cd8056bf94b463f9ce46..b2ed947865f77b831b0d2a742ad7dd2349fb3f9a 100644 (file)
@@ -116,7 +116,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -691,7 +691,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index bc53eee46a1db8a4005c6dfd4971db54a30ea6ee..1195d1a49e4dec5de894b0daeae191fe031ef07d 100644 (file)
@@ -128,7 +128,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1121,7 +1121,7 @@ nb_kernel_ElecRF_VdwLJ_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 326ba8ad8b790072b27b1ebd3e0c224db9dbde01..54b8275d94ba4d3d84ff5cdfce33f6d7efc45225 100644 (file)
@@ -101,7 +101,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -377,7 +377,7 @@ nb_kernel_ElecRF_VdwNone_GeomP1P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 3f1f49386bf8c7aad0775609af47197c637f900e..0c9f96a4709082710e43dca51cad5320c1baecfc 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -567,7 +567,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index c345451b416a0c60616292f111d42a4d37ba9029..535ea7175f925aee761b0bb4dc33f96c99b5bd9d 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1002,7 +1002,7 @@ nb_kernel_ElecRF_VdwNone_GeomW3W3_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 1c806d3d396b593186c506c4ae7682e783d4051a..2ae9dd23f2700b0816da652acd50d4f09c28f57e 100644 (file)
@@ -107,7 +107,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -567,7 +567,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4P1_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index 2dcb81a66b75ecf8a52cb4e790557f18b567704d..f74bb9f1342bc0697fbd5420988e9c29ba7a47db 100644 (file)
@@ -117,7 +117,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_VF_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
@@ -1002,7 +1002,7 @@ nb_kernel_ElecRF_VdwNone_GeomW4W4_F_sse4_1_single
     gid              = nlist->gid;
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     krf              = _mm_set1_ps(fr->ic->k_rf);
     krf2             = _mm_set1_ps(fr->ic->k_rf*2.0);
index c8cb9655af5ff0aafb2f1484c8682be9e1a50c9b..e2f9d452a5fb81d56d231abe3274e83dd3b86518 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2013,2014,2015, by the GROMACS development team, led by
+ * Copyright (c) 2012,2013,2014,2015,2017, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
index 99f3622cb1103af753250e5b7d5e5f0f73d8dbf4..f66ab5e5da6ef30a02b2f72bb1473477d820a3cb 100644 (file)
@@ -185,7 +185,7 @@ void
     shiftvec         = fr->shift_vec[0];
     fshift           = fr->fshift[0];
     /* #if KERNEL_ELEC != 'None' */
-    facel            = _mm_set1_ps(fr->epsfac);
+    facel            = _mm_set1_ps(fr->ic->epsfac);
     charge           = mdatoms->chargeA;
     /*     #if 'ReactionField' in KERNEL_ELEC */
     krf              = _mm_set1_ps(fr->ic->k_rf);
@@ -201,7 +201,7 @@ void
     /* #if 'LJEwald' in KERNEL_VDW */
     vdwgridparam     = fr->ljpme_c6grid;
     sh_lj_ewald             = _mm_set1_ps(fr->ic->sh_lj_ewald);
-    ewclj            = _mm_set1_ps(fr->ewaldcoeff_lj);
+    ewclj            = _mm_set1_ps(fr->ic->ewaldcoeff_lj);
     ewclj2          = _mm_mul_ps(minus_one,_mm_mul_ps(ewclj,ewclj));
     /* #endif */
 
@@ -234,7 +234,7 @@ void
     dvda             = fr->dvda;
     gbtabscale       = _mm_set1_ps(fr->gbtab->scale);
     gbtab            = fr->gbtab->data;
-    gbinvepsdiff     = _mm_set1_ps((1.0/fr->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
+    gbinvepsdiff     = _mm_set1_ps((1.0/fr->ic->epsilon_r) - (1.0/fr->gb_epsilon_solvent));
     /* #endif */
 
     /* #if 'Water' in GEOMETRY_I */
@@ -275,9 +275,9 @@ void
     /* #if KERNEL_MOD_ELEC!='None' or KERNEL_MOD_VDW!='None' */
     /*     #if KERNEL_ELEC!='None' */
     /* When we use explicit cutoffs the value must be identical for elec and VdW, so use elec as an arbitrary choice */
-    rcutoff_scalar   = fr->rcoulomb;
+    rcutoff_scalar   = fr->ic->rcoulomb;
     /*     #else */
-    rcutoff_scalar   = fr->rvdw;
+    rcutoff_scalar   = fr->ic->rvdw;
     /*     #endif */
     rcutoff          = _mm_set1_ps(rcutoff_scalar);
     rcutoff2         = _mm_mul_ps(rcutoff,rcutoff);
@@ -285,15 +285,15 @@ void
 
     /* #if KERNEL_MOD_VDW=='PotentialShift' */
     sh_vdw_invrcut6  = _mm_set1_ps(fr->ic->sh_invrc6);
-    rvdw             = _mm_set1_ps(fr->rvdw);
+    rvdw             = _mm_set1_ps(fr->ic->rvdw);
     /* #endif */
 
     /* #if 'PotentialSwitch' in [KERNEL_MOD_ELEC,KERNEL_MOD_VDW] */
     /*     #if KERNEL_MOD_ELEC=='PotentialSwitch'  */
-    rswitch_scalar   = fr->rcoulomb_switch;
+    rswitch_scalar   = fr->ic->rcoulomb_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /*     #else */
-    rswitch_scalar   = fr->rvdw_switch;
+    rswitch_scalar   = fr->ic->rvdw_switch;
     rswitch          = _mm_set1_ps(rswitch_scalar);
     /*     #endif */
     /* Setup switch parameters */
index 08e6844cddd8a0eecf4a150313b9911028aea334..7835e4589ed834e20ddf2f8dbb387a16f7854234 100644 (file)
@@ -416,6 +416,8 @@ do_pairs_general(int ftype, int nbonds,
     GMX_ASSERT(fr->pairsTable->interaction == GMX_TABLE_INTERACTION_ELEC_VDWREP_VDWDISP,
                "Pair interaction kernels need a table with Coulomb, repulsion and dispersion entries");
 
+    const real epsfac = fr->ic->epsfac;
+
     bFreeEnergy = FALSE;
     for (i = 0; (i < nbonds); )
     {
@@ -433,17 +435,17 @@ do_pairs_general(int ftype, int nbonds,
                      ((md->nPerturbed && (md->bPerturbed[ai] || md->bPerturbed[aj])) ||
                       iparams[itype].lj14.c6A != iparams[itype].lj14.c6B ||
                       iparams[itype].lj14.c12A != iparams[itype].lj14.c12B));
-                qq               = md->chargeA[ai]*md->chargeA[aj]*fr->epsfac*fr->fudgeQQ;
+                qq               = md->chargeA[ai]*md->chargeA[aj]*epsfac*fr->fudgeQQ;
                 c6               = iparams[itype].lj14.c6A;
                 c12              = iparams[itype].lj14.c12A;
                 break;
             case F_LJC14_Q:
-                qq               = iparams[itype].ljc14.qi*iparams[itype].ljc14.qj*fr->epsfac*iparams[itype].ljc14.fqq;
+                qq               = iparams[itype].ljc14.qi*iparams[itype].ljc14.qj*epsfac*iparams[itype].ljc14.fqq;
                 c6               = iparams[itype].ljc14.c6;
                 c12              = iparams[itype].ljc14.c12;
                 break;
             case F_LJC_PAIRS_NB:
-                qq               = iparams[itype].ljcnb.qi*iparams[itype].ljcnb.qj*fr->epsfac;
+                qq               = iparams[itype].ljcnb.qi*iparams[itype].ljcnb.qj*epsfac;
                 c6               = iparams[itype].ljcnb.c6;
                 c12              = iparams[itype].ljcnb.c12;
                 break;
@@ -488,7 +490,7 @@ do_pairs_general(int ftype, int nbonds,
         if (bFreeEnergy)
         {
             /* Currently free energy is only supported for F_LJ14, so no need to check for that if we got here */
-            qqB              = md->chargeB[ai]*md->chargeB[aj]*fr->epsfac*fr->fudgeQQ;
+            qqB              = md->chargeB[ai]*md->chargeB[aj]*epsfac*fr->fudgeQQ;
             c6B              = iparams[itype].lj14.c6B*6.0;
             c12B             = iparams[itype].lj14.c12B*12.0;
 
@@ -644,7 +646,7 @@ do_pairs(int ftype, int nbonds,
          int *global_atom_index)
 {
     if (ftype == F_LJ14 &&
-        fr->vdwtype != evdwUSER && !EEL_USER(fr->eeltype) &&
+        fr->ic->vdwtype != evdwUSER && !EEL_USER(fr->ic->eeltype) &&
         !bCalcEnergyAndVirial && fr->efep == efepNO)
     {
         /* We use a fast code-path for plain LJ 1-4 without FEP.
@@ -662,7 +664,7 @@ do_pairs(int ftype, int nbonds,
         do_pairs_simple<SimdReal, GMX_SIMD_REAL_WIDTH,
                         const real *>(nbonds, iatoms, iparams,
                                       x, f, pbc_simd,
-                                      md, fr->epsfac*fr->fudgeQQ);
+                                      md, fr->ic->epsfac*fr->fudgeQQ);
 #else
         /* This construct is needed because pbc_dx_aiuc doesn't accept pbc=NULL */
         t_pbc        pbc_no;
@@ -681,7 +683,7 @@ do_pairs(int ftype, int nbonds,
         do_pairs_simple<real, 1,
                         const t_pbc *>(nbonds, iatoms, iparams,
                                        x, f, pbc_nonnull,
-                                       md, fr->epsfac*fr->fudgeQQ);
+                                       md, fr->ic->epsfac*fr->fudgeQQ);
 #endif
     }
     else
index 8142fc23e5407753bf068709bd713e3fd883f2da..a4ee301324a60c4b4e91398ca9f6df7131e38972 100644 (file)
@@ -347,7 +347,7 @@ void do_force_lowlevel(t_forcerec *fr,      t_inputrec *ir,
     /* Check whether we need to do listed interactions or correct for exclusions */
     if (fr->bMolPBC &&
         ((flags & GMX_FORCE_LISTED)
-         || EEL_RF(fr->eeltype) || EEL_FULL(fr->eeltype) || EVDW_PME(fr->vdwtype)))
+         || EEL_RF(fr->ic->eeltype) || EEL_FULL(fr->ic->eeltype) || EVDW_PME(fr->ic->vdwtype)))
     {
         /* TODO There are no electrostatics methods that require this
            transformation, when using the Verlet scheme, so update the
@@ -374,7 +374,7 @@ void do_force_lowlevel(t_forcerec *fr,      t_inputrec *ir,
     /* Do long-range electrostatics and/or LJ-PME, including related short-range
      * corrections.
      */
-    if (EEL_FULL(fr->eeltype) || EVDW_PME(fr->vdwtype))
+    if (EEL_FULL(fr->ic->eeltype) || EVDW_PME(fr->ic->vdwtype))
     {
         int  status            = 0;
         real Vlr_q             = 0, Vlr_lj = 0, Vcorr_q = 0, Vcorr_lj = 0;
@@ -388,7 +388,7 @@ void do_force_lowlevel(t_forcerec *fr,      t_inputrec *ir,
             box_size[ZZ] *= ir->wall_ewald_zfac;
         }
 
-        if (EEL_PME_EWALD(fr->eeltype) || EVDW_PME(fr->vdwtype))
+        if (EEL_PME_EWALD(fr->ic->eeltype) || EVDW_PME(fr->ic->vdwtype))
         {
             real dvdl_long_range_correction_q   = 0;
             real dvdl_long_range_correction_lj  = 0;
@@ -478,7 +478,7 @@ void do_force_lowlevel(t_forcerec *fr,      t_inputrec *ir,
                 wallcycle_sub_stop(wcycle, ewcsEWALD_CORRECTION);
             }
 
-            if (EEL_PME_EWALD(fr->eeltype) && fr->n_tpi == 0)
+            if (EEL_PME_EWALD(fr->ic->eeltype) && fr->n_tpi == 0)
             {
                 /* This is not in a subcounter because it takes a
                    negligible and constant-sized amount of time */
@@ -490,7 +490,7 @@ void do_force_lowlevel(t_forcerec *fr,      t_inputrec *ir,
             enerd->dvdl_lin[efptCOUL] += dvdl_long_range_correction_q;
             enerd->dvdl_lin[efptVDW]  += dvdl_long_range_correction_lj;
 
-            if ((EEL_PME(fr->eeltype) || EVDW_PME(fr->vdwtype)) && (cr->duty & DUTY_PME))
+            if ((EEL_PME(fr->ic->eeltype) || EVDW_PME(fr->ic->vdwtype)) && (cr->duty & DUTY_PME))
             {
                 /* Do reciprocal PME for Coulomb and/or LJ. */
                 assert(fr->n_tpi >= 0);
@@ -568,12 +568,12 @@ void do_force_lowlevel(t_forcerec *fr,      t_inputrec *ir,
             }
         }
 
-        if (!EEL_PME(fr->eeltype) && EEL_PME_EWALD(fr->eeltype))
+        if (!EEL_PME(fr->ic->eeltype) && EEL_PME_EWALD(fr->ic->eeltype))
         {
             Vlr_q = do_ewald(ir, x, as_rvec_array(fr->f_novirsum->data()),
                              md->chargeA, md->chargeB,
                              box_size, cr, md->homenr,
-                             fr->vir_el_recip, fr->ewaldcoeff_q,
+                             fr->vir_el_recip, fr->ic->ewaldcoeff_q,
                              lambda[efptCOUL], &dvdl_long_range_q, fr->ewald_table);
         }
 
@@ -599,7 +599,7 @@ void do_force_lowlevel(t_forcerec *fr,      t_inputrec *ir,
          * With the Verlet scheme, exclusion forces are calculated
          * in the non-bonded kernel.
          */
-        if (ir->cutoff_scheme != ecutsVERLET && EEL_RF(fr->eeltype))
+        if (ir->cutoff_scheme != ecutsVERLET && EEL_RF(fr->ic->eeltype))
         {
             real dvdl_rf_excl      = 0;
             enerd->term[F_RF_EXCL] =
index 93cd302140f55506ec8134256fd2e671fe12ddc8..cd8218352bb25c93b25072c14700263aa8d0265d 100644 (file)
@@ -88,7 +88,7 @@ real RF_excl_correction(const t_forcerec *fr, t_graph *g,
 void calc_rffac(FILE *fplog, int eel, real eps_r, real eps_rf,
                 real Rc, real Temp,
                 real zsq, matrix box,
-                real *kappa, real *krf, real *crf);
+                real *krf, real *crf);
 /* Determine the reaction-field constants */
 
 void init_generalized_rf(FILE *fplog,
index 07b9eea0736ebc78a2cefaab56d23f7360f2356d..f150873c298b3ee4f7ed496f3bb7d2e3d776ef0c 100644 (file)
@@ -920,7 +920,10 @@ static int *cginfo_expand(int nmb, cginfo_mb_t *cgi_mb)
     return cginfo;
 }
 
-static void set_chargesum(FILE *log, t_forcerec *fr, const gmx_mtop_t *mtop)
+/* Sets the sum of charges (squared) and C6 in the system in fr.
+ * Returns whether the system has a net charge.
+ */
+static bool set_chargesum(FILE *log, t_forcerec *fr, const gmx_mtop_t *mtop)
 {
     /*This now calculates sum for q and c6*/
     double         qsum, q2sum, q, c6sum, c6;
@@ -987,15 +990,19 @@ static void set_chargesum(FILE *log, t_forcerec *fr, const gmx_mtop_t *mtop)
                     fr->qsum[0], fr->qsum[1]);
         }
     }
+
+    /* A cut-off of 1e-4 is used to catch rounding errors due to ascii input */
+    return (std::abs(fr->qsum[0]) > 1e-4 ||
+            std::abs(fr->qsum[1]) > 1e-4);
 }
 
 void update_forcerec(t_forcerec *fr, matrix box)
 {
-    if (fr->eeltype == eelGRF)
+    if (fr->ic->eeltype == eelGRF)
     {
-        calc_rffac(nullptr, fr->eeltype, fr->epsilon_r, fr->epsilon_rf,
-                   fr->rcoulomb, fr->temp, fr->zsquare, box,
-                   &fr->kappa, &fr->k_rf, &fr->c_rf);
+        calc_rffac(nullptr, fr->ic->eeltype, fr->ic->epsilon_r, fr->ic->epsilon_rf,
+                   fr->ic->rcoulomb, fr->temp, fr->zsquare, box,
+                   &fr->ic->k_rf, &fr->ic->c_rf);
     }
 }
 
@@ -1019,7 +1026,7 @@ void set_avcsixtwelve(FILE *fplog, t_forcerec *fr, const gmx_mtop_t *mtop)
      * actual C6 values and the C6 values used by the LJ-PME based on
      * combination rules. */
 
-    if (EVDW_PME(fr->vdwtype))
+    if (EVDW_PME(fr->ic->vdwtype))
     {
         nbfp_comb = mk_nbfp_combination_rule(&mtop->ffparams,
                                              (fr->ljpme_combination_rule == eljpmeLB) ? eCOMB_ARITHMETIC : eCOMB_GEOMETRIC);
@@ -1211,7 +1218,7 @@ void set_avcsixtwelve(FILE *fplog, t_forcerec *fr, const gmx_mtop_t *mtop)
         fr->avctwelve[q] = ctwelve;
     }
 
-    if (EVDW_PME(fr->vdwtype))
+    if (EVDW_PME(fr->ic->vdwtype))
     {
         sfree(nbfp_comb);
     }
@@ -1232,23 +1239,20 @@ void set_avcsixtwelve(FILE *fplog, t_forcerec *fr, const gmx_mtop_t *mtop)
 }
 
 
-static void set_bham_b_max(FILE *fplog, t_forcerec *fr,
-                           const gmx_mtop_t *mtop)
+static real calcBuckinghamBMax(FILE *fplog, const gmx_mtop_t *mtop)
 {
     const t_atoms *at1, *at2;
     int            mt1, mt2, i, j, tpi, tpj, ntypes;
     real           b, bmin;
-    real          *nbfp;
 
     if (fplog)
     {
         fprintf(fplog, "Determining largest Buckingham b parameter for table\n");
     }
-    nbfp   = fr->nbfp;
-    ntypes = fr->ntype;
+    ntypes = mtop->ffparams.atnr;
 
-    bmin           = -1;
-    fr->bham_b_max = 0;
+    bmin            = -1;
+    real bham_b_max = 0;
     for (mt1 = 0; mt1 < mtop->nmoltype; mt1++)
     {
         at1 = &mtop->moltype[mt1].atoms;
@@ -1270,10 +1274,10 @@ static void set_bham_b_max(FILE *fplog, t_forcerec *fr,
                     {
                         gmx_fatal(FARGS, "Atomtype[%d] = %d, maximum = %d", j, tpj, ntypes);
                     }
-                    b = BHAMB(nbfp, ntypes, tpi, tpj);
-                    if (b > fr->bham_b_max)
+                    b = mtop->ffparams.iparams[tpi*ntypes + tpj].bham.b;
+                    if (b > bham_b_max)
                     {
-                        fr->bham_b_max = b;
+                        bham_b_max = b;
                     }
                     if ((b < bmin) || (bmin == -1))
                     {
@@ -1286,12 +1290,14 @@ static void set_bham_b_max(FILE *fplog, t_forcerec *fr,
     if (fplog)
     {
         fprintf(fplog, "Buckingham b parameters, min: %g, max: %g\n",
-                bmin, fr->bham_b_max);
+                bmin, bham_b_max);
     }
+
+    return bham_b_max;
 }
 
 static void make_nbf_tables(FILE *fp,
-                            t_forcerec *fr, real rtab,
+                            const interaction_const_t *ic, real rtab,
                             const char *tabfn, char *eg1, char *eg2,
                             t_nblists *nbl)
 {
@@ -1314,7 +1320,7 @@ static void make_nbf_tables(FILE *fp,
         sprintf(buf + strlen(tabfn) - strlen(ftp2ext(efXVG)) - 1, "_%s_%s.%s",
                 eg1, eg2, ftp2ext(efXVG));
     }
-    nbl->table_elec_vdw = make_tables(fp, fr, buf, rtab, 0);
+    nbl->table_elec_vdw = make_tables(fp, ic, buf, rtab, 0);
     /* Copy the contents of the table to separate coulomb and LJ tables too,
      * to improve cache performance.
      */
@@ -1763,6 +1769,95 @@ static void pick_nbnxn_kernel(FILE                *fp,
     }
 }
 
+/*! \brief Print Coulomb Ewald citations and set ewald coefficients */
+static void initCoulombEwaldParameters(FILE *fp, const t_inputrec *ir,
+                                       bool systemHasNetCharge,
+                                       interaction_const_t *ic)
+{
+    if (!EEL_PME_EWALD(ir->coulombtype))
+    {
+        return;
+    }
+
+    if (fp)
+    {
+        fprintf(fp, "Will do PME sum in reciprocal space for electrostatic interactions.\n");
+
+        if (ir->coulombtype == eelP3M_AD)
+        {
+            please_cite(fp, "Hockney1988");
+            please_cite(fp, "Ballenegger2012");
+        }
+        else
+        {
+            please_cite(fp, "Essmann95a");
+        }
+
+        if (ir->ewald_geometry == eewg3DC)
+        {
+            if (fp)
+            {
+                fprintf(fp, "Using the Ewald3DC correction for systems with a slab geometry%s.\n",
+                        systemHasNetCharge ? " and net charge" : "");
+            }
+            please_cite(fp, "In-Chul99a");
+            if (systemHasNetCharge)
+            {
+                please_cite(fp, "Ballenegger2009");
+            }
+        }
+    }
+
+    ic->ewaldcoeff_q = calc_ewaldcoeff_q(ir->rcoulomb, ir->ewald_rtol);
+    if (fp)
+    {
+        fprintf(fp, "Using a Gaussian width (1/beta) of %g nm for Ewald\n",
+                1/ic->ewaldcoeff_q);
+    }
+
+    if (ic->coulomb_modifier == eintmodPOTSHIFT)
+    {
+        GMX_RELEASE_ASSERT(ic->rcoulomb != 0, "Cutoff radius cannot be zero");
+        ic->sh_ewald = std::erfc(ic->ewaldcoeff_q*ic->rcoulomb) / ic->rcoulomb;
+    }
+    else
+    {
+        ic->sh_ewald = 0;
+    }
+}
+
+/*! \brief Print Van der Waals Ewald citations and set ewald coefficients */
+static void initVdwEwaldParameters(FILE *fp, const t_inputrec *ir,
+                                   interaction_const_t *ic)
+{
+    if (!EVDW_PME(ir->vdwtype))
+    {
+        return;
+    }
+
+    if (fp)
+    {
+        fprintf(fp, "Will do PME sum in reciprocal space for LJ dispersion interactions.\n");
+        please_cite(fp, "Essmann95a");
+    }
+    ic->ewaldcoeff_lj = calc_ewaldcoeff_lj(ir->rvdw, ir->ewald_rtol_lj);
+    if (fp)
+    {
+        fprintf(fp, "Using a Gaussian width (1/beta) of %g nm for LJ Ewald\n",
+                1/ic->ewaldcoeff_lj);
+    }
+
+    if (ic->vdw_modifier == eintmodPOTSHIFT)
+    {
+        real crc2       = gmx::square(ic->ewaldcoeff_lj*ic->rvdw);
+        ic->sh_lj_ewald = (std::exp(-crc2)*(1 + crc2 + 0.5*crc2*crc2) - 1)/gmx::power6(ic->rvdw);
+    }
+    else
+    {
+        ic->sh_lj_ewald = 0;
+    }
+}
+
 gmx_bool uses_simple_tables(int                 cutoff_scheme,
                             nonbonded_verlet_t *nbv,
                             int                 group)
@@ -1899,13 +1994,15 @@ static void potential_switch_constants(real rsw, real rc,
 static void
 init_interaction_const(FILE                       *fp,
                        interaction_const_t       **interaction_const,
-                       const t_forcerec           *fr)
+                       const t_inputrec           *ir,
+                       const gmx_mtop_t           *mtop,
+                       bool                        systemHasNetCharge)
 {
     interaction_const_t *ic;
 
     snew(ic, 1);
 
-    ic->cutoff_scheme   = fr->cutoff_scheme;
+    ic->cutoff_scheme   = ir->cutoff_scheme;
 
     /* Just allocate something so we can free it */
     snew_aligned(ic->tabq_coul_FDV0, 16, 32);
@@ -1913,13 +2010,20 @@ init_interaction_const(FILE                       *fp,
     snew_aligned(ic->tabq_coul_V, 16, 32);
 
     /* Lennard-Jones */
-    ic->vdwtype         = fr->vdwtype;
-    ic->vdw_modifier    = fr->vdw_modifier;
-    ic->rvdw            = fr->rvdw;
-    ic->rvdw_switch     = fr->rvdw_switch;
-    ic->ewaldcoeff_lj   = fr->ewaldcoeff_lj;
-    ic->ljpme_comb_rule = fr->ljpme_combination_rule;
-    ic->sh_lj_ewald     = 0;
+    ic->vdwtype         = ir->vdwtype;
+    ic->vdw_modifier    = ir->vdw_modifier;
+    ic->reppow          = mtop->ffparams.reppow;
+    ic->rvdw            = cutoff_inf(ir->rvdw);
+    ic->rvdw_switch     = ir->rvdw_switch;
+    ic->ljpme_comb_rule = ir->ljpme_combination_rule;
+    ic->useBuckingham   = (mtop->ffparams.functype[0] == F_BHAM);
+    if (ic->useBuckingham)
+    {
+        ic->buckinghamBMax = calcBuckinghamBMax(fp, mtop);
+    }
+
+    initVdwEwaldParameters(fp, ir, ic);
+
     clear_force_switch_constants(&ic->dispersion_shift);
     clear_force_switch_constants(&ic->repulsion_shift);
 
@@ -1929,13 +2033,6 @@ init_interaction_const(FILE                       *fp,
             /* Only shift the potential, don't touch the force */
             ic->dispersion_shift.cpot = -1.0/gmx::power6(ic->rvdw);
             ic->repulsion_shift.cpot  = -1.0/gmx::power12(ic->rvdw);
-            if (EVDW_PME(ic->vdwtype))
-            {
-                real crc2;
-
-                crc2            = gmx::square(ic->ewaldcoeff_lj*ic->rvdw);
-                ic->sh_lj_ewald = (std::exp(-crc2)*(1 + crc2 + 0.5*crc2*crc2) - 1)/gmx::power6(ic->rvdw);
-            }
             break;
         case eintmodFORCESWITCH:
             /* Switch the force, switch and shift the potential */
@@ -1960,36 +2057,47 @@ init_interaction_const(FILE                       *fp,
     ic->sh_invrc6 = -ic->dispersion_shift.cpot;
 
     /* Electrostatics */
-    ic->eeltype          = fr->eeltype;
-    ic->coulomb_modifier = fr->coulomb_modifier;
-    ic->rcoulomb         = fr->rcoulomb;
-    ic->epsilon_r        = fr->epsilon_r;
-    ic->epsfac           = fr->epsfac;
-    ic->ewaldcoeff_q     = fr->ewaldcoeff_q;
+    ic->eeltype          = ir->coulombtype;
+    ic->coulomb_modifier = ir->coulomb_modifier;
+    ic->rcoulomb         = cutoff_inf(ir->rcoulomb);
+    ic->rcoulomb_switch  = ir->rcoulomb_switch;
+    ic->epsilon_r        = ir->epsilon_r;
 
-    if (EEL_PME_EWALD(ic->eeltype) && ic->coulomb_modifier == eintmodPOTSHIFT)
+    /* Set the Coulomb energy conversion factor */
+    if (ic->epsilon_r != 0)
     {
-        GMX_RELEASE_ASSERT(ic->rcoulomb != 0, "Cutoff radius cannot be zero");
-        ic->sh_ewald = std::erfc(ic->ewaldcoeff_q*ic->rcoulomb) / ic->rcoulomb;
+        ic->epsfac = ONE_4PI_EPS0/ic->epsilon_r;
     }
     else
     {
-        ic->sh_ewald = 0;
+        /* eps = 0 is infinite dieletric: no Coulomb interactions */
+        ic->epsfac = 0;
     }
 
     /* Reaction-field */
     if (EEL_RF(ic->eeltype))
     {
-        ic->epsilon_rf = fr->epsilon_rf;
-        ic->k_rf       = fr->k_rf;
-        ic->c_rf       = fr->c_rf;
+        ic->epsilon_rf = ir->epsilon_rf;
+        /* Generalized reaction field parameters are updated every step */
+        if (ic->eeltype != eelGRF)
+        {
+            calc_rffac(fp, ic->eeltype, ic->epsilon_r, ic->epsilon_rf,
+                       ic->rcoulomb, 0, 0, NULL,
+                       &ic->k_rf, &ic->c_rf);
+        }
+
+        if (ir->cutoff_scheme == ecutsGROUP && ic->eeltype == eelRF_ZERO)
+        {
+            /* grompp should have done this, but this scheme is obsolete */
+            ic->coulomb_modifier = eintmodEXACTCUTOFF;
+        }
     }
     else
     {
         /* For plain cut-off we might use the reaction-field kernels */
         ic->epsilon_rf = ic->epsilon_r;
         ic->k_rf       = 0;
-        if (fr->coulomb_modifier == eintmodPOTSHIFT)
+        if (ir->coulomb_modifier == eintmodPOTSHIFT)
         {
             ic->c_rf   = 1/ic->rcoulomb;
         }
@@ -1999,6 +2107,8 @@ init_interaction_const(FILE                       *fp,
         }
     }
 
+    initCoulombEwaldParameters(fp, ir, systemHasNetCharge, ic);
+
     if (fp != nullptr)
     {
         real dispersion_shift;
@@ -2131,15 +2241,15 @@ static void init_nb_verlet(FILE                *fp,
 
             bSimpleList = nbnxn_kernel_pairlist_simple(nbv->grp[i].kernel_type);
 
-            if (fr->vdwtype == evdwCUT &&
-                (fr->vdw_modifier == eintmodNONE ||
-                 fr->vdw_modifier == eintmodPOTSHIFT) &&
+            if (fr->ic->vdwtype == evdwCUT &&
+                (fr->ic->vdw_modifier == eintmodNONE ||
+                 fr->ic->vdw_modifier == eintmodPOTSHIFT) &&
                 getenv("GMX_NO_LJ_COMB_RULE") == nullptr)
             {
                 /* Plain LJ cut-off: we can optimize with combination rules */
                 enbnxninitcombrule = enbnxninitcombruleDETECT;
             }
-            else if (fr->vdwtype == evdwPME)
+            else if (fr->ic->vdwtype == evdwPME)
             {
                 /* LJ-PME: we need to use a combination rule for the grid */
                 if (fr->ljpme_combination_rule == eljpmeGEOM)
@@ -2517,15 +2627,25 @@ void init_forcerec(FILE                *fp,
     copy_rvec(ir->posres_com, fr->posres_com);
     copy_rvec(ir->posres_comB, fr->posres_comB);
     fr->rlist                    = cutoff_inf(ir->rlist);
-    fr->eeltype                  = ir->coulombtype;
-    fr->vdwtype                  = ir->vdwtype;
     fr->ljpme_combination_rule   = ir->ljpme_combination_rule;
 
-    fr->coulomb_modifier = ir->coulomb_modifier;
-    fr->vdw_modifier     = ir->vdw_modifier;
+    /* This now calculates sum for q and c6*/
+    bool systemHasNetCharge = set_chargesum(fp, fr, mtop);
+
+    /* fr->ic is used both by verlet and group kernels (to some extent) now */
+    init_interaction_const(fp, &fr->ic, ir, mtop, systemHasNetCharge);
+    init_interaction_const_tables(fp, fr->ic, ir->rlist + ir->tabext);
+
+    const interaction_const_t *ic = fr->ic;
+
+    /* TODO: Replace this Ewald table or move it into interaction_const_t */
+    if (ir->coulombtype == eelEWALD)
+    {
+        init_ewald_tab(&(fr->ewald_table), ir, fp);
+    }
 
     /* Electrostatics: Translate from interaction-setting-in-mdp-file to kernel interaction format */
-    switch (fr->eeltype)
+    switch (ic->eeltype)
     {
         case eelCUT:
             fr->nbkernel_elec_interaction = (fr->bGB) ? GMX_NBKERNEL_ELEC_GENERALIZEDBORN : GMX_NBKERNEL_ELEC_COULOMB;
@@ -2538,7 +2658,7 @@ void init_forcerec(FILE                *fp,
 
         case eelRF_ZERO:
             fr->nbkernel_elec_interaction = GMX_NBKERNEL_ELEC_REACTIONFIELD;
-            fr->coulomb_modifier          = eintmodEXACTCUTOFF;
+            GMX_RELEASE_ASSERT(ic->coulomb_modifier == eintmodEXACTCUTOFF, "With the group scheme RF-zero needs the exact cut-off modifier");
             break;
 
         case eelSWITCH:
@@ -2558,12 +2678,12 @@ void init_forcerec(FILE                *fp,
             break;
 
         default:
-            gmx_fatal(FARGS, "Unsupported electrostatic interaction: %s", eel_names[fr->eeltype]);
+            gmx_fatal(FARGS, "Unsupported electrostatic interaction: %s", eel_names[ic->eeltype]);
             break;
     }
 
     /* Vdw: Translate from mdp settings to kernel format */
-    switch (fr->vdwtype)
+    switch (ic->vdwtype)
     {
         case evdwCUT:
             if (fr->bBHAM)
@@ -2587,33 +2707,21 @@ void init_forcerec(FILE                *fp,
             break;
 
         default:
-            gmx_fatal(FARGS, "Unsupported vdw interaction: %s", evdw_names[fr->vdwtype]);
+            gmx_fatal(FARGS, "Unsupported vdw interaction: %s", evdw_names[ic->vdwtype]);
             break;
     }
 
-    /* These start out identical to ir, but might be altered if we e.g. tabulate the interaction in the kernel */
-    fr->nbkernel_elec_modifier    = fr->coulomb_modifier;
-    fr->nbkernel_vdw_modifier     = fr->vdw_modifier;
-
-    fr->rvdw             = cutoff_inf(ir->rvdw);
-    fr->rvdw_switch      = ir->rvdw_switch;
-    fr->rcoulomb         = cutoff_inf(ir->rcoulomb);
-    fr->rcoulomb_switch  = ir->rcoulomb_switch;
-
-    fr->bEwald     = EEL_PME_EWALD(fr->eeltype);
-
-    fr->reppow     = mtop->ffparams.reppow;
-
     if (ir->cutoff_scheme == ecutsGROUP)
     {
-        fr->bvdwtab    = ((fr->vdwtype != evdwCUT || !gmx_within_tol(fr->reppow, 12.0, 10*GMX_DOUBLE_EPS))
-                          && !EVDW_PME(fr->vdwtype));
+        fr->bvdwtab    = ((ic->vdwtype != evdwCUT || !gmx_within_tol(ic->reppow, 12.0, 10*GMX_DOUBLE_EPS))
+                          && !EVDW_PME(ic->vdwtype));
         /* We have special kernels for standard Ewald and PME, but the pme-switch ones are tabulated above */
-        fr->bcoultab   = !(fr->eeltype == eelCUT ||
-                           fr->eeltype == eelEWALD ||
-                           fr->eeltype == eelPME ||
-                           fr->eeltype == eelRF ||
-                           fr->eeltype == eelRF_ZERO);
+        fr->bcoultab   = !(ic->eeltype == eelCUT ||
+                           ic->eeltype == eelEWALD ||
+                           ic->eeltype == eelPME ||
+                           ic->eeltype == eelP3M_AD ||
+                           ic->eeltype == eelRF ||
+                           ic->eeltype == eelRF_ZERO);
 
         /* If the user absolutely wants different switch/shift settings for coul/vdw, it is likely
          * going to be faster to tabulate the interaction than calling the generic kernel.
@@ -2623,7 +2731,7 @@ void init_forcerec(FILE                *fp,
             fr->nbkernel_vdw_modifier == eintmodPOTSWITCH &&
             bGenericKernelOnly == FALSE)
         {
-            if ((fr->rcoulomb_switch != fr->rvdw_switch) || (fr->rcoulomb != fr->rvdw))
+            if ((ic->rcoulomb_switch != ic->rvdw_switch) || (ic->rcoulomb != ic->rvdw))
             {
                 fr->bcoultab = TRUE;
                 /* Once we tabulate electrostatics, we can use the switch function for LJ,
@@ -2636,7 +2744,7 @@ void init_forcerec(FILE                *fp,
                    fr->nbkernel_elec_modifier == eintmodEXACTCUTOFF &&
                    (fr->nbkernel_vdw_modifier == eintmodPOTSWITCH || fr->nbkernel_vdw_modifier == eintmodPOTSHIFT))))
         {
-            if ((fr->rcoulomb != fr->rvdw) && (bGenericKernelOnly == FALSE))
+            if ((ic->rcoulomb != ic->rvdw) && (bGenericKernelOnly == FALSE))
             {
                 fr->bcoultab = TRUE;
             }
@@ -2679,7 +2787,7 @@ void init_forcerec(FILE                *fp,
 
     if (ir->cutoff_scheme == ecutsVERLET)
     {
-        if (!gmx_within_tol(fr->reppow, 12.0, 10*GMX_DOUBLE_EPS))
+        if (!gmx_within_tol(ic->reppow, 12.0, 10*GMX_DOUBLE_EPS))
         {
             gmx_fatal(FARGS, "Cut-off scheme %S only supports LJ repulsion power 12", ecutscheme_names[ir->cutoff_scheme]);
         }
@@ -2687,83 +2795,19 @@ void init_forcerec(FILE                *fp,
         fr->bcoultab = FALSE;
     }
 
-    /* This now calculates sum for q and C6 */
-    set_chargesum(fp, fr, mtop);
-
-    /* Tables are used for direct ewald sum */
-    if (fr->bEwald)
-    {
-        if (EEL_PME(ir->coulombtype))
-        {
-            if (fp)
-            {
-                fprintf(fp, "Will do PME sum in reciprocal space for electrostatic interactions.\n");
-            }
-            if (ir->coulombtype == eelP3M_AD)
-            {
-                please_cite(fp, "Hockney1988");
-                please_cite(fp, "Ballenegger2012");
-            }
-            else
-            {
-                please_cite(fp, "Essmann95a");
-            }
-
-            if (ir->ewald_geometry == eewg3DC)
-            {
-                bool haveNetCharge = (fabs(fr->qsum[0]) > 1e-4 ||
-                                      fabs(fr->qsum[1]) > 1e-4);
-                if (fp)
-                {
-                    fprintf(fp, "Using the Ewald3DC correction for systems with a slab geometry%s.\n",
-                            haveNetCharge ? " and net charge" : "");
-                }
-                please_cite(fp, "In-Chul99a");
-                if (haveNetCharge)
-                {
-                    please_cite(fp, "Ballenegger2009");
-                }
-            }
-        }
-        fr->ewaldcoeff_q = calc_ewaldcoeff_q(ir->rcoulomb, ir->ewald_rtol);
-        init_ewald_tab(&(fr->ewald_table), ir, fp);
-        if (fp)
-        {
-            fprintf(fp, "Using a Gaussian width (1/beta) of %g nm for Ewald\n",
-                    1/fr->ewaldcoeff_q);
-        }
-    }
-
-    if (EVDW_PME(ir->vdwtype))
-    {
-        if (fp)
-        {
-            fprintf(fp, "Will do PME sum in reciprocal space for LJ dispersion interactions.\n");
-        }
-        please_cite(fp, "Essmann95a");
-        fr->ewaldcoeff_lj = calc_ewaldcoeff_lj(ir->rvdw, ir->ewald_rtol_lj);
-        if (fp)
-        {
-            fprintf(fp, "Using a Gaussian width (1/beta) of %g nm for LJ Ewald\n",
-                    1/fr->ewaldcoeff_lj);
-        }
-    }
-
-    /* Electrostatics */
-    fr->epsilon_r       = ir->epsilon_r;
-    fr->epsilon_rf      = ir->epsilon_rf;
-    fr->fudgeQQ         = mtop->ffparams.fudgeQQ;
+    /* 1-4 interaction electrostatics */
+    fr->fudgeQQ = mtop->ffparams.fudgeQQ;
 
     /* Parameters for generalized RF */
     fr->zsquare = 0.0;
     fr->temp    = 0.0;
 
-    if (fr->eeltype == eelGRF)
+    if (ic->eeltype == eelGRF)
     {
         init_generalized_rf(fp, mtop, ir, fr);
     }
 
-    fr->bF_NoVirSum = (EEL_FULL(fr->eeltype) || EVDW_PME(fr->vdwtype) ||
+    fr->bF_NoVirSum = (EEL_FULL(ic->eeltype) || EVDW_PME(ic->vdwtype) ||
                        fr->forceProviders->hasForcesWithoutVirialContribution() ||
                        gmx_mtop_ftype_count(mtop, F_POSRES) > 0 ||
                        gmx_mtop_ftype_count(mtop, F_FBPOSRES) > 0);
@@ -2794,7 +2838,7 @@ void init_forcerec(FILE                *fp,
     {
         fr->ntype = mtop->ffparams.atnr;
         fr->nbfp  = mk_nbfp(&mtop->ffparams, fr->bBHAM);
-        if (EVDW_PME(fr->vdwtype))
+        if (EVDW_PME(ic->vdwtype))
         {
             fr->ljpme_c6grid  = make_ljpme_c6grid(&mtop->ffparams, fr);
         }
@@ -2804,27 +2848,27 @@ void init_forcerec(FILE                *fp,
     fr->egp_flags = ir->opts.egp_flags;
 
     /* Van der Waals stuff */
-    if ((fr->vdwtype != evdwCUT) && (fr->vdwtype != evdwUSER) && !fr->bBHAM)
+    if ((ic->vdwtype != evdwCUT) && (ic->vdwtype != evdwUSER) && !fr->bBHAM)
     {
-        if (fr->rvdw_switch >= fr->rvdw)
+        if (ic->rvdw_switch >= ic->rvdw)
         {
             gmx_fatal(FARGS, "rvdw_switch (%f) must be < rvdw (%f)",
-                      fr->rvdw_switch, fr->rvdw);
+                      ic->rvdw_switch, ic->rvdw);
         }
         if (fp)
         {
             fprintf(fp, "Using %s Lennard-Jones, switch between %g and %g nm\n",
-                    (fr->eeltype == eelSWITCH) ? "switched" : "shifted",
-                    fr->rvdw_switch, fr->rvdw);
+                    (ic->eeltype == eelSWITCH) ? "switched" : "shifted",
+                    ic->rvdw_switch, ic->rvdw);
         }
     }
 
-    if (fr->bBHAM && EVDW_PME(fr->vdwtype))
+    if (fr->bBHAM && EVDW_PME(ic->vdwtype))
     {
         gmx_fatal(FARGS, "LJ PME not supported with Buckingham");
     }
 
-    if (fr->bBHAM && (fr->vdwtype == evdwSHIFT || fr->vdwtype == evdwSWITCH))
+    if (fr->bBHAM && (ic->vdwtype == evdwSHIFT || ic->vdwtype == evdwSWITCH))
     {
         gmx_fatal(FARGS, "Switch/shift interaction not supported with Buckingham");
     }
@@ -2837,7 +2881,7 @@ void init_forcerec(FILE                *fp,
     if (fp)
     {
         fprintf(fp, "Cut-off's:   NS: %g   Coulomb: %g   %s: %g\n",
-                fr->rlist, fr->rcoulomb, fr->bBHAM ? "BHAM" : "LJ", fr->rvdw);
+                fr->rlist, ic->rcoulomb, fr->bBHAM ? "BHAM" : "LJ", ic->rvdw);
     }
 
     fr->eDispCorr = ir->eDispCorr;
@@ -2847,11 +2891,6 @@ void init_forcerec(FILE                *fp,
         set_avcsixtwelve(fp, fr, mtop);
     }
 
-    if (fr->bBHAM)
-    {
-        set_bham_b_max(fp, fr, mtop);
-    }
-
     fr->gb_epsilon_solvent = ir->gb_epsilon_solvent;
 
     /* Copy the GBSA data (radius, volume and surftens for each
@@ -2908,25 +2947,6 @@ void init_forcerec(FILE                *fp,
         }
     }
 
-    /* Set the charge scaling */
-    if (fr->epsilon_r != 0)
-    {
-        fr->epsfac = ONE_4PI_EPS0/fr->epsilon_r;
-    }
-    else
-    {
-        /* eps = 0 is infinite dieletric: no coulomb interactions */
-        fr->epsfac = 0;
-    }
-
-    /* Reaction field constants */
-    if (EEL_RF(fr->eeltype))
-    {
-        calc_rffac(fp, fr->eeltype, fr->epsilon_r, fr->epsilon_rf,
-                   fr->rcoulomb, fr->temp, fr->zsquare, box,
-                   &fr->kappa, &fr->k_rf, &fr->c_rf);
-    }
-
     /* Construct tables for the group scheme. A little unnecessary to
      * make both vdw and coul tables sometimes, but what the
      * heck. Note that both cutoff schemes construct Ewald tables in
@@ -2989,7 +3009,7 @@ void init_forcerec(FILE                *fp,
         /* make tables for ordinary interactions */
         if (bSomeNormalNbListsAreInUse)
         {
-            make_nbf_tables(fp, fr, rtab, tabfn, nullptr, nullptr, &fr->nblists[0]);
+            make_nbf_tables(fp, ic, rtab, tabfn, nullptr, nullptr, &fr->nblists[0]);
             m = 1;
         }
         else
@@ -3012,7 +3032,7 @@ void init_forcerec(FILE                *fp,
                             fr->gid2nblists[GID(egi, egj, ir->opts.ngener)] = m;
                         }
                         /* Read the table file with the two energy groups names appended */
-                        make_nbf_tables(fp, fr, rtab, tabfn,
+                        make_nbf_tables(fp, ic, rtab, tabfn,
                                         *mtop->groups.grpname[nm_ind[egi]],
                                         *mtop->groups.grpname[nm_ind[egj]],
                                         &fr->nblists[m]);
@@ -3032,7 +3052,7 @@ void init_forcerec(FILE                *fp,
      * switch/shift dispersion corrections in this case. */
     if (fr->eDispCorr != edispcNO)
     {
-        fr->dispersionCorrectionTable = makeDispersionCorrectionTable(fp, fr, rtab, tabfn);
+        fr->dispersionCorrectionTable = makeDispersionCorrectionTable(fp, ic, rtab, tabfn);
     }
 
     /* We want to use unmodified tables for 1-4 coulombic
@@ -3042,7 +3062,7 @@ void init_forcerec(FILE                *fp,
         gmx_mtop_ftype_count(mtop, F_LJC14_Q) > 0 ||
         gmx_mtop_ftype_count(mtop, F_LJC_PAIRS_NB) > 0)
     {
-        fr->pairsTable = make_tables(fp, fr, tabpfn, rtab,
+        fr->pairsTable = make_tables(fp, ic, tabpfn, rtab,
                                      GMX_MAKETABLES_14ONLY);
     }
 
@@ -3132,10 +3152,6 @@ void init_forcerec(FILE                *fp,
     fr->nthread_ewc = gmx_omp_nthreads_get(emntBonded);
     snew(fr->ewc_t, fr->nthread_ewc);
 
-    /* fr->ic is used both by verlet and group kernels (to some extent) now */
-    init_interaction_const(fp, &fr->ic, fr);
-    init_interaction_const_tables(fp, fr->ic, rtab);
-
     if (fr->cutoff_scheme == ecutsVERLET)
     {
         // We checked the cut-offs in grompp, but double-check here.
@@ -3160,30 +3176,6 @@ void init_forcerec(FILE                *fp,
     }
 }
 
-#define pr_real(fp, r) fprintf(fp, "%s: %e\n",#r, r)
-#define pr_int(fp, i)  fprintf((fp), "%s: %d\n",#i, i)
-#define pr_bool(fp, b) fprintf((fp), "%s: %s\n",#b, gmx::boolToString(b))
-
-void pr_forcerec(FILE *fp, t_forcerec *fr)
-{
-    int i;
-
-    pr_real(fp, fr->rlist);
-    pr_real(fp, fr->rcoulomb);
-    pr_real(fp, fr->fudgeQQ);
-    pr_bool(fp, fr->bGrid);
-    /*pr_int(fp,fr->cg0);
-       pr_int(fp,fr->hcg);*/
-    for (i = 0; i < fr->nnblists; i++)
-    {
-        pr_int(fp, fr->nblists[i].table_elec_vdw->n);
-    }
-    pr_real(fp, fr->rcoulomb_switch);
-    pr_real(fp, fr->rcoulomb);
-
-    fflush(fp);
-}
-
 /* Frees GPU memory and destroys the GPU context.
  *
  * Note that this function needs to be called even if GPUs are not used
index e71150331cd117c6178d84af6afb1eff9a213e3f..7d9cc0f617658a47b0d6d882355f94c056d367a1 100644 (file)
@@ -1366,10 +1366,10 @@ calc_gb_forces(t_commrec *cr, t_mdatoms *md, gmx_genborn_t *born, gmx_localtop_t
 
     /* Calculate the bonded GB-interactions using either table or analytical formula */
     enerd->term[F_GBPOL]       += gb_bonds_tab(x, f, fr->fshift, md->chargeA, &(fr->gbtabscale),
-                                               fr->invsqrta, fr->dvda, fr->gbtab->data, idef, born->epsilon_r, born->gb_epsilon_solvent, fr->epsfac, pbc_null, graph);
+                                               fr->invsqrta, fr->dvda, fr->gbtab->data, idef, born->epsilon_r, born->gb_epsilon_solvent, fr->ic->epsfac, pbc_null, graph);
 
     /* Calculate self corrections to the GB energies - currently only A state used! (FIXME) */
-    enerd->term[F_GBPOL]       += calc_gb_selfcorrections(cr, born->nr, md->chargeA, born, fr->dvda, fr->epsfac);
+    enerd->term[F_GBPOL]       += calc_gb_selfcorrections(cr, born->nr, md->chargeA, born, fr->dvda, fr->ic->epsfac);
 
     /* If parallel, sum the derivative of the potential w.r.t the born radii */
     if (DOMAINDECOMP(cr))
index b98b8a0703feae002510f554423acf07fce3d467..18cf2be983d09c70e23522407083713702dff29a 100644 (file)
@@ -2732,7 +2732,7 @@ double do_nm(FILE *fplog, t_commrec *cr, const gmx::MDLogger &mdlog,
      * will be when we use a cutoff.
      * For small systems (n<1000) it is easier to always use full matrix format, though.
      */
-    if (EEL_FULL(fr->eeltype) || fr->rlist == 0.0)
+    if (EEL_FULL(fr->ic->eeltype) || fr->rlist == 0.0)
     {
         GMX_LOG(mdlog.warning).appendText("Non-cutoff electrostatics used, forcing full Hessian format.");
         bSparse = FALSE;
index 53f6e5c93ccdf84192e0e281149d562e732ffbee..b2a5ac92a92b16a4bf7feeead4b787d5982c0153 100644 (file)
@@ -223,7 +223,7 @@ void init_neighbor_list(FILE *log, t_forcerec *fr, int homenr)
     ielecmod                 = fr->nbkernel_elec_modifier;
     ivdwmod                  = fr->nbkernel_vdw_modifier;
     type                     = GMX_NBLIST_INTERACTION_STANDARD;
-    bElecAndVdwSwitchDiffers = ( (fr->rcoulomb_switch != fr->rvdw_switch) || (fr->rcoulomb != fr->rvdw));
+    bElecAndVdwSwitchDiffers = ( (fr->ic->rcoulomb_switch != fr->ic->rvdw_switch) || (fr->ic->rcoulomb != fr->ic->rvdw));
 
     fr->ns->bCGlist = (getenv("GMX_NBLISTCG") != nullptr);
     if (!fr->ns->bCGlist)
index 80bd94c024c2bfe76054083f18f14e9ec7d3f55e..298d6e768ad3b89a5af11d6108076ca98a51d5c3 100644 (file)
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
- * Copyright (c) 2013,2014,2015, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015,2017, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -79,8 +79,8 @@ real RF_excl_correction(const t_forcerec *fr, t_graph *g,
         start = mdatoms->nr - fr->n_tpi;
     }
 
-    ek      = fr->epsfac*fr->k_rf;
-    ec      = fr->epsfac*fr->c_rf;
+    ek      = fr->ic->epsfac*fr->ic->k_rf;
+    ec      = fr->ic->epsfac*fr->ic->c_rf;
     chargeA = mdatoms->chargeA;
     chargeB = mdatoms->chargeB;
     AA      = excl->a;
@@ -209,14 +209,14 @@ real RF_excl_correction(const t_forcerec *fr, t_graph *g,
 
 void calc_rffac(FILE *fplog, int eel, real eps_r, real eps_rf, real Rc, real Temp,
                 real zsq, matrix box,
-                real *kappa, real *krf, real *crf)
+                real *krf, real *crf)
 {
     /* Compute constants for Generalized reaction field */
-    real   k1, k2, I, vol, rmin;
+    real   kappa, k1, k2, I, rmin;
+    real   vol = 0;
 
     if (EEL_RF(eel))
     {
-        vol     = det(box);
         if (eel == eelGRF)
         {
             /* Consistency check */
@@ -226,13 +226,14 @@ void calc_rffac(FILE *fplog, int eel, real eps_r, real eps_rf, real Rc, real Tem
                           " Generalized Reaction Field\n", Temp);
             }
             /* Ionic strength (only needed for eelGRF */
+            vol     = det(box);
             I       = 0.5*zsq/vol;
-            *kappa  = std::sqrt(2*I/(EPSILON0*eps_rf*BOLTZ*Temp));
+            kappa   = std::sqrt(2*I/(EPSILON0*eps_rf*BOLTZ*Temp));
         }
         else
         {
             I      = 0;
-            *kappa = 0;
+            kappa  = 0;
         }
 
         /* eps == 0 signals infinite dielectric */
@@ -242,8 +243,8 @@ void calc_rffac(FILE *fplog, int eel, real eps_r, real eps_rf, real Rc, real Tem
         }
         else
         {
-            k1   = 1 + *kappa*Rc;
-            k2   = eps_rf*gmx::square((real)(*kappa*Rc));
+            k1   = 1 + kappa*Rc;
+            k2   = eps_rf*gmx::square((real)(kappa*Rc));
 
             *krf = ((eps_rf - eps_r)*k1 + 0.5*k2)/((2*eps_rf + eps_r)*k1 + k2)/(Rc*Rc*Rc);
         }
@@ -259,7 +260,7 @@ void calc_rffac(FILE *fplog, int eel, real eps_r, real eps_rf, real Rc, real Tem
                 fprintf(fplog, "%s:\n"
                         "epsRF = %10g, I   = %10g, volume = %10g, kappa  = %10g\n"
                         "rc    = %10g, krf = %10g, crf    = %10g, epsfac = %10g\n",
-                        eel_names[eel], eps_rf, I, vol, *kappa, Rc, *krf, *crf,
+                        eel_names[eel], eps_rf, I, vol, kappa, Rc, *krf, *crf,
                         ONE_4PI_EPS0/eps_r);
             }
             else
index ba75a097f2022790d315db7d53abf75e4d2625ea..a7c9dcac0355857d00585ba951b37d2db56f3c34 100644 (file)
@@ -383,12 +383,12 @@ static void post_process_forces(t_commrec *cr,
             /* Now add the forces, this is local */
             sum_forces(f, fr->f_novirsum);
 
-            if (EEL_FULL(fr->eeltype))
+            if (EEL_FULL(fr->ic->eeltype))
             {
                 /* Add the mesh contribution to the virial */
                 m_add(vir_force, fr->vir_el_recip, vir_force);
             }
-            if (EVDW_PME(fr->vdwtype))
+            if (EVDW_PME(fr->ic->vdwtype))
             {
                 /* Add the mesh contribution to the virial */
                 m_add(vir_force, fr->vir_lj_recip, vir_force);
@@ -1774,7 +1774,7 @@ static void do_force_cutsGROUP(FILE *fplog, t_commrec *cr,
              * When we do not calculate the virial, fr->f_novirsum = f,
              * so we have already communicated these forces.
              */
-            if (EEL_FULL(fr->eeltype) && cr->dd->n_intercg_excl &&
+            if (EEL_FULL(fr->ic->eeltype) && cr->dd->n_intercg_excl &&
                 (flags & GMX_FORCE_VIRIAL))
             {
                 dd_move_f(cr->dd, as_rvec_array(fr->f_novirsum->data()), nullptr);
@@ -2110,6 +2110,8 @@ void calc_enervirdiff(FILE *fplog, int eDispCorr, t_forcerec *fr)
     fr->virdiffsix      = 0;
     fr->virdifftwelve   = 0;
 
+    const interaction_const_t *ic = fr->ic;
+
     if (eDispCorr != edispcNO)
     {
         for (i = 0; i < 2; i++)
@@ -2117,19 +2119,19 @@ void calc_enervirdiff(FILE *fplog, int eDispCorr, t_forcerec *fr)
             eners[i] = 0;
             virs[i]  = 0;
         }
-        if ((fr->vdw_modifier == eintmodPOTSHIFT) ||
-            (fr->vdw_modifier == eintmodPOTSWITCH) ||
-            (fr->vdw_modifier == eintmodFORCESWITCH) ||
-            (fr->vdwtype == evdwSHIFT) ||
-            (fr->vdwtype == evdwSWITCH))
+        if ((ic->vdw_modifier == eintmodPOTSHIFT) ||
+            (ic->vdw_modifier == eintmodPOTSWITCH) ||
+            (ic->vdw_modifier == eintmodFORCESWITCH) ||
+            (ic->vdwtype == evdwSHIFT) ||
+            (ic->vdwtype == evdwSWITCH))
         {
-            if (((fr->vdw_modifier == eintmodPOTSWITCH) ||
-                 (fr->vdw_modifier == eintmodFORCESWITCH) ||
-                 (fr->vdwtype == evdwSWITCH)) && fr->rvdw_switch == 0)
+            if (((ic->vdw_modifier == eintmodPOTSWITCH) ||
+                 (ic->vdw_modifier == eintmodFORCESWITCH) ||
+                 (ic->vdwtype == evdwSWITCH)) && ic->rvdw_switch == 0)
             {
                 gmx_fatal(FARGS,
                           "With dispersion correction rvdw-switch can not be zero "
-                          "for vdw-type = %s", evdw_names[fr->vdwtype]);
+                          "for vdw-type = %s", evdw_names[ic->vdwtype]);
             }
 
             /* TODO This code depends on the logic in tables.c that
@@ -2141,8 +2143,8 @@ void calc_enervirdiff(FILE *fplog, int eDispCorr, t_forcerec *fr)
             vdwtab = fr->dispersionCorrectionTable->data;
 
             /* Round the cut-offs to exact table values for precision */
-            ri0  = static_cast<int>(floor(fr->rvdw_switch*scale));
-            ri1  = static_cast<int>(ceil(fr->rvdw*scale));
+            ri0  = static_cast<int>(floor(ic->rvdw_switch*scale));
+            ri1  = static_cast<int>(ceil(ic->rvdw*scale));
 
             /* The code below has some support for handling force-switching, i.e.
              * when the force (instead of potential) is switched over a limited
@@ -2160,14 +2162,14 @@ void calc_enervirdiff(FILE *fplog, int eDispCorr, t_forcerec *fr)
              * we need to calculate the constant shift up to the point where we
              * start modifying the potential.
              */
-            ri0  = (fr->vdw_modifier == eintmodPOTSHIFT) ? ri1 : ri0;
+            ri0  = (ic->vdw_modifier == eintmodPOTSHIFT) ? ri1 : ri0;
 
             r0   = ri0/scale;
             rc3  = r0*r0*r0;
             rc9  = rc3*rc3*rc3;
 
-            if ((fr->vdw_modifier == eintmodFORCESWITCH) ||
-                (fr->vdwtype == evdwSHIFT))
+            if ((ic->vdw_modifier == eintmodFORCESWITCH) ||
+                (ic->vdwtype == evdwSHIFT))
             {
                 /* Determine the constant energy shift below rvdw_switch.
                  * Table has a scale factor since we have scaled it down to compensate
@@ -2176,7 +2178,7 @@ void calc_enervirdiff(FILE *fplog, int eDispCorr, t_forcerec *fr)
                 fr->enershiftsix    = (real)(-1.0/(rc3*rc3)) - 6.0*vdwtab[8*ri0];
                 fr->enershifttwelve = (real)( 1.0/(rc9*rc3)) - 12.0*vdwtab[8*ri0 + 4];
             }
-            else if (fr->vdw_modifier == eintmodPOTSHIFT)
+            else if (ic->vdw_modifier == eintmodPOTSHIFT)
             {
                 fr->enershiftsix    = (real)(-1.0/(rc3*rc3));
                 fr->enershifttwelve = (real)( 1.0/(rc9*rc3));
@@ -2216,11 +2218,11 @@ void calc_enervirdiff(FILE *fplog, int eDispCorr, t_forcerec *fr)
             virs[0]  +=  8.0*M_PI/rc3;
             virs[1]  += -16.0*M_PI/(3.0*rc9);
         }
-        else if (fr->vdwtype == evdwCUT ||
-                 EVDW_PME(fr->vdwtype) ||
-                 fr->vdwtype == evdwUSER)
+        else if (ic->vdwtype == evdwCUT ||
+                 EVDW_PME(ic->vdwtype) ||
+                 ic->vdwtype == evdwUSER)
         {
-            if (fr->vdwtype == evdwUSER && fplog)
+            if (ic->vdwtype == evdwUSER && fplog)
             {
                 fprintf(fplog,
                         "WARNING: using dispersion correction with user tables\n");
@@ -2233,12 +2235,12 @@ void calc_enervirdiff(FILE *fplog, int eDispCorr, t_forcerec *fr)
              * can be used here.
              */
 
-            rc3  = fr->rvdw*fr->rvdw*fr->rvdw;
+            rc3  = ic->rvdw*ic->rvdw*ic->rvdw;
             rc9  = rc3*rc3*rc3;
             /* Contribution beyond the cut-off */
             eners[0] += -4.0*M_PI/(3.0*rc3);
             eners[1] +=  4.0*M_PI/(9.0*rc9);
-            if (fr->vdw_modifier == eintmodPOTSHIFT)
+            if (ic->vdw_modifier == eintmodPOTSHIFT)
             {
                 /* Contribution within the cut-off */
                 eners[0] += -4.0*M_PI/(3.0*rc3);
@@ -2252,20 +2254,20 @@ void calc_enervirdiff(FILE *fplog, int eDispCorr, t_forcerec *fr)
         {
             gmx_fatal(FARGS,
                       "Dispersion correction is not implemented for vdw-type = %s",
-                      evdw_names[fr->vdwtype]);
+                      evdw_names[ic->vdwtype]);
         }
 
         /* When we deprecate the group kernels the code below can go too */
-        if (fr->vdwtype == evdwPME && fr->cutoff_scheme == ecutsGROUP)
+        if (ic->vdwtype == evdwPME && fr->cutoff_scheme == ecutsGROUP)
         {
             /* Calculate self-interaction coefficient (assuming that
              * the reciprocal-space contribution is constant in the
              * region that contributes to the self-interaction).
              */
-            fr->enershiftsix = gmx::power6(fr->ewaldcoeff_lj) / 6.0;
+            fr->enershiftsix = gmx::power6(ic->ewaldcoeff_lj) / 6.0;
 
-            eners[0] += -gmx::power3(std::sqrt(M_PI)*fr->ewaldcoeff_lj)/3.0;
-            virs[0]  +=  gmx::power3(std::sqrt(M_PI)*fr->ewaldcoeff_lj);
+            eners[0] += -gmx::power3(std::sqrt(M_PI)*ic->ewaldcoeff_lj)/3.0;
+            virs[0]  +=  gmx::power3(std::sqrt(M_PI)*ic->ewaldcoeff_lj);
         }
 
         fr->enerdiffsix    = eners[0];
index 332286edc06ff3d6a5b088bace03eb6b5b39624e..5a68205f3564d8e7a0f40ad772b4b42d9457cf77 100644 (file)
@@ -320,7 +320,7 @@ double do_tpi(FILE *fplog, t_commrec *cr, const gmx::MDLogger gmx_unused &mdlog,
         bCharge |= (mdatoms->chargeA[i] != 0 ||
                     (mdatoms->chargeB && mdatoms->chargeB[i] != 0));
     }
-    bRFExcl = (bCharge && EEL_RF(fr->eeltype));
+    bRFExcl = (bCharge && EEL_RF(fr->ic->eeltype));
 
     calc_cgcm(fplog, cg_tp, cg_tp+1, &(top->cgs), as_rvec_array(state_global->x.data()), fr->cg_cm);
     if (bCavity)
@@ -385,7 +385,7 @@ double do_tpi(FILE *fplog, t_commrec *cr, const gmx::MDLogger gmx_unused &mdlog,
         {
             nener += 1;
         }
-        if (EEL_FULL(fr->eeltype))
+        if (EEL_FULL(fr->ic->eeltype))
         {
             nener += 1;
         }
@@ -440,7 +440,7 @@ double do_tpi(FILE *fplog, t_commrec *cr, const gmx::MDLogger gmx_unused &mdlog,
                 sprintf(str, "f. <U\\sRF excl\\Ne\\S-\\betaU\\N>");
                 leg[e++] = gmx_strdup(str);
             }
-            if (EEL_FULL(fr->eeltype))
+            if (EEL_FULL(fr->ic->eeltype))
             {
                 sprintf(str, "f. <U\\sCoul recip\\Ne\\S-\\betaU\\N>");
                 leg[e++] = gmx_strdup(str);
@@ -748,7 +748,7 @@ double do_tpi(FILE *fplog, t_commrec *cr, const gmx::MDLogger gmx_unused &mdlog,
                     {
                         sum_UgembU[e++] += enerd->term[F_RF_EXCL]*embU;
                     }
-                    if (EEL_FULL(fr->eeltype))
+                    if (EEL_FULL(fr->ic->eeltype))
                     {
                         sum_UgembU[e++] += enerd->term[F_COUL_RECIP]*embU;
                     }
index 7d095caff9b79c790e2ff617296bc5b07d250630..4fbb07d76beb715500a93bd8e8c2763a391545d6 100644 (file)
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2008, The GROMACS development team.
- * Copyright (c) 2013,2014,2015,2016, by the GROMACS development team, led by
+ * Copyright (c) 2013,2014,2015,2016,2017, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -88,7 +88,7 @@ void make_wall_tables(FILE *fplog,
                         *groups->grpname[nm_ind[egp]],
                         *groups->grpname[nm_ind[negp_pp+w]],
                         ftp2ext(efXVG));
-                fr->wall_tab[w][egp] = make_tables(fplog, fr, buf, 0,
+                fr->wall_tab[w][egp] = make_tables(fplog, fr->ic, buf, 0,
                                                    GMX_MAKETABLES_FORCEUSER);
 
                 /* Since wall have no charge, we can compress the table */
index 62f5030711ef961d34d5014ed27ea4c696dc2ee3..28682b680680b7ada648c68bc558ab9b13b115bd 100644 (file)
@@ -199,12 +199,8 @@ struct t_forcerec {
      */
     real rlist;
 
-    /* Dielectric constant resp. multiplication factor for charges */
+    /* Parameters for generalized reaction field */
     real zsquare, temp;
-    real epsilon_r, epsilon_rf, epsfac;
-
-    /* Constants for reaction fields */
-    real kappa, k_rf, c_rf;
 
     /* Charge sum and dipole for topology A/B ([0]/[1]) for Ewald corrections */
     double qsum[2];
@@ -243,17 +239,6 @@ struct t_forcerec {
 
     struct t_forcetable *pairsTable; /* for 1-4 interactions, [pairs] and [pairs_nb] */
 
-    /* PPPM & Shifting stuff */
-    int   coulomb_modifier;
-    real  rcoulomb_switch, rcoulomb;
-    real *phi;
-
-    /* VdW stuff */
-    int    vdw_modifier;
-    double reppow;
-    real   rvdw_switch, rvdw;
-    real   bham_b_max;
-
     /* Free energy */
     int      efep;
     real     sc_alphavdw;
@@ -264,8 +249,6 @@ struct t_forcerec {
     real     sc_sigma6_min;
 
     /* NS Stuff */
-    int  eeltype;
-    int  vdwtype;
     int  cg0, hcg;
     /* solvent_opt contains the enum for the most common solvent
      * in the system, which will be optimized.
@@ -330,9 +313,6 @@ struct t_forcerec {
     tensor            vir_lj_recip;
 
     /* PME/Ewald stuff */
-    gmx_bool                bEwald;
-    real                    ewaldcoeff_q;
-    real                    ewaldcoeff_lj;
     struct gmx_ewald_tab_t *ewald_table;
 
     /* Virial Stuff */
index 16b0d32e89b8645d2d1f4fb71b4bd20aadf432aa..5f54daffd1aa7ab335125d691111565fc3076a9a 100644 (file)
@@ -35,6 +35,7 @@
 #ifndef GMX_MDTYPES_INTERACTION_CONST_H
 #define GMX_MDTYPES_INTERACTION_CONST_H
 
+#include "gromacs/utility/basedefinitions.h"
 #include "gromacs/utility/real.h"
 
 #ifdef __cplusplus
@@ -75,11 +76,14 @@ struct interaction_const_t
     /* VdW */
     int                    vdwtype;
     int                    vdw_modifier;
+    double                 reppow;
     real                   rvdw;
     real                   rvdw_switch;
     struct shift_consts_t  dispersion_shift;
     struct shift_consts_t  repulsion_shift;
     struct switch_consts_t vdw_switch;
+    gmx_bool               useBuckingham;
+    real                   buckinghamBMax;
     /* TODO: remove this variable, used for not modyfing the group kernels,
      * it is equal to -dispersion_shift->cpot
      */
@@ -91,6 +95,7 @@ struct interaction_const_t
 
     /* Coulomb */
     real rcoulomb;
+    real rcoulomb_switch;
 
     /* PME/Ewald */
     real ewaldcoeff_q;
index 6ef0b7d1f72315c2c70ca6ba7451045add273b87..4742c58ea4a0e5c70164a3a507fc9b200f952864 100644 (file)
@@ -759,7 +759,7 @@ static void done_tabledata(t_tabledata *td)
     sfree(td->f);
 }
 
-static void fill_table(t_tabledata *td, int tp, const t_forcerec *fr,
+static void fill_table(t_tabledata *td, int tp, const interaction_const_t *ic,
                        gmx_bool b14only)
 {
     /* Fill the table according to the formulas in the manual.
@@ -783,8 +783,8 @@ static void fill_table(t_tabledata *td, int tp, const t_forcerec *fr,
     double   ksw, swi, swi1;
     /* Temporary parameters */
     gmx_bool bPotentialSwitch, bForceSwitch, bPotentialShift;
-    double   ewc   = fr->ewaldcoeff_q;
-    double   ewclj = fr->ewaldcoeff_lj;
+    double   ewc   = ic->ewaldcoeff_q;
+    double   ewclj = ic->ewaldcoeff_lj;
     double   Vcut  = 0;
 
     if (b14only)
@@ -798,27 +798,27 @@ static void fill_table(t_tabledata *td, int tp, const t_forcerec *fr,
         bPotentialSwitch = ((tp == etabLJ6Switch) || (tp == etabLJ12Switch) ||
                             (tp == etabCOULSwitch) ||
                             (tp == etabEwaldSwitch) || (tp == etabEwaldUserSwitch) ||
-                            (tprops[tp].bCoulomb && (fr->coulomb_modifier == eintmodPOTSWITCH)) ||
-                            (!tprops[tp].bCoulomb && (fr->vdw_modifier == eintmodPOTSWITCH)));
+                            (tprops[tp].bCoulomb && (ic->coulomb_modifier == eintmodPOTSWITCH)) ||
+                            (!tprops[tp].bCoulomb && (ic->vdw_modifier == eintmodPOTSWITCH)));
         bForceSwitch  = ((tp == etabLJ6Shift) || (tp == etabLJ12Shift) ||
                          (tp == etabShift) ||
-                         (tprops[tp].bCoulomb && (fr->coulomb_modifier == eintmodFORCESWITCH)) ||
-                         (!tprops[tp].bCoulomb && (fr->vdw_modifier == eintmodFORCESWITCH)));
-        bPotentialShift = ((tprops[tp].bCoulomb && (fr->coulomb_modifier == eintmodPOTSHIFT)) ||
-                           (!tprops[tp].bCoulomb && (fr->vdw_modifier == eintmodPOTSHIFT)));
+                         (tprops[tp].bCoulomb && (ic->coulomb_modifier == eintmodFORCESWITCH)) ||
+                         (!tprops[tp].bCoulomb && (ic->vdw_modifier == eintmodFORCESWITCH)));
+        bPotentialShift = ((tprops[tp].bCoulomb && (ic->coulomb_modifier == eintmodPOTSHIFT)) ||
+                           (!tprops[tp].bCoulomb && (ic->vdw_modifier == eintmodPOTSHIFT)));
     }
 
-    reppow = fr->reppow;
+    reppow = ic->reppow;
 
     if (tprops[tp].bCoulomb)
     {
-        r1 = fr->rcoulomb_switch;
-        rc = fr->rcoulomb;
+        r1 = ic->rcoulomb_switch;
+        rc = ic->rcoulomb;
     }
     else
     {
-        r1 = fr->rvdw_switch;
-        rc = fr->rvdw;
+        r1 = ic->rvdw_switch;
+        rc = ic->rvdw;
     }
     if (bPotentialSwitch)
     {
@@ -1049,8 +1049,8 @@ static void fill_table(t_tabledata *td, int tp, const t_forcerec *fr,
                 break;
             case etabRF:
             case etabRF_ZERO:
-                Vtab  = 1.0/r      +   fr->k_rf*r2 - fr->c_rf;
-                Ftab  = 1.0/r2     - 2*fr->k_rf*r;
+                Vtab  = 1.0/r      +   ic->k_rf*r2 - ic->c_rf;
+                Ftab  = 1.0/r2     - 2*ic->k_rf*r;
                 if (tp == etabRF_ZERO && r >= rc)
                 {
                     Vtab = 0;
@@ -1149,7 +1149,7 @@ static void fill_table(t_tabledata *td, int tp, const t_forcerec *fr,
     }
 }
 
-static void set_table_type(int tabsel[], const t_forcerec *fr, gmx_bool b14only)
+static void set_table_type(int tabsel[], const interaction_const_t *ic, gmx_bool b14only)
 {
     int eltype, vdwtype;
 
@@ -1160,7 +1160,7 @@ static void set_table_type(int tabsel[], const t_forcerec *fr, gmx_bool b14only)
 
     if (b14only)
     {
-        switch (fr->eeltype)
+        switch (ic->eeltype)
         {
             case eelUSER:
             case eelPMEUSER:
@@ -1173,7 +1173,7 @@ static void set_table_type(int tabsel[], const t_forcerec *fr, gmx_bool b14only)
     }
     else
     {
-        eltype = fr->eeltype;
+        eltype = ic->eeltype;
     }
 
     switch (eltype)
@@ -1185,7 +1185,7 @@ static void set_table_type(int tabsel[], const t_forcerec *fr, gmx_bool b14only)
             tabsel[etiCOUL] = etabShift;
             break;
         case eelSHIFT:
-            if (fr->rcoulomb > fr->rcoulomb_switch)
+            if (ic->rcoulomb > ic->rcoulomb_switch)
             {
                 tabsel[etiCOUL] = etabShift;
             }
@@ -1227,20 +1227,20 @@ static void set_table_type(int tabsel[], const t_forcerec *fr, gmx_bool b14only)
     }
 
     /* Van der Waals time */
-    if (fr->bBHAM && !b14only)
+    if (ic->useBuckingham && !b14only)
     {
         tabsel[etiLJ6]  = etabLJ6;
         tabsel[etiLJ12] = etabEXPMIN;
     }
     else
     {
-        if (b14only && fr->vdwtype != evdwUSER)
+        if (b14only && ic->vdwtype != evdwUSER)
         {
             vdwtype = evdwCUT;
         }
         else
         {
-            vdwtype = fr->vdwtype;
+            vdwtype = ic->vdwtype;
         }
 
         switch (vdwtype)
@@ -1274,10 +1274,10 @@ static void set_table_type(int tabsel[], const t_forcerec *fr, gmx_bool b14only)
                           __FILE__, __LINE__);
         }
 
-        if (!b14only && fr->vdw_modifier != eintmodNONE)
+        if (!b14only && ic->vdw_modifier != eintmodNONE)
         {
-            if (fr->vdw_modifier != eintmodPOTSHIFT &&
-                fr->vdwtype != evdwCUT)
+            if (ic->vdw_modifier != eintmodPOTSHIFT &&
+                ic->vdwtype != evdwCUT)
             {
                 gmx_incons("Potential modifiers other than potential-shift are only implemented for LJ cut-off");
             }
@@ -1285,9 +1285,9 @@ static void set_table_type(int tabsel[], const t_forcerec *fr, gmx_bool b14only)
             /* LJ-PME and other (shift-only) modifiers are handled by applying the modifiers
              * to the original interaction forms when we fill the table, so we only check cutoffs here.
              */
-            if (fr->vdwtype == evdwCUT)
+            if (ic->vdwtype == evdwCUT)
             {
-                switch (fr->vdw_modifier)
+                switch (ic->vdw_modifier)
                 {
                     case eintmodNONE:
                     case eintmodPOTSHIFT:
@@ -1311,7 +1311,7 @@ static void set_table_type(int tabsel[], const t_forcerec *fr, gmx_bool b14only)
 }
 
 t_forcetable *make_tables(FILE *out,
-                          const t_forcerec *fr,
+                          const interaction_const_t *ic,
                           const char *fn,
                           real rtab, int flags)
 {
@@ -1333,7 +1333,7 @@ t_forcetable *make_tables(FILE *out,
     }
     else
     {
-        set_table_type(tabsel, fr, b14only);
+        set_table_type(tabsel, ic, b14only);
     }
     snew(td, etiNR);
     table->r         = rtab;
@@ -1399,13 +1399,15 @@ t_forcetable *make_tables(FILE *out,
         if (!ETAB_USER(tabsel[k]))
         {
             real scale = table->scale;
-            if (fr->bBHAM && (fr->bham_b_max != 0) && tabsel[k] == etabEXPMIN)
+            if (ic->useBuckingham &&
+                (ic->buckinghamBMax != 0) &&
+                tabsel[k] == etabEXPMIN)
             {
-                scale /= fr->bham_b_max;
+                scale /= ic->buckinghamBMax;
             }
             init_table(table->n, nx0, scale, &(td[k]), !useUserTable);
 
-            fill_table(&(td[k]), tabsel[k], fr, b14only);
+            fill_table(&(td[k]), tabsel[k], ic, b14only);
             if (out)
             {
                 fprintf(out, "Generated table with %d data points for %s%s.\n"
@@ -1538,9 +1540,10 @@ bondedtable_t make_bonded_table(FILE *fplog, const char *fn, int angle)
     return tab;
 }
 
-t_forcetable *makeDispersionCorrectionTable(FILE *fp,
-                                            t_forcerec *fr, real rtab,
-                                            const char *tabfn)
+t_forcetable *makeDispersionCorrectionTable(FILE                      *fp,
+                                            const interaction_const_t *ic,
+                                            real                       rtab,
+                                            const char                *tabfn)
 {
     t_forcetable *dispersionCorrectionTable = nullptr;
 
@@ -1553,7 +1556,7 @@ t_forcetable *makeDispersionCorrectionTable(FILE *fp,
         return dispersionCorrectionTable;
     }
 
-    t_forcetable *fullTable = make_tables(fp, fr, tabfn, rtab, 0);
+    t_forcetable *fullTable = make_tables(fp, ic, tabfn, rtab, 0);
     /* Copy the contents of the table to one that has just dispersion
      * and repulsion, to improve cache performance. We want the table
      * data to be aligned to 32-byte boundaries. The pointers could be
index d2ca216357b9ad5a9fcbac75cb308d9ce3ac28bc..7536f48d1b06446c87727cc6e4617cadda337905 100644 (file)
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2012,2014,2015,2016, by the GROMACS development team, led by
+ * Copyright (c) 2012,2014,2015,2016,2017, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -123,7 +123,7 @@ double v_lj_ewald_lr(double beta, double r);
 /*! \brief Return tables for inner loops.
  *
  * \param fp     Log file pointer
- * \param fr     Force record
+ * \param ic     Non-bonded interaction constants
  * \param fn     File name from which to read user tables
  * \param rtab   Largest interaction distance to tabulate
  * \param flags  Flags to select table settings
@@ -131,7 +131,7 @@ double v_lj_ewald_lr(double beta, double r);
  * \return Pointer to inner loop table structure
  */
 t_forcetable *make_tables(FILE *fp,
-                          const t_forcerec *fr,
+                          const interaction_const_t *ic,
                           const char *fn, real rtab, int flags);
 
 /*! \brief Return a table for bonded interactions,
@@ -153,7 +153,7 @@ t_forcetable *make_gb_table(const t_forcerec              *fr);
 /*! \brief Construct and return tabulated dispersion and repulsion interactions
  *
  * This table can be used to compute long-range dispersion corrections */
-t_forcetable *makeDispersionCorrectionTable(FILE *fp, t_forcerec *fr,
+t_forcetable *makeDispersionCorrectionTable(FILE *fp, const interaction_const_t *ic,
                                             real rtab, const char *tabfn);
 
 #endif  /* GMX_TABLES_FORCETABLE_H */
index 359dd58535d1063f9715cd0683fb88a660f8fad4..e462ca09d552b81663f381cb0872908fe5024ecc 100644 (file)
@@ -517,7 +517,7 @@ double gmx::do_md(FILE *fplog, t_commrec *cr, const gmx::MDLogger &mdlog,
     /* PME tuning is only supported in the Verlet scheme, with PME for
      * Coulomb. It is not supported with only LJ PME, or for
      * reruns. */
-    bPMETune = (mdrunOptions.tunePme && EEL_PME(fr->eeltype) && !bRerunMD &&
+    bPMETune = (mdrunOptions.tunePme && EEL_PME(fr->ic->eeltype) && !bRerunMD &&
                 !mdrunOptions.reproducible && ir->cutoff_scheme != ecutsGROUP);
     if (bPMETune)
     {
index 82db9efb0540b85141fef3d1bd6d9aa3c57e2281..e7a9e1d3d856e07d7a168562133a57e3c2ddba9c 100644 (file)
@@ -993,10 +993,10 @@ int Mdrunner::mdrunner()
             }
         }
 
-        if (EEL_PME(fr->eeltype) || EVDW_PME(fr->vdwtype))
+        if (EEL_PME(fr->ic->eeltype) || EVDW_PME(fr->ic->vdwtype))
         {
-            ewaldcoeff_q  = fr->ewaldcoeff_q;
-            ewaldcoeff_lj = fr->ewaldcoeff_lj;
+            ewaldcoeff_q  = fr->ic->ewaldcoeff_q;
+            ewaldcoeff_lj = fr->ic->ewaldcoeff_lj;
             pmedata       = &fr->pmedata;
         }
         else