tfix hierarchy of printing functions - granular - granular dynamics simulation | |
git clone git://src.adamsgaard.dk/granular | |
Log | |
Files | |
Refs | |
README | |
LICENSE | |
--- | |
commit cb1a16972c2a61f0229980932fe3e451ba53d22d | |
parent 17967c3d569b374c02b964414aff190a8ee17804 | |
Author: Anders Damsgaard <[email protected]> | |
Date: Thu, 25 Mar 2021 16:54:34 +0100 | |
fix hierarchy of printing functions | |
Diffstat: | |
M granular2vtu.c | 2 +- | |
M granularpacking.c | 16 +++++++--------- | |
M packing.h | 4 ++-- | |
M simulation.c | 16 ++++++++++++++-- | |
M simulation.h | 6 ++++-- | |
5 files changed, 28 insertions(+), 16 deletions(-) | |
--- | |
diff --git a/granular2vtu.c b/granular2vtu.c | |
t@@ -26,7 +26,7 @@ main(void) | |
while ((linelen = getline(&line, &linesize, stdin)) > 0) | |
sim_add_grain(&sim, grain_read(line)); | |
- sim_print_grains_vtk(stdout, sim.grains, sim.np); | |
+ sim_print_grains_vtk(stdout, &sim); | |
sim_free(&sim); | |
free(line); | |
diff --git a/granularpacking.c b/granularpacking.c | |
t@@ -27,9 +27,8 @@ usage(void) | |
int | |
main(int argc, char *argv[]) | |
{ | |
- size_t n[3], np = 0; | |
- n[0] = 10; n[1] = 10; n[2] = 1; | |
- double *origo = zeros(3); | |
+ size_t n[] = {10, 10, 1}; | |
+ double origo[] = {0.0, 0.0, 0.0}; | |
double padding = 0.0; | |
double r_max = 1.0, r_min = 1.0; | |
struct simulation sim = sim_new(); | |
t@@ -78,19 +77,18 @@ main(int argc, char *argv[]) | |
switch (packing) { | |
case 0: | |
- np = rectangular_packing(&sim.grains, n, r_min, r_max, | |
- random_value_uniform, padding, &origo… | |
+ sim.np += rectangular_packing(&sim.grains, n, r_min, r_max, | |
+ random_value_uniform, padding, o… | |
break; | |
case 1: | |
- np = triangular_packing(&sim.grains, n, r_min, r_max, | |
- random_value_uniform, padding, &origo); | |
+ sim.np += triangular_packing(&sim.grains, n, r_min, r_max, | |
+ random_value_uniform, padding, or… | |
break; | |
default: | |
errx(1, "unknown packing mode"); | |
} | |
- sim_print_grains(stdout, sim.grains, np); | |
+ sim_print_grains(stdout, &sim); | |
- free(origo); | |
sim_free(&sim); | |
} | |
diff --git a/packing.h b/packing.h | |
t@@ -8,14 +8,14 @@ size_t rectangular_packing(struct grain **grains, | |
double radius_min, double radius_max, | |
double (*gsd)(double min, double max), | |
double padding_factor, | |
- double *origo[3]); | |
+ double origo[3]); | |
size_t triangular_packing(struct grain **grains, | |
size_t n[3], | |
double radius_min, double radius_max, | |
double (*gsd)(double min, double max), | |
double padding_factor, | |
- double *origo[3]); | |
+ double origo[3]); | |
/*struct grain ** irregular_packing_2d(int nx, int ny, | |
double radius_min, double radius_max);*/ | |
diff --git a/simulation.c b/simulation.c | |
t@@ -57,7 +57,7 @@ sim_add_grain(struct simulation *sim, struct grain *g) | |
} | |
void | |
-sim_print_grains(FILE *stream, const struct grain *grains, size_t n) | |
+print_grains(FILE *stream, const struct grain *grains, size_t n) | |
{ | |
size_t i; | |
t@@ -66,7 +66,13 @@ sim_print_grains(FILE *stream, const struct grain *grains, … | |
} | |
void | |
-sim_print_grains_vtk(FILE *stream, const struct grain *grains, size_t n) | |
+sim_print_grains(FILE *stream, const struct simulation *sim) | |
+{ | |
+ print_grains(stream, sim->grains, sim->np); | |
+} | |
+ | |
+void | |
+print_grains_vtk(FILE *stream, const struct grain *grains, size_t n) | |
{ | |
size_t i; | |
t@@ -114,3 +120,9 @@ sim_print_grains_vtk(FILE *stream, const struct grain *gra… | |
"\t</UnstructuredGrid>\n" | |
"</VTKFile>\n"); | |
} | |
+ | |
+void | |
+sim_print_grains_vtk(FILE *stream, const struct simulation *sim) | |
+{ | |
+ print_grains_vtk(stream, sim->grains, sim->np); | |
+} | |
diff --git a/simulation.h b/simulation.h | |
t@@ -38,7 +38,9 @@ void sim_free(struct simulation *sim); | |
void sim_add_grain(struct simulation *sim, struct grain *g); | |
-void sim_print_grains(FILE *stream, const struct grain *grains, size_t n); | |
-void sim_print_grains_vtk(FILE *stream, const struct grain *grains, size_t n); | |
+void print_grains(FILE *stream, const struct grain *grains, size_t n); | |
+void sim_print_grains(FILE *stream, const struct simulation *sim); | |
+void print_grains_vtk(FILE *stream, const struct grain *grains, size_t n); | |
+void sim_print_grains_vtk(FILE *stream, const struct simulation *sim); | |
#endif |