From 2c4278db6ead5c27e30a3000097ed898c968534e Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 09 Mar 2019 19:45:22 +0000
Subject: [PATCH] Added direct force plugin and fixes in stretching energy
---
src/plugins/Makefile.in | 62 ++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 9 deletions(-)
diff --git a/src/plugins/Makefile.in b/src/plugins/Makefile.in
index d6859fc..cc92f88 100644
--- a/src/plugins/Makefile.in
+++ b/src/plugins/Makefile.in
@@ -127,13 +127,20 @@
}
am__installdirs = "$(DESTDIR)$(libdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
-constant_volume_la_LIBADD =
-am_constant_volume_la_OBJECTS = constant_volume.lo
-constant_volume_la_OBJECTS = $(am_constant_volume_la_OBJECTS)
+constant_area_la_LIBADD =
+am_constant_area_la_OBJECTS = constant_area.lo
+constant_area_la_OBJECTS = $(am_constant_area_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
+constant_area_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(constant_area_la_LDFLAGS) $(LDFLAGS) \
+ -o $@
+constant_volume_la_LIBADD =
+am_constant_volume_la_OBJECTS = constant_volume.lo
+constant_volume_la_OBJECTS = $(am_constant_volume_la_OBJECTS)
constant_volume_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
$(AM_CFLAGS) $(CFLAGS) $(constant_volume_la_LDFLAGS) \
@@ -144,6 +151,13 @@
demoplugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(demoplugin_la_LDFLAGS) $(LDFLAGS) -o $@
+direct_force_on_c0_la_LIBADD =
+am_direct_force_on_c0_la_OBJECTS = direct_force_on_c0.lo
+direct_force_on_c0_la_OBJECTS = $(am_direct_force_on_c0_la_OBJECTS)
+direct_force_on_c0_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(direct_force_on_c0_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
nucleus_la_LIBADD =
am_nucleus_la_OBJECTS = nucleus.lo
nucleus_la_OBJECTS = $(am_nucleus_la_OBJECTS)
@@ -163,6 +177,13 @@
pressure_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
$(pressure_la_LDFLAGS) $(LDFLAGS) -o $@
+stretching_energy_la_LIBADD =
+am_stretching_energy_la_OBJECTS = stretching_energy.lo
+stretching_energy_la_OBJECTS = $(am_stretching_energy_la_OBJECTS)
+stretching_energy_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+ $(AM_CFLAGS) $(CFLAGS) $(stretching_energy_la_LDFLAGS) \
+ $(LDFLAGS) -o $@
vmdefaulthardconstraints_la_LIBADD =
am_vmdefaulthardconstraints_la_OBJECTS = default_hard_constraints.lo
vmdefaulthardconstraints_la_OBJECTS = \
@@ -205,12 +226,17 @@
am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
am__v_CCLD_0 = @echo " CCLD " $@;
am__v_CCLD_1 =
-SOURCES = $(constant_volume_la_SOURCES) $(demoplugin_la_SOURCES) \
+SOURCES = $(constant_area_la_SOURCES) $(constant_volume_la_SOURCES) \
+ $(demoplugin_la_SOURCES) $(direct_force_on_c0_la_SOURCES) \
$(nucleus_la_SOURCES) $(plane_confinement_la_SOURCES) \
- $(pressure_la_SOURCES) $(vmdefaulthardconstraints_la_SOURCES)
-DIST_SOURCES = $(constant_volume_la_SOURCES) $(demoplugin_la_SOURCES) \
- $(nucleus_la_SOURCES) $(plane_confinement_la_SOURCES) \
- $(pressure_la_SOURCES) $(vmdefaulthardconstraints_la_SOURCES)
+ $(pressure_la_SOURCES) $(stretching_energy_la_SOURCES) \
+ $(vmdefaulthardconstraints_la_SOURCES)
+DIST_SOURCES = $(constant_area_la_SOURCES) \
+ $(constant_volume_la_SOURCES) $(demoplugin_la_SOURCES) \
+ $(direct_force_on_c0_la_SOURCES) $(nucleus_la_SOURCES) \
+ $(plane_confinement_la_SOURCES) $(pressure_la_SOURCES) \
+ $(stretching_energy_la_SOURCES) \
+ $(vmdefaulthardconstraints_la_SOURCES)
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
@@ -359,7 +385,7 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CFLAGS = -Wall -Werror -DTS_VERSION=\"$(GITVERSION)\" -fgnu89-inline -Wno-error=date-time -I..
-lib_LTLIBRARIES = demoplugin.la vmdefaulthardconstraints.la nucleus.la plane_confinement.la pressure.la constant_volume.la
+lib_LTLIBRARIES = demoplugin.la vmdefaulthardconstraints.la nucleus.la plane_confinement.la pressure.la constant_volume.la constant_area.la stretching_energy.la direct_force_on_c0.la
demoplugin_la_SOURCES = demo_plugin.c
demoplugin_la_LDFLAGS = -module -avoid-version -export-dynamic
vmdefaulthardconstraints_la_SOURCES = default_hard_constraints.c
@@ -372,6 +398,12 @@
pressure_la_LDFLAGS = -module -avoid-version -export-dynamic
constant_volume_la_SOURCES = constant_volume.c
constant_volume_la_LDFLAGS = -module -avoid-version -export-dynamic
+constant_area_la_SOURCES = constant_area.c
+constant_area_la_LDFLAGS = -module -avoid-version -export-dynamic
+stretching_energy_la_SOURCES = stretching_energy.c
+stretching_energy_la_LDFLAGS = -module -avoid-version -export-dynamic
+direct_force_on_c0_la_SOURCES = direct_force_on_c0.c
+direct_force_on_c0_la_LDFLAGS = -module -avoid-version -export-dynamic
all: all-am
.SUFFIXES:
@@ -441,11 +473,17 @@
rm -f $${locs}; \
}
+constant_area.la: $(constant_area_la_OBJECTS) $(constant_area_la_DEPENDENCIES) $(EXTRA_constant_area_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(constant_area_la_LINK) -rpath $(libdir) $(constant_area_la_OBJECTS) $(constant_area_la_LIBADD) $(LIBS)
+
constant_volume.la: $(constant_volume_la_OBJECTS) $(constant_volume_la_DEPENDENCIES) $(EXTRA_constant_volume_la_DEPENDENCIES)
$(AM_V_CCLD)$(constant_volume_la_LINK) -rpath $(libdir) $(constant_volume_la_OBJECTS) $(constant_volume_la_LIBADD) $(LIBS)
demoplugin.la: $(demoplugin_la_OBJECTS) $(demoplugin_la_DEPENDENCIES) $(EXTRA_demoplugin_la_DEPENDENCIES)
$(AM_V_CCLD)$(demoplugin_la_LINK) -rpath $(libdir) $(demoplugin_la_OBJECTS) $(demoplugin_la_LIBADD) $(LIBS)
+
+direct_force_on_c0.la: $(direct_force_on_c0_la_OBJECTS) $(direct_force_on_c0_la_DEPENDENCIES) $(EXTRA_direct_force_on_c0_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(direct_force_on_c0_la_LINK) -rpath $(libdir) $(direct_force_on_c0_la_OBJECTS) $(direct_force_on_c0_la_LIBADD) $(LIBS)
nucleus.la: $(nucleus_la_OBJECTS) $(nucleus_la_DEPENDENCIES) $(EXTRA_nucleus_la_DEPENDENCIES)
$(AM_V_CCLD)$(nucleus_la_LINK) -rpath $(libdir) $(nucleus_la_OBJECTS) $(nucleus_la_LIBADD) $(LIBS)
@@ -456,6 +494,9 @@
pressure.la: $(pressure_la_OBJECTS) $(pressure_la_DEPENDENCIES) $(EXTRA_pressure_la_DEPENDENCIES)
$(AM_V_CCLD)$(pressure_la_LINK) -rpath $(libdir) $(pressure_la_OBJECTS) $(pressure_la_LIBADD) $(LIBS)
+stretching_energy.la: $(stretching_energy_la_OBJECTS) $(stretching_energy_la_DEPENDENCIES) $(EXTRA_stretching_energy_la_DEPENDENCIES)
+ $(AM_V_CCLD)$(stretching_energy_la_LINK) -rpath $(libdir) $(stretching_energy_la_OBJECTS) $(stretching_energy_la_LIBADD) $(LIBS)
+
vmdefaulthardconstraints.la: $(vmdefaulthardconstraints_la_OBJECTS) $(vmdefaulthardconstraints_la_DEPENDENCIES) $(EXTRA_vmdefaulthardconstraints_la_DEPENDENCIES)
$(AM_V_CCLD)$(vmdefaulthardconstraints_la_LINK) -rpath $(libdir) $(vmdefaulthardconstraints_la_OBJECTS) $(vmdefaulthardconstraints_la_LIBADD) $(LIBS)
@@ -465,12 +506,15 @@
distclean-compile:
-rm -f *.tab.c
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constant_area.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constant_volume.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/default_hard_constraints.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/demo_plugin.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/direct_force_on_c0.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nucleus.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plane_confinement.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pressure.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stretching_energy.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
--
Gitblit v1.9.3