From 23d807748be58e5178c04304d9cc788bf122eb12 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 11 Feb 2014 15:34:18 +0000
Subject: [PATCH] Make changes in memory allocation. Memory reservation is done, but pointers are not linked into corresponding structure. A lot to be done still. However, check how pointers can be recalculated at any time when the block is copied in memory.
---
src/bond.c | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/bond.c b/src/bond.c
index 1478720..af39532 100644
--- a/src/bond.c
+++ b/src/bond.c
@@ -15,8 +15,8 @@
if(vtx1==NULL || vtx2==NULL) return NULL;
/* Verify if the bond already exists... Don't do multiple bonds */
for(i=0;i<blist->n;i++){
- if((blist->bond[i]->data->vtx1==vtx1 || blist->bond[i]->data->vtx1==vtx2)
- &&(blist->bond[i]->data->vtx2==vtx1 || blist->bond[i]->data->vtx2==vtx2))
+ if((blist->bond[i]->vtx1==vtx1 || blist->bond[i]->vtx1==vtx2)
+ &&(blist->bond[i]->vtx2==vtx1 || blist->bond[i]->vtx2==vtx2))
return blist->bond[i];
}
blist->n++;
@@ -24,12 +24,11 @@
if(blist->bond==NULL) fatal("Cannot reallocate memory for additional **ts_bond.",100);
blist->bond[blist->n-1]=(ts_bond *)malloc(sizeof(ts_bond));
if(blist->bond[blist->n-1]==NULL) fatal("Cannot allocate memory for additional *ts_bond.",100);
- blist->bond[blist->n-1]->data=(ts_bond_data *)malloc(sizeof(ts_bond_data));
//NOW insert vertices into data!
- blist->bond[blist->n - 1]->data->vtx1=vtx1;
- blist->bond[blist->n - 1]->data->vtx2=vtx2;
-
+ blist->bond[blist->n - 1]->vtx1=vtx1;
+ blist->bond[blist->n - 1]->vtx2=vtx2;
+ blist->bond[blist->n - 1]->tainted=0;
//Should we calculate bond length NOW?
return blist->bond[blist->n-1];
@@ -38,7 +37,6 @@
ts_bool bond_list_free(ts_bond_list *blist){
ts_uint i;
for(i=0;i<blist->n;i++){
- free(blist->bond[i]->data);
free(blist->bond[i]);
}
free(blist->bond);
--
Gitblit v1.9.3