Tokagridgen tool

gkeyll/Makefile-gkeyll

@@ -16,7 +16,7 @@ OBJS := $(SRCS:%=../$(BUILD_DIR)/gkeyll/%.o)
 DEPS := $(OBJS:.o=.d)
 
 EXT_INCS := -I${MPI_INC_DIR} -I${LUA_INC_DIR} -I${LAPACK_INC} -I${SUPERLU_INC}
-APP_LW_INCS := -I../core/apps -I../moments/apps -I../vlasov/apps -I../pkpm/apps -I../gyrokinetic/apps
+APP_LW_INCS := -I../core/apps -I../core/zero -I../moments/apps -I../moments/zero -I../vlasov/apps -I../vlasov/zero -I../pkpm/apps -I../pkpm/zero -I../gyrokinetic/apps -I../gyrokinetic/zero 
 
 CORE_INCS := -I../core/minus -I../core/zero
 

gkeyll/gkeyll.c

@@ -75,6 +75,8 @@ static struct tool_description tool_list[] = {
   {"multimomlinear", "multimomlinear.lua",
    "Linear dispersion solver for multi-moment, multifluid equations"},  
   {"eqdskreader", "eqdskreader.lua", "Read eqdsk file, writing data to files"},
+  {"mirrorgridgen", "mirrorgridgen.lua", "Generate grid for use in mirror simulations"},
+  {"tokagridgen", "tokagridgen.lua", "Generate grid for use in tokamak simulations"},
   {0, 0}
 };
 

gkeyll/lua/Tool/gkylt_tokagridgen.h

@@ -0,0 +1,65 @@
+#pragma once
+
+#include <stdbool.h>
+#include <gkyl_gk_block_geom.h>
+#include <gkyl_gyrokinetic_multib.h>
+
+// Forward declarations
+struct gkyl_gk_block_geom;
+struct gkyl_gk_block_geom_info_lite; 
+// Moved from gkyl_toka_grid_gen.h to reduce headers
+enum gkyl_toka_grid_gen_null_points {
+    GKYL_TOKA_GRID_GEN_SINGLE_NULL, // Single Null  Configuration
+    GKYL_TOKA_GRID_GEN_DOUBLE_NULL, // Double Null Configuration
+};
+
+
+// Function pointer type for plate functions
+typedef void (*plate_func_t)(double s, double* RZ);
+
+struct gkylt_tokagridgen_inp {
+    enum gkyl_toka_grid_gen_null_points toka_type; //Tokamak configuration
+
+    double wpsi[4]; // Width of psi for different regions
+    int cell_count[6]; // number of cells in computational space
+
+    // Plate function pointers - these will be set from Lua input
+    plate_func_t plate_func_lower_outer;
+    plate_func_t plate_func_upper_outer;
+    plate_func_t plate_func_lower_inner;
+    plate_func_t plate_func_upper_inner;
+
+    // Region-specific parameters (conditional based on toka_type)
+    // For double_null: lower_PF[6], outer_SOL[7], inner_SOL[6], core[5]
+    // For single_null: lower_PF[8], SOL[7], core[8]
+    double lower_PF[8]; // lower private flux region parameters (max size for both types)
+    double outer_SOL[7]; // outer scrape-off layer parameters (DN only)
+    double inner_SOL[6]; // inner scrape-off layer parameters (DN only)
+    double SOL[7]; // scrape-off layer parameters (SN only)
+    double core[7]; // core region parameters (max size for both types)
+
+    const char *geqdsk_path; // name for file with psi(R,Z)
+    const char *out_prefix; // output prefix
+    const char *name; // application name
+    bool use_half_domain; // flag to indicate if half domain should be used (DN only)
+  };
+
+// Settings struct to return metadata
+struct gkylt_tokagridgen_settings {
+    enum gkyl_toka_grid_gen_null_points toka_type;
+    bool use_half_domain;
+    double psisep;
+};
+
+// Return struct containing both bgeom and settings
+struct gkylt_tokagridgen_output {
+    struct gkyl_gk_block_geom* bgeom;
+    struct gkylt_tokagridgen_settings settings;
+};
+
+struct gkylt_tokagridgen_output gkylt_tokagridgen(const struct gkylt_tokagridgen_inp *tginp);
+
+// Lite accessor to export safe block geometry info to Lua
+void gkyl_gk_block_geom_get_block_lite(const struct gkyl_gk_block_geom *bgeom,
+  int bidx, struct gkyl_gk_block_geom_info_lite *out);
+