Extract 2d sources

NaokiHori · Jun 17, 2024 · 4f0f808 · 4f0f808
1 parent fbcf4f3
commit 4f0f808
Show file tree

Hide file tree

Showing 68 changed files with 111 additions and 3,035 deletions.
diff --git a/include/array_macros/fluid/p.h b/include/array_macros/fluid/p.h
@@ -3,16 +3,8 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 2
 // [0 : isize+1], [0 : jsize+1]
 #define P(I, J) (p[(I  ) + (isize+2) * (J  )])
 #define P_NADDS (int [NDIMS][2]){ {1, 1}, {1, 1}, }
-#endif
-
-#if NDIMS == 3
-// [0 : isize+1], [0 : jsize+1], [0 : ksize+1]
-#define P(I, J, K) (p[(I  ) + (isize+2) * ((J  ) + (jsize+2) * (K  ))])
-#define P_NADDS (int [NDIMS][2]){ {1, 1}, {1, 1}, {1, 1}, }
-#endif
 
 #endif // INCLUDE_ARRAY_MACROS_FLUID_P_H
diff --git a/include/array_macros/fluid/psi.h b/include/array_macros/fluid/psi.h
@@ -3,16 +3,8 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 2
 // [0 : isize+1], [0 : jsize+1]
 #define PSI(I, J) (psi[(I  ) + (isize+2) * (J  )])
 #define PSI_NADDS (int [NDIMS][2]){ {1, 1}, {1, 1}, }
-#endif
-
-#if NDIMS == 3
-// [0 : isize+1], [0 : jsize+1], [0 : ksize+1]
-#define PSI(I, J, K) (psi[(I  ) + (isize+2) * ((J  ) + (jsize+2) * (K  ))])
-#define PSI_NADDS (int [NDIMS][2]){ {1, 1}, {1, 1}, {1, 1}, }
-#endif
 
 #endif // INCLUDE_ARRAY_MACROS_FLUID_PSI_H
diff --git a/include/array_macros/fluid/srct.h b/include/array_macros/fluid/srct.h
@@ -3,16 +3,8 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 2
 // [1 : isize+0], [1 : jsize+0]
 #define SRCT(I, J) (srct[(I-1) + (isize+0) * (J-1)])
 #define SRCT_NADDS (int [NDIMS][2]){ {0, 0}, {0, 0}, }
-#endif
-
-#if NDIMS == 3
-// [1 : isize+0], [1 : jsize+0], [1 : ksize+0]
-#define SRCT(I, J, K) (srct[(I-1) + (isize+0) * ((J-1) + (jsize+0) * (K-1))])
-#define SRCT_NADDS (int [NDIMS][2]){ {0, 0}, {0, 0}, {0, 0}, }
-#endif
 
 #endif // INCLUDE_ARRAY_MACROS_FLUID_SRCT_H
diff --git a/include/array_macros/fluid/srcux.h b/include/array_macros/fluid/srcux.h
@@ -3,16 +3,8 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 2
 // [2 : isize+0], [1 : jsize+0]
 #define SRCUX(I, J) (srcux[(I-2) + (isize-1) * (J-1)])
 #define SRCUX_NADDS (int [NDIMS][2]){ {-1, 0}, {0, 0}, }
-#endif
-
-#if NDIMS == 3
-// [2 : isize+0], [1 : jsize+0], [1 : ksize+0]
-#define SRCUX(I, J, K) (srcux[(I-2) + (isize-1) * ((J-1) + (jsize+0) * (K-1))])
-#define SRCUX_NADDS (int [NDIMS][2]){ {-1, 0}, {0, 0}, {0, 0}, }
-#endif
 
 #endif // INCLUDE_ARRAY_MACROS_FLUID_SRCUX_H
diff --git a/include/array_macros/fluid/srcuy.h b/include/array_macros/fluid/srcuy.h
@@ -3,16 +3,8 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 2
 // [1 : isize+0], [1 : jsize+0]
 #define SRCUY(I, J) (srcuy[(I-1) + (isize+0) * (J-1)])
 #define SRCUY_NADDS (int [NDIMS][2]){ {0, 0}, {0, 0}, }
-#endif
-
-#if NDIMS == 3
-// [1 : isize+0], [1 : jsize+0], [1 : ksize+0]
-#define SRCUY(I, J, K) (srcuy[(I-1) + (isize+0) * ((J-1) + (jsize+0) * (K-1))])
-#define SRCUY_NADDS (int [NDIMS][2]){ {0, 0}, {0, 0}, {0, 0}, }
-#endif
 
 #endif // INCLUDE_ARRAY_MACROS_FLUID_SRCUY_H
diff --git a/include/array_macros/fluid/srcuz.h b/include/array_macros/fluid/srcuz.h
@@ -3,10 +3,4 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 3
-// [1 : isize+0], [1 : jsize+0], [1 : ksize+0]
-#define SRCUZ(I, J, K) (srcuz[(I-1) + (isize+0) * ((J-1) + (jsize+0) * (K-1))])
-#define SRCUZ_NADDS (int [NDIMS][2]){ {0, 0}, {0, 0}, {0, 0}, }
-#endif
-
 #endif // INCLUDE_ARRAY_MACROS_FLUID_SRCUZ_H
diff --git a/include/array_macros/fluid/t.h b/include/array_macros/fluid/t.h
@@ -3,16 +3,8 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 2
 // [0 : isize+1], [0 : jsize+1]
 #define T(I, J) (t[(I  ) + (isize+2) * (J  )])
 #define T_NADDS (int [NDIMS][2]){ {1, 1}, {1, 1}, }
-#endif
-
-#if NDIMS == 3
-// [0 : isize+1], [0 : jsize+1], [0 : ksize+1]
-#define T(I, J, K) (t[(I  ) + (isize+2) * ((J  ) + (jsize+2) * (K  ))])
-#define T_NADDS (int [NDIMS][2]){ {1, 1}, {1, 1}, {1, 1}, }
-#endif
 
 #endif // INCLUDE_ARRAY_MACROS_FLUID_T_H
diff --git a/include/array_macros/fluid/ux.h b/include/array_macros/fluid/ux.h
@@ -3,16 +3,8 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 2
 // [1 : isize+1], [0 : jsize+1]
 #define UX(I, J) (ux[(I-1) + (isize+1) * (J  )])
 #define UX_NADDS (int [NDIMS][2]){ {0, 1}, {1, 1}, }
-#endif
-
-#if NDIMS == 3
-// [1 : isize+1], [0 : jsize+1], [0 : ksize+1]
-#define UX(I, J, K) (ux[(I-1) + (isize+1) * ((J  ) + (jsize+2) * (K  ))])
-#define UX_NADDS (int [NDIMS][2]){ {0, 1}, {1, 1}, {1, 1}, }
-#endif
 
 #endif // INCLUDE_ARRAY_MACROS_FLUID_UX_H
diff --git a/include/array_macros/fluid/uy.h b/include/array_macros/fluid/uy.h
@@ -3,16 +3,8 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 2
 // [0 : isize+1], [0 : jsize+1]
 #define UY(I, J) (uy[(I  ) + (isize+2) * (J  )])
 #define UY_NADDS (int [NDIMS][2]){ {1, 1}, {1, 1}, }
-#endif
-
-#if NDIMS == 3
-// [0 : isize+1], [0 : jsize+1], [0 : ksize+1]
-#define UY(I, J, K) (uy[(I  ) + (isize+2) * ((J  ) + (jsize+2) * (K  ))])
-#define UY_NADDS (int [NDIMS][2]){ {1, 1}, {1, 1}, {1, 1}, }
-#endif
 
 #endif // INCLUDE_ARRAY_MACROS_FLUID_UY_H
diff --git a/include/array_macros/fluid/uz.h b/include/array_macros/fluid/uz.h
@@ -3,10 +3,4 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 3
-// [0 : isize+1], [0 : jsize+1], [0 : ksize+1]
-#define UZ(I, J, K) (uz[(I  ) + (isize+2) * ((J  ) + (jsize+2) * (K  ))])
-#define UZ_NADDS (int [NDIMS][2]){ {1, 1}, {1, 1}, {1, 1}, }
-#endif
-
 #endif // INCLUDE_ARRAY_MACROS_FLUID_UZ_H
diff --git a/include/array_macros/statistics/adv.h b/include/array_macros/statistics/adv.h
@@ -3,16 +3,8 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 2
 // [1 : isize+1], [1 : jsize+0]
 #define ADV(I, J) (adv[(I-1) + (isize+1) * (J-1)])
 #define ADV_NADDS (int [NDIMS][2]){ {0, 1}, {0, 0}, }
-#endif
-
-#if NDIMS == 3
-// [1 : isize+1], [1 : jsize+0], [1 : ksize+0]
-#define ADV(I, J, K) (adv[(I-1) + (isize+1) * ((J-1) + (jsize+0) * (K-1))])
-#define ADV_NADDS (int [NDIMS][2]){ {0, 1}, {0, 0}, {0, 0}, }
-#endif
 
 #endif // INCLUDE_ARRAY_MACROS_STATISTICS_ADV_H
diff --git a/include/array_macros/statistics/dif.h b/include/array_macros/statistics/dif.h
@@ -3,16 +3,8 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 2
 // [1 : isize+1], [1 : jsize+0]
 #define DIF(I, J) (dif[(I-1) + (isize+1) * (J-1)])
 #define DIF_NADDS (int [NDIMS][2]){ {0, 1}, {0, 0}, }
-#endif
-
-#if NDIMS == 3
-// [1 : isize+1], [1 : jsize+0], [1 : ksize+0]
-#define DIF(I, J, K) (dif[(I-1) + (isize+1) * ((J-1) + (jsize+0) * (K-1))])
-#define DIF_NADDS (int [NDIMS][2]){ {0, 1}, {0, 0}, {0, 0}, }
-#endif
 
 #endif // INCLUDE_ARRAY_MACROS_STATISTICS_DIF_H
diff --git a/include/array_macros/statistics/t1.h b/include/array_macros/statistics/t1.h
@@ -3,16 +3,8 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 2
 // [0 : isize+1], [1 : jsize+0]
 #define T1(I, J) (t1[(I  ) + (isize+2) * (J-1)])
 #define T1_NADDS (int [NDIMS][2]){ {1, 1}, {0, 0}, }
-#endif
-
-#if NDIMS == 3
-// [0 : isize+1], [1 : jsize+0], [1 : ksize+0]
-#define T1(I, J, K) (t1[(I  ) + (isize+2) * ((J-1) + (jsize+0) * (K-1))])
-#define T1_NADDS (int [NDIMS][2]){ {1, 1}, {0, 0}, {0, 0}, }
-#endif
 
 #endif // INCLUDE_ARRAY_MACROS_STATISTICS_T1_H
diff --git a/include/array_macros/statistics/t2.h b/include/array_macros/statistics/t2.h
@@ -3,16 +3,8 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 2
 // [0 : isize+1], [1 : jsize+0]
 #define T2(I, J) (t2[(I  ) + (isize+2) * (J-1)])
 #define T2_NADDS (int [NDIMS][2]){ {1, 1}, {0, 0}, }
-#endif
-
-#if NDIMS == 3
-// [0 : isize+1], [1 : jsize+0], [1 : ksize+0]
-#define T2(I, J, K) (t2[(I  ) + (isize+2) * ((J-1) + (jsize+0) * (K-1))])
-#define T2_NADDS (int [NDIMS][2]){ {1, 1}, {0, 0}, {0, 0}, }
-#endif
 
 #endif // INCLUDE_ARRAY_MACROS_STATISTICS_T2_H
diff --git a/include/array_macros/statistics/ux1.h b/include/array_macros/statistics/ux1.h
@@ -3,16 +3,8 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 2
 // [1 : isize+1], [1 : jsize+0]
 #define UX1(I, J) (ux1[(I-1) + (isize+1) * (J-1)])
 #define UX1_NADDS (int [NDIMS][2]){ {0, 1}, {0, 0}, }
-#endif
-
-#if NDIMS == 3
-// [1 : isize+1], [1 : jsize+0], [1 : ksize+0]
-#define UX1(I, J, K) (ux1[(I-1) + (isize+1) * ((J-1) + (jsize+0) * (K-1))])
-#define UX1_NADDS (int [NDIMS][2]){ {0, 1}, {0, 0}, {0, 0}, }
-#endif
 
 #endif // INCLUDE_ARRAY_MACROS_STATISTICS_UX1_H
diff --git a/include/array_macros/statistics/ux2.h b/include/array_macros/statistics/ux2.h
@@ -3,16 +3,8 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 2
 // [1 : isize+1], [1 : jsize+0]
 #define UX2(I, J) (ux2[(I-1) + (isize+1) * (J-1)])
 #define UX2_NADDS (int [NDIMS][2]){ {0, 1}, {0, 0}, }
-#endif
-
-#if NDIMS == 3
-// [1 : isize+1], [1 : jsize+0], [1 : ksize+0]
-#define UX2(I, J, K) (ux2[(I-1) + (isize+1) * ((J-1) + (jsize+0) * (K-1))])
-#define UX2_NADDS (int [NDIMS][2]){ {0, 1}, {0, 0}, {0, 0}, }
-#endif
 
 #endif // INCLUDE_ARRAY_MACROS_STATISTICS_UX2_H
diff --git a/include/array_macros/statistics/uy1.h b/include/array_macros/statistics/uy1.h
@@ -3,16 +3,8 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 2
 // [0 : isize+1], [1 : jsize+0]
 #define UY1(I, J) (uy1[(I  ) + (isize+2) * (J-1)])
 #define UY1_NADDS (int [NDIMS][2]){ {1, 1}, {0, 0}, }
-#endif
-
-#if NDIMS == 3
-// [0 : isize+1], [1 : jsize+0], [1 : ksize+0]
-#define UY1(I, J, K) (uy1[(I  ) + (isize+2) * ((J-1) + (jsize+0) * (K-1))])
-#define UY1_NADDS (int [NDIMS][2]){ {1, 1}, {0, 0}, {0, 0}, }
-#endif
 
 #endif // INCLUDE_ARRAY_MACROS_STATISTICS_UY1_H
diff --git a/include/array_macros/statistics/uy2.h b/include/array_macros/statistics/uy2.h
@@ -3,16 +3,8 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 2
 // [0 : isize+1], [1 : jsize+0]
 #define UY2(I, J) (uy2[(I  ) + (isize+2) * (J-1)])
 #define UY2_NADDS (int [NDIMS][2]){ {1, 1}, {0, 0}, }
-#endif
-
-#if NDIMS == 3
-// [0 : isize+1], [1 : jsize+0], [1 : ksize+0]
-#define UY2(I, J, K) (uy2[(I  ) + (isize+2) * ((J-1) + (jsize+0) * (K-1))])
-#define UY2_NADDS (int [NDIMS][2]){ {1, 1}, {0, 0}, {0, 0}, }
-#endif
 
 #endif // INCLUDE_ARRAY_MACROS_STATISTICS_UY2_H
diff --git a/include/array_macros/statistics/uz1.h b/include/array_macros/statistics/uz1.h
@@ -3,10 +3,4 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 3
-// [0 : isize+1], [1 : jsize+0], [1 : ksize+0]
-#define UZ1(I, J, K) (uz1[(I  ) + (isize+2) * ((J-1) + (jsize+0) * (K-1))])
-#define UZ1_NADDS (int [NDIMS][2]){ {1, 1}, {0, 0}, {0, 0}, }
-#endif
-
 #endif // INCLUDE_ARRAY_MACROS_STATISTICS_UZ1_H
diff --git a/include/array_macros/statistics/uz2.h b/include/array_macros/statistics/uz2.h
@@ -3,10 +3,4 @@
 
 // This file is generated by tools/define_arrays.py
 
-#if NDIMS == 3
-// [0 : isize+1], [1 : jsize+0], [1 : ksize+0]
-#define UZ2(I, J, K) (uz2[(I  ) + (isize+2) * ((J-1) + (jsize+0) * (K-1))])
-#define UZ2_NADDS (int [NDIMS][2]){ {1, 1}, {0, 0}, {0, 0}, }
-#endif
-
 #endif // INCLUDE_ARRAY_MACROS_STATISTICS_UZ2_H
diff --git a/include/domain.h b/include/domain.h
@@ -3,7 +3,7 @@
 
 #include "sdecomp.h"
 
-// definition of a structure domain_t | 25
+// definition of a structure domain_t
 /**
  * @struct domain_t
  * @brief struct storing parameters relevant to spatial domain
@@ -25,9 +25,6 @@ typedef struct {
   double * restrict xf, * restrict xc;
   double * restrict hxxf, * restrict hxxc;
   double hy;
-#if NDIMS == 3
-  double hz;
-#endif
   double * restrict jdxf, * restrict jdxc;
 } domain_t;
 

diff --git a/include/fluid.h b/include/fluid.h
@@ -4,7 +4,7 @@
 #include "array.h"
 #include "domain.h"
 
-// definition of a structure fluid_t_ | 30
+// definition of a structure fluid_t_
 /**
  * @struct fluid_t
  * @brief struct storing fluid-related variables
@@ -20,17 +20,11 @@
 typedef struct {
   array_t ux;
   array_t uy;
-#if NDIMS == 3
-  array_t uz;
-#endif
   array_t p;
   array_t psi;
   array_t t;
   array_t srcux[3];
   array_t srcuy[3];
-#if NDIMS == 3
-  array_t srcuz[3];
-#endif
   array_t srct[3];
   double Ra, Pr;
 } fluid_t;

diff --git a/include/fluid_solver.h b/include/fluid_solver.h
@@ -54,13 +54,6 @@ extern int fluid_update_boundaries_uy(
     array_t * uy
 );
 
-#if NDIMS == 3
-extern int fluid_update_boundaries_uz(
-    const domain_t * domain,
-    array_t * uz
-);
-#endif
-
 extern int fluid_update_boundaries_p(
     const domain_t * domain,
     array_t * p

diff --git a/include/halo.h b/include/halo.h
@@ -7,12 +7,4 @@ int halo_communicate_in_y(
     array_t * array
 );
 
-#if NDIMS == 3
-int halo_communicate_in_z(
-    const domain_t * domain,
-    MPI_Datatype * dtype,
-    array_t * array
-);
-#endif
-
 #endif // HALO_H