X-Git-Url: https://git.lukelau.me/?a=blobdiff_plain;f=simulation.h;h=1985ee3662fb6af8eec728d2a21d48ba6fb9dcb7;hb=724a80cbecb587d1d069f7999758181b10d92f73;hp=c6c9e03b02cae0ae2938124685750bf7e8a793da;hpb=0258cd283dc666dd89f620179f57343662ab5d1a;p=clouds.git

diff --git a/simulation.h b/simulation.h
index c6c9e03..1985ee3 100644
--- a/simulation.h
+++ b/simulation.h
@@ -1,14 +1,27 @@
-#define CLOUD_DIM 16
+#define CLOUD_DIM_X 64
+#define CLOUD_DIM_Y 16
+#define CLOUD_DIM_Z 64
+
+/* #define CLOUD_DIM_X 16 */
+/* #define CLOUD_DIM_Y 16 */
+/* #define CLOUD_DIM_Z 16 */
+
+#define P_EXT 0.1
+#define P_HUM 0.1 
+#define P_ACT 0.001
+
 struct Clouds {
   // TODO: make more efficient
-  bool hum[CLOUD_DIM][CLOUD_DIM][CLOUD_DIM];
-  bool cld[CLOUD_DIM][CLOUD_DIM][CLOUD_DIM];
-  bool act[CLOUD_DIM][CLOUD_DIM][CLOUD_DIM];
-  float p_ext[CLOUD_DIM][CLOUD_DIM][CLOUD_DIM];
-  float p_hum[CLOUD_DIM][CLOUD_DIM][CLOUD_DIM];
-  float p_act[CLOUD_DIM][CLOUD_DIM][CLOUD_DIM];
+  bool hum[CLOUD_DIM_X][CLOUD_DIM_Y][CLOUD_DIM_Z];
+  bool cld[CLOUD_DIM_X][CLOUD_DIM_Y][CLOUD_DIM_Z];
+  bool act[CLOUD_DIM_X][CLOUD_DIM_Y][CLOUD_DIM_Z];
+  float p_ext[CLOUD_DIM_X][CLOUD_DIM_Y][CLOUD_DIM_Z];
+  float p_hum[CLOUD_DIM_X][CLOUD_DIM_Y][CLOUD_DIM_Z];
+  float p_act[CLOUD_DIM_X][CLOUD_DIM_Y][CLOUD_DIM_Z];
+  /** Wind velocity */
+  float vz[CLOUD_DIM_Z];
   /** continuous distribution */
-  float q[CLOUD_DIM][CLOUD_DIM][CLOUD_DIM];
+  float q[CLOUD_DIM_X][CLOUD_DIM_Y][CLOUD_DIM_Z];
 };
 
 void initClouds(Clouds *cs);