Merge branch 'bosonic-pimd-langevin' of https://github.com/yotamfe/lammps into bosonic-pimd-langevin

Conflicts:
	src/REPLICA/fix_pimdb_langevin.cpp
This commit is contained in:
Ofir Blumer
2025-02-10 15:07:25 +02:00

View File

@ -144,6 +144,7 @@ void FixPIMDBLangevin::compute_t_prim()
else {
t_prim = bosonic_exchange.prim_estimator();
}
t_prim = bosonic_exchange.prim_estimator();
}
/* ---------------------------------------------------------------------- */