tsimulation: set grid arrays to constant length - granular - granular dynamics simulation
(HTM) git clone git://src.adamsgaard.dk/granular
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit 1d79f5762a0addfe9627c264a97a6e5e699b7ae1
(DIR) parent 2be85b00f5f100ff705fda0948ac89e973ff9636
(HTM) Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Thu, 25 Mar 2021 21:14:00 +0100
simulation: set grid arrays to constant length
Diffstat:
M simulation.c | 12 ++++++------
M simulation.h | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)
---
(DIR) diff --git a/simulation.c b/simulation.c
t@@ -37,11 +37,14 @@ sim_new(void)
void
sim_defaults(struct simulation *sim)
{
+ size_t i;
+
snprintf(sim->name, sizeof(sim->name), DEFAULT_SIMULATION_NAME);
sim->np = 0;
- sim->gravacc = zeros(3);
- sim->origo = zeros(3);
- sim->L = ones(3);
+ for (i = 0; i < 3; i++)
+ sim->constacc[i] = 0.0;
+ sim->origo[i] = 0.0;
+ sim->L[i] = 1.0;
sim->t = 0.0;
sim->t_end = 0.0;
sim->dt = 0.0;
t@@ -54,9 +57,6 @@ sim_defaults(struct simulation *sim)
void
sim_free(struct simulation *sim)
{
- free(sim->gravacc);
- free(sim->origo);
- free(sim->L);
free(sim->grains);
sim->grains = NULL;
sim->np = 0;
(DIR) diff --git a/simulation.h b/simulation.h
t@@ -12,13 +12,13 @@ struct simulation {
/* simulation name to use for output files */
char name[255];
- /* gravitational acceleration [m/s^2] */
- double *gravacc;
+ /* constant acceleration [m/s^2] */
+ double constacc[3];
/* grain sorting grid */
- size_t *nd;
- double *origo;
- double *L;
+ size_t nd[3];
+ double origo[3];
+ double L[3];
/* temporal state [s] */
double t;