diff options
| author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2018-07-30 08:53:25 -0400 |
|---|---|---|
| committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2018-07-30 08:53:25 -0400 |
| commit | 22d55ab7279affffce87cdbdf173aa1928a4ff75 (patch) | |
| tree | 240d21529f8151184211b5a56c6d634296707e79 /src | |
| parent | 0752118cac317bf7af628de5c693724989c30bca (diff) | |
| download | fuse_networks-22d55ab7279affffce87cdbdf173aa1928a4ff75.tar.gz fuse_networks-22d55ab7279affffce87cdbdf173aa1928a4ff75.tar.bz2 fuse_networks-22d55ab7279affffce87cdbdf173aa1928a4ff75.zip | |
removed some merge lines
Diffstat (limited to 'src')
| -rw-r--r-- | src/fracture.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/src/fracture.c b/src/fracture.c index 3203804..41bd056 100644 --- a/src/fracture.c +++ b/src/fracture.c @@ -161,22 +161,14 @@ int main(int argc, char *argv[]) { } char boundc; -<<<<<<< HEAD if (use_voltage_boundaries) { boundc = 'v'; } else { boundc = 'c'; - + } -}FILE *data_out; -======= - if (use_voltage_boundaries) - boundc = 'v'; - else - boundc = 'c'; - FILE *data_out; ->>>>>>> 3ece960188d478d71a880339dba70407a5d0f034 + if (save_data) { char *data_filename = (char *)malloc(filename_len * sizeof(char)); snprintf(data_filename, filename_len, "data_%c_%c_%c_%c_%u_%g_%g.txt", @@ -335,14 +327,9 @@ int main(int argc, char *argv[]) { } } -<<<<<<< HEAD if (save_crit_stress) { crit_stress[i] = data->extern_field[max_pos]; -} -======= - if (save_crit_stress) - crit_stress[i] = data->extern_field[max_pos]; ->>>>>>> 3ece960188d478d71a880339dba70407a5d0f034 + } if (save_conductivity) { if (max_pos > 0) { |