diff --git a/src/DPD-MESO/fix_mvv_dpd.cpp b/src/DPD-MESO/fix_mvv_dpd.cpp index d51000b15b..6def3305d8 100644 --- a/src/DPD-MESO/fix_mvv_dpd.cpp +++ b/src/DPD-MESO/fix_mvv_dpd.cpp @@ -65,6 +65,11 @@ void FixMvvDPD::init() if (!atom->vest_flag) error->all(FLERR,"Fix mvv/dpd requires atom attribute vest e.g. from atom style mdpd"); + // Cannot use vremap since its effects aren't propagated to vest + // see RHEO or SPH packages for examples patches + if (domain->deform_vremap) + error->all(FLERR, "Fix mvv/dpd cannot be used with velocity remapping"); + if (!force->pair_match("^mdpd",0) && !force->pair_match("^dpd",0)) { if (force->pair_match("^hybrid",0)) { if (!(force->pair_match("^mdpd",0,1) || force->pair_match("^dpd",0),1)) { diff --git a/src/DPD-MESO/fix_mvv_edpd.cpp b/src/DPD-MESO/fix_mvv_edpd.cpp index 7ac0dc3de7..389a8c97bf 100644 --- a/src/DPD-MESO/fix_mvv_edpd.cpp +++ b/src/DPD-MESO/fix_mvv_edpd.cpp @@ -73,6 +73,11 @@ void FixMvvEDPD::init() { if (!atom->edpd_flag) error->all(FLERR,"Fix mvv/edpd requires atom style edpd"); + // Cannot use vremap since its effects aren't propagated to vest + // see RHEO or SPH packages for examples patches + if (domain->deform_vremap) + error->all(FLERR, "Fix mvv/edpd cannot be used with velocity remapping"); + if (!force->pair_match("^edpd",0)) { if (force->pair_match("^hybrid",0)) { if (!force->pair_match("^edpd",0,1)) { diff --git a/src/DPD-MESO/fix_mvv_tdpd.cpp b/src/DPD-MESO/fix_mvv_tdpd.cpp index 122fd56365..1babbb8c5f 100644 --- a/src/DPD-MESO/fix_mvv_tdpd.cpp +++ b/src/DPD-MESO/fix_mvv_tdpd.cpp @@ -71,6 +71,11 @@ void FixMvvTDPD::init() { if (!atom->tdpd_flag) error->all(FLERR,"Fix mvv/tdpd requires atom style tdpd"); + // Cannot use vremap since its effects aren't propagated to vest + // see RHEO or SPH packages for examples patches + if (domain->deform_vremap) + error->all(FLERR, "Fix mvv/tdpd cannot be used with velocity remapping"); + if (!force->pair_match("^tdpd",0)) { if (force->pair_match("^hybrid",0)) { if (!force->pair_match("^tdpd",0,1)) { diff --git a/src/DPD-SMOOTH/fix_meso_move.cpp b/src/DPD-SMOOTH/fix_meso_move.cpp index 2c3213c3cd..89a7814f6a 100644 --- a/src/DPD-SMOOTH/fix_meso_move.cpp +++ b/src/DPD-SMOOTH/fix_meso_move.cpp @@ -350,7 +350,14 @@ void FixMesoMove::init () { } void FixMesoMove::setup_pre_force (int /*vflag*/) { + + // Cannot use vremap since its effects aren't propagated to vest + // see RHEO or SPH packages for examples patches + if (domain->deform_vremap) + error->all(FLERR, "Fix meso/move cannot be used with velocity remapping"); + // set vest equal to v + double **v = atom->v; double **vest = atom->vest; int *mask = atom->mask; diff --git a/src/DPD-SMOOTH/fix_rigid_meso.cpp b/src/DPD-SMOOTH/fix_rigid_meso.cpp index e0ad501e02..bfceb3295e 100644 --- a/src/DPD-SMOOTH/fix_rigid_meso.cpp +++ b/src/DPD-SMOOTH/fix_rigid_meso.cpp @@ -92,6 +92,11 @@ void FixRigidMeso::setup (int vflag) { conjqm[ibody][2] *= 2.0; conjqm[ibody][3] *= 2.0; } + + // Cannot use vremap since its effects aren't propagated to vest + // see RHEO or SPH packages for examples patches + if (domain->deform_vremap) + error->all(FLERR, "Fix rigid/meso cannot be used with velocity remapping"); } /* ---------------------------------------------------------------------- diff --git a/src/MACHDYN/fix_smd_integrate_tlsph.cpp b/src/MACHDYN/fix_smd_integrate_tlsph.cpp index f138a3c387..97cce5524d 100644 --- a/src/MACHDYN/fix_smd_integrate_tlsph.cpp +++ b/src/MACHDYN/fix_smd_integrate_tlsph.cpp @@ -115,6 +115,11 @@ void FixSMDIntegrateTlsph::init() { dtv = update->dt; dtf = 0.5 * update->dt * force->ftm2v; vlimitsq = vlimit * vlimit; + + // Cannot use vremap since its effects aren't propagated to vest + // see RHEO or SPH packages for examples patches + if (domain->deform_vremap) + error->all(FLERR, "Fix smd/integrate_tlsph cannot be used with velocity remapping"); } /* ---------------------------------------------------------------------- diff --git a/src/MACHDYN/fix_smd_integrate_ulsph.cpp b/src/MACHDYN/fix_smd_integrate_ulsph.cpp index 8ef5c65b67..395946ba20 100644 --- a/src/MACHDYN/fix_smd_integrate_ulsph.cpp +++ b/src/MACHDYN/fix_smd_integrate_ulsph.cpp @@ -144,6 +144,11 @@ void FixSMDIntegrateUlsph::init() { dtv = update->dt; dtf = 0.5 * update->dt * force->ftm2v; vlimitsq = vlimit * vlimit; + + // Cannot use vremap since its effects aren't propagated to vest + // see RHEO or SPH packages for examples patches + if (domain->deform_vremap) + error->all(FLERR, "Fix smd/integrate_ulsph cannot be used with velocity remapping"); } /* ----------------------------------------------------------------------