Skip to content

Commit 55e6f7f

Browse files
committed
Update Colvars library to version 2025-04-18
The following is a list of pull requests relevant to LAMMPS in the Colvars repository since 2024-08-06: - 752 New tool poisson_integrator_conv Colvars/colvars#752 (@jhenin) - 733 Custom grids for all biases Colvars/colvars#733 (@giacomofiorin, @jhenin) - 776 Avoid error in acos and asin with fast-math Colvars/colvars#776 (@jhenin) - 773 fix: fix the clang build test failure of OPES Colvars/colvars#773 (@HanatoK) - 768 fix: clamp the input values of asin and acos in case of fast math on aarch64 Colvars/colvars#768 (@HanatoK) - 761 Add debug code for the Jacobi failure Colvars/colvars#761 (@HanatoK) - 759 min_image fix; Saves long runs from crashes; Colvars/colvars#759 (@PolyachenkoYA) - 757 Fix MSVC OpenMP issue Colvars/colvars#757 (@HanatoK) - 755 Fix indentation of 'Init CVC' message in standard output Colvars/colvars#755 (@jhenin) - 750 Optimize and simplify the calculation of dihedral gradients Colvars/colvars#750 (@HanatoK) - 749 Add references to new Colvars paper Colvars/colvars#749 (@jhenin, @giacomofiorin) - 740 Report the specific C++ standard at init time, stop warning about C++97/03 Colvars/colvars#740 (@giacomofiorin) - 731 Improve detection of hard/mathematical boundaries Colvars/colvars#731 (@giacomofiorin) - 729 Optimize the fit gradients Colvars/colvars#729 (@HanatoK, @jhenin) - 728 Fix undefined behavior when getting the current working directory from std::filesystem Colvars/colvars#728 (@giacomofiorin) - 727 Add patchversion scripting command Colvars/colvars#727 (@giacomofiorin) - 724 Fix gradients and metric functions of distanceDir Colvars/colvars#724 (@giacomofiorin) - 715 Add missing rotation in orientation component Colvars/colvars#715 (@giacomofiorin) - 713 fix: try to solve lammps#87 for non-scala components Colvars/colvars#713 (@HanatoK) - 709 Implementation of OPES in Colvars Colvars/colvars#709 (@HanatoK, @giacomofiorin, @jhenin) - 706 BUGFIX for Segmentation fault in colvarbias_meta::calc_energy() with useGrids off Colvars/colvars#706 (@alphataubio) - 570 enable use of CVs defined by PyTorch neural network models Colvars/colvars#570 (@zwpku, @giacomofiorin, @HanatoK, @jhenin) Authors: @alphataubio, @EzryStIago, @giacomofiorin, @HanatoK, @jhenin, @PolyachenkoYA, @zwpku
1 parent 7ca4939 commit 55e6f7f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+4343
-1196
lines changed

cmake/Modules/Packages/COLVARS.cmake

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ if(BUILD_OMP)
2626
target_link_libraries(colvars PRIVATE OpenMP::OpenMP_CXX)
2727
endif()
2828

29+
if(BUILD_MPI)
30+
target_compile_definitions(colvars PUBLIC -DCOLVARS_MPI)
31+
target_link_libraries(colvars PUBLIC MPI::MPI_CXX)
32+
endif()
33+
2934
if(COLVARS_DEBUG)
3035
# Need to export the define publicly to be valid in interface code
3136
target_compile_definitions(colvars PUBLIC -DCOLVARS_DEBUG)
48.4 KB
Binary file not shown.

lib/colvars/Makefile.common

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ COLVARS_SRCS = \
3232
colvarbias_histogram_reweight_amd.cpp \
3333
colvarbias_meta.cpp \
3434
colvarbias_restraint.cpp \
35+
colvarbias_opes.cpp \
3536
colvarcomp_alchlambda.cpp \
3637
colvarcomp_angles.cpp \
3738
colvarcomp_apath.cpp \
@@ -40,6 +41,7 @@ COLVARS_SRCS = \
4041
colvarcomp_distances.cpp \
4142
colvarcomp_gpath.cpp \
4243
colvarcomp_neuralnetwork.cpp \
44+
colvarcomp_torchann.cpp \
4345
colvarcomp_combination.cpp \
4446
colvarcomp_protein.cpp \
4547
colvarcomp_rotations.cpp \

lib/colvars/Makefile.deps

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,12 @@ $(COLVARS_OBJ_DIR)colvarbias_restraint.o: colvarbias_restraint.cpp \
5252
colvarproxy_tcl.h colvarproxy_volmaps.h colvarvalue.h \
5353
colvarbias_restraint.h colvarbias.h colvar.h colvarparse.h \
5454
colvarparams.h colvardeps.h
55+
$(COLVARS_OBJ_DIR)colvarbias_opes.o: colvarbias_opes.cpp \
56+
colvarmodule.h colvars_version.h colvarproxy.h colvartypes.h \
57+
../../src/math_eigen_impl.h colvarproxy_io.h colvarproxy_system.h \
58+
colvarproxy_tcl.h colvarproxy_volmaps.h colvarvalue.h \
59+
colvarbias_opes.h colvarbias.h colvar.h colvarparse.h \
60+
colvarparams.h colvardeps.h
5561
$(COLVARS_OBJ_DIR)colvarcomp_alchlambda.o: colvarcomp_alchlambda.cpp \
5662
colvarmodule.h colvars_version.h colvarvalue.h colvartypes.h \
5763
../../src/math_eigen_impl.h colvar.h colvarparse.h colvarparams.h \
@@ -101,6 +107,11 @@ $(COLVARS_OBJ_DIR)colvarcomp_neuralnetwork.o: \
101107
colvarproxy.h colvarproxy_io.h colvarproxy_system.h colvarproxy_tcl.h \
102108
colvarproxy_volmaps.h colvar_geometricpath.h \
103109
colvar_neuralnetworkcompute.h
110+
$(COLVARS_OBJ_DIR)colvarcomp_torchann.o: \
111+
colvarcomp_torchann.cpp colvarmodule.h colvars_version.h \
112+
colvarvalue.h colvartypes.h colvarparse.h colvarparams.h colvar.h \
113+
colvardeps.h colvarcomp.h colvarcomp_torchann.h colvaratoms.h colvarproxy.h colvarproxy_io.h \
114+
colvarproxy_system.h colvarproxy_tcl.h
104115
$(COLVARS_OBJ_DIR)colvarcomp_combination.o: colvarcomp_combination.cpp \
105116
colvarcomp.h colvarmodule.h colvars_version.h colvaratoms.h \
106117
colvarproxy.h colvartypes.h ../../src/math_eigen_impl.h colvarproxy_io.h \
@@ -127,7 +138,7 @@ $(COLVARS_OBJ_DIR)colvarcomp_volmaps.o: colvarcomp_volmaps.cpp \
127138
colvar_geometricpath.h
128139
$(COLVARS_OBJ_DIR)colvar.o: colvar.cpp colvarmodule.h colvars_version.h \
129140
colvarvalue.h colvartypes.h ../../src/math_eigen_impl.h colvarparse.h \
130-
colvarparams.h colvarcomp.h colvaratoms.h colvarproxy.h colvarproxy_io.h \
141+
colvarparams.h colvarcomp.h colvarcomp_torchann.h colvaratoms.h colvarproxy.h colvarproxy_io.h \
131142
colvarproxy_system.h colvarproxy_tcl.h colvarproxy_volmaps.h \
132143
colvardeps.h colvar.h colvar_geometricpath.h colvarbias.h \
133144
colvars_memstream.h
@@ -152,7 +163,8 @@ $(COLVARS_OBJ_DIR)colvarmodule.o: colvarmodule.cpp colvarmodule.h \
152163
colvarbias_histogram_reweight_amd.h colvarbias_meta.h colvarscript.h \
153164
colvarscript_commands.h colvarscript_commands_colvar.h \
154165
colvarscript_commands_bias.h colvaratoms.h colvarcomp.h \
155-
colvar_geometricpath.h colvars_memstream.h colvarmodule_refs.h
166+
colvar_geometricpath.h colvars_memstream.h colvarmodule_refs.h \
167+
colvarbias_opes.h
156168
$(COLVARS_OBJ_DIR)colvarparams.o: colvarparams.cpp colvarmodule.h \
157169
colvars_version.h colvarvalue.h colvartypes.h \
158170
../../src/math_eigen_impl.h colvarparams.h

0 commit comments

Comments
 (0)