From 6705af6d3d02e47a797c53146666a1d168e1aefc Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 06 Mar 2014 08:56:37 +0000
Subject: [PATCH] Merge branch 'trisurf-polyel'. It is the most debugged version. True, without polymeres dump may not work yet, still, from scratch with polymeres set to 0, there should be minimal time penalty.
---
src/energy.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/energy.c b/src/energy.c
index 3b1779c..440f319 100644
--- a/src/energy.c
+++ b/src/energy.c
@@ -19,9 +19,14 @@
return TS_SUCCESS;
}
-inline ts_bool energy_poly_vertex(ts_vertex *vtx,ts_poly *poly){
-
-}
+
+inline ts_bool bond_energy(ts_bond *bond,ts_poly *poly){
+//TODO: This value to be changed and implemented in data structure:
+ ts_double d_relaxed=1.0;
+ bond->energy=poly->k*pow(bond->bond_length-d_relaxed,2);
+ return TS_SUCCESS;
+};
+
inline ts_bool energy_vertex(ts_vertex *vtx){
// ts_vertex *vtx=&vlist->vertex[n]-1; // Caution! 0 Indexed value!
--
Gitblit v1.9.3