theader file fixes - granular - granular dynamics simulation
(HTM) git clone git://src.adamsgaard.dk/granular
(DIR) Log
(DIR) Files
(DIR) Refs
(DIR) README
(DIR) LICENSE
---
(DIR) commit d6fc088af566d5a76d6858d599aa1b37948c85b8
(DIR) parent f845375be0ff38fab566a064266a8507331bb08c
(HTM) Author: Anders Damsgaard <anders@adamsgaard.dk>
Date: Fri, 19 Mar 2021 22:14:56 +0100
header file fixes
Diffstat:
M granular.h | 1 -
M packing.h | 2 ++
M simulation.h | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
---
(DIR) diff --git a/granular.h b/granular.h
t@@ -1,7 +1,6 @@
#ifndef GRANULAR_
#define GRANULAR_
-#define ND 3
#define PI 3.14159265358979323846
#define DEG2RAD(x) (x*PI/180.0)
(DIR) diff --git a/packing.h b/packing.h
t@@ -1,6 +1,8 @@
#ifndef GRANULAR_PACKING_
#define GRANULAR_PACKING_
+#include "grain.h"
+
size_t rectangular_packing(struct grain *grains[],
size_t n[3],
double radius_min, double radius_max,
(DIR) diff --git a/simulation.h b/simulation.h
t@@ -3,7 +3,8 @@
#define DEFAULT_SIMULATION_NAME "unnamed_simulation"
-extern struct simulation sim;
+#include <stdio.h>
+#include "grain.h"
/* Simulation settings */
struct simulation {