summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdata/anal.sh42
-rw-r--r--src/graph_genfunc.c4
2 files changed, 23 insertions, 23 deletions
diff --git a/data/anal.sh b/data/anal.sh
index 5949d67..6c1454a 100755
--- a/data/anal.sh
+++ b/data/anal.sh
@@ -1,21 +1,21 @@
-../../bin/anal_process avln_s_o_c_c_*
-../../bin/anal_process avln_v_o_c_c_*
-../../bin/anal_process avln_v_d_c_c_*
-../../bin/anal_process cstr_s_o_c_c_*
-../../bin/anal_process cstr_v_o_c_c_*
-../../bin/anal_process cstr_v_d_c_c_*
-../../bin/cen_anal_process damg_s_o_c_c_*
-../../bin/cen_anal_process damg_v_o_c_c_*
-../../bin/cen_anal_process damg_v_d_c_c_*
-../../bin/big_anal_process cond_s_o_c_c_*
-../../bin/big_anal_process cond_v_o_c_c_*
-../../bin/big_anal_process cond_v_d_c_c_*
-../../bin/long_anal_process strs_s_o_c_c_*
-../../bin/long_anal_process strs_v_o_c_c_*
-../../bin/long_anal_process strs_v_d_c_c_*
-../../bin/long_anal_process thrs_s_o_c_c_*
-../../bin/long_anal_process thrs_v_o_c_c_*
-../../bin/long_anal_process thrs_v_d_c_c_*
-../../bin/long_anal_process enrg_s_o_c_c_*
-../../bin/long_anal_process enrg_v_o_c_c_*
-../../bin/long_anal_process enrg_v_d_c_c_*
+anal_process avln_s_o_c_c_*
+anal_process avln_v_o_c_c_*
+anal_process avln_v_d_c_c_*
+anal_process cstr_s_o_c_c_*
+anal_process cstr_v_o_c_c_*
+anal_process cstr_v_d_c_c_*
+cen_anal_process damg_s_o_c_c_*
+cen_anal_process damg_v_o_c_c_*
+cen_anal_process damg_v_d_c_c_*
+big_anal_process cond_s_o_c_c_*
+big_anal_process cond_v_o_c_c_*
+big_anal_process cond_v_d_c_c_*
+long_anal_process strs_s_o_c_c_*
+long_anal_process strs_v_o_c_c_*
+long_anal_process strs_v_d_c_c_*
+long_anal_process thrs_s_o_c_c_*
+long_anal_process thrs_v_o_c_c_*
+long_anal_process thrs_v_d_c_c_*
+long_anal_process enrg_s_o_c_c_*
+long_anal_process enrg_v_o_c_c_*
+long_anal_process enrg_v_d_c_c_*
diff --git a/src/graph_genfunc.c b/src/graph_genfunc.c
index 39a8480..54d9daa 100644
--- a/src/graph_genfunc.c
+++ b/src/graph_genfunc.c
@@ -2,7 +2,7 @@
#include "fracture.h"
double *genfunc_uniform(unsigned int L, bound_t boundary, gsl_rng *r, unsigned int *num) {
- *num = pow(L / 2 + 1, 2) + pow((L + 1) / 2, 2);
+ *num = 2 * pow(L / 2, 2);
double *lattice = (double *)malloc(2 * (*num) * sizeof(double));
for (unsigned int i = 0; i < (*num); i++) {
@@ -18,7 +18,7 @@ double g(double rho, double dist) {
}
double *genfunc_hyperuniform(unsigned int L, bound_t boundary, gsl_rng *r, unsigned int *num) {
- *num = pow(L / 2 + 1, 2) + pow((L + 1) / 2, 2);
+ *num = 2 * pow(L / 2, 2);
// necessary to prevent crashing when underflow occurs
gsl_set_error_handler_off();