Add files via upload

Changes need for Clang compiler - when there is a global variable with the Clang compiler, it has to be declared only once and referenced as "extern" from other files.

Author: ctvaugh

ref/block.h

@@ -24,6 +24,12 @@
 //
 // ************************************************************************
 
+#ifdef MA_MAIN
+#define EXTERN
+#else
+#define EXTERN extern
+#endif
+
 //typedef int num_sz;
 typedef long long num_sz;
 
@@ -44,7 +50,7 @@ typedef struct {
    int cen[3];
    double ****array;
 } block;
-block *blocks;
+EXTERN block *blocks;
 
 typedef struct {
    num_sz number;
@@ -59,81 +65,81 @@ typedef struct {
    int child_node[8];
    int cen[3];
 } parent;
-parent *parents;
+EXTERN parent *parents;
 
 typedef struct {
    num_sz number;     // number of block
    int n;          // position in block array
 } sorted_block;
-sorted_block *sorted_list;
-int *sorted_index;
+EXTERN sorted_block *sorted_list;
+EXTERN int *sorted_index;
 
-int my_pe;
-int num_pes;
+EXTERN int my_pe;
+EXTERN int num_pes;
 
-int max_num_blocks;
-int num_refine;
-int uniform_refine;
-int x_block_size, y_block_size, z_block_size;
-int num_vars;
-int comm_vars;
-int init_block_x, init_block_y, init_block_z;
-int reorder;
-int npx, npy, npz;
-int inbalance;
-int refine_freq;
-int report_diffusion;
-int error_tol;
-int num_tsteps;
-int use_time;
-double end_time;
-int stages_per_ts;
-int checksum_freq;
-int stencil;
-int report_perf;
-int plot_freq;
-int num_objects;
-int lb_opt;
-int block_change;
-int code;
-int permute;
-int nonblocking;
-int refine_ghost;
-int change_dir;
-int group_blocks;
-int limit_move;
-int send_faces;
-int use_rcb;
+EXTERN int max_num_blocks;
+EXTERN int num_refine;
+EXTERN int uniform_refine;
+EXTERN int x_block_size, y_block_size, z_block_size;
+EXTERN int num_vars;
+EXTERN int comm_vars;
+EXTERN int init_block_x, init_block_y, init_block_z;
+EXTERN int reorder;
+EXTERN int npx, npy, npz;
+EXTERN int inbalance;
+EXTERN int refine_freq;
+EXTERN int report_diffusion;
+EXTERN int error_tol;
+EXTERN int num_tsteps;
+EXTERN int use_time;
+EXTERN double end_time;
+EXTERN int stages_per_ts;
+EXTERN int checksum_freq;
+EXTERN int stencil;
+EXTERN int report_perf;
+EXTERN int plot_freq;
+EXTERN int num_objects;
+EXTERN int lb_opt;
+EXTERN int block_change;
+EXTERN int code;
+EXTERN int permute;
+EXTERN int nonblocking;
+EXTERN int refine_ghost;
+EXTERN int change_dir;
+EXTERN int group_blocks;
+EXTERN int limit_move;
+EXTERN int send_faces;
+EXTERN int use_rcb;
 
-int first;
-int *dirs;
-int num_cells;
-int mat;
-int max_num_parents;
-int num_parents;
-int max_active_parent;
-int cur_max_level;
-num_sz *num_blocks;
-num_sz *local_num_blocks;
-num_sz *block_start;
-int num_active;
-int max_active_block;
-num_sz global_active;
-int x_block_half, y_block_half, z_block_half;
-double tol;
-double *grid_sum;
-num_sz *p8;
-int *p2;
-int mesh_size[3];
-int max_mesh_size;
-int *from, *to;
-int msg_len[3][4];
-int local_max_b;
-int global_max_b;
-double *a0, a1;
-double total_fp_divs;
-double total_fp_adds;
-double total_fp_muls;
+EXTERN int first;
+EXTERN int *dirs;
+EXTERN int num_cells;
+EXTERN int mat;
+EXTERN int max_num_parents;
+EXTERN int num_parents;
+EXTERN int max_active_parent;
+EXTERN int cur_max_level;
+EXTERN num_sz *num_blocks;
+EXTERN num_sz *local_num_blocks;
+EXTERN num_sz *block_start;
+EXTERN int num_active;
+EXTERN int max_active_block;
+EXTERN num_sz global_active;
+EXTERN int x_block_half, y_block_half, z_block_half;
+EXTERN double tol;
+EXTERN double *grid_sum;
+EXTERN num_sz *p8;
+EXTERN int *p2;
+EXTERN int mesh_size[3];
+EXTERN int max_mesh_size;
+EXTERN int *from, *to;
+EXTERN int msg_len[3][4];
+EXTERN int local_max_b;
+EXTERN int global_max_b;
+EXTERN double *a0, a1;
+EXTERN double total_fp_divs;
+EXTERN double total_fp_adds;
+EXTERN double total_fp_muls;
 
 typedef struct {
    int type;
@@ -146,24 +152,24 @@ typedef struct {
    double orig_size[3];
    double inc[3];
 } object;
-object *objects;
+EXTERN object *objects;
 
-int num_dots;
-int max_num_dots;
-int max_active_dot;
+EXTERN int num_dots;
+EXTERN int max_num_dots;
+EXTERN int max_active_dot;
 typedef struct {
    num_sz number;
    int n;
    int proc;
    int new_proc;
    int cen[3];
 } dot;
-dot *dots;
+EXTERN dot *dots;
 typedef struct {
    num_sz number;
    num_sz num_prime;
    int n;
    int proc;
    int new_proc;
 } spot;
-spot *spots;
+EXTERN spot *spots;

ref/comm.h

@@ -24,32 +24,39 @@
 //
 // ************************************************************************
 
+#ifdef MA_MAIN
+#define EXTERN
+#else
+#define EXTERN extern
+#endif
+
 /* comm partner variables */
-double *send_buff, *recv_buff;    /* use in comm and for balancing blocks */
+EXTERN double *send_buff, *recv_buff;   // use in comm and for balancing blocks
 
-int s_buf_size, r_buf_size;
+EXTERN int s_buf_size, r_buf_size;
 
-int num_comm_partners[3],  // number of comm partners in each direction
-    *comm_partner[3],      // list of comm partners in each direction
-    max_comm_part[3],      // lengths of comm partners arrays
-    *send_size[3],         // send sizes for each comm partner
-    *recv_size[3],         // recv sizes for each comm partner
-    *comm_index[3],        // index into comm_block, _face_case, and offsets
-    *comm_num[3],          // number of blocks for each comm partner
-    *comm_block[3],        // array containing local block number for comm
-    *comm_face_case[3],    // array containing face cases for comm
-    *comm_pos[3],          // position for center of sending face
-    *comm_pos1[3],         // perpendicular position of sending face
-    *comm_send_off[3],     // offset into send buffer (global, convert to local)
-    *comm_recv_off[3],     // offset into recv buffer
-    num_cases[3],          // amount used in above six arrays
-    max_num_cases[3],      // length of above six arrays
-    s_buf_num[3],          // total amount being sent in each direction
-    r_buf_num[3];          // total amount being received in each direction
+EXTERN int num_comm_partners[3],  // number of comm partners in each direction
+           *comm_partner[3],      // list of comm partners in each direction
+           max_comm_part[3],      // lengths of comm partners arrays
+           *send_size[3],         // send sizes for each comm partner
+           *recv_size[3],         // recv sizes for each comm partner
+           *comm_index[3],        // index: comm_block, _face_case, and offsets
+           *comm_num[3],          // number of blocks for each comm partner
+           *comm_block[3],        // array containing local block num for comm
+           *comm_face_case[3],    // array containing face cases for comm
+           *comm_pos[3],          // position for center of sending face
+           *comm_pos1[3],         // perpendicular position of sending face
+           *comm_send_off[3],     // offset into send buffer
+                                  // (global, convert to local)
+           *comm_recv_off[3],     // offset into recv buffer
+           num_cases[3],          // amount used in above six arrays
+           max_num_cases[3],      // length of above six arrays
+           s_buf_num[3],          // total amount being sent in each direction
+           r_buf_num[3];          // total amount being received in each dir
 
-MPI_Request *request, *s_req;
+EXTERN MPI_Request *request, *s_req;
 
-int max_num_req;
+EXTERN int max_num_req;
 
 // for comm_parent - this is a non-symetric communication
 
@@ -58,18 +65,17 @@ typedef struct {
    int *comm_part;             // core to communicate with
    int *comm_num;              // number to communicate to each core
    int *index;                 // offset into next two arrays
-   num_sz *comm_b;                // block number to communicate from
-   num_sz *comm_p;                // parent number of block (for sorting)
+   num_sz *comm_b;             // block number to communicate from
+   num_sz *comm_p;             // parent number of block (for sorting)
    int *comm_c;                // child number of block
    int max_part;               // max communication partners
    int num_cases;              // number to communicate
    int max_cases;              // max number to communicate
 } par_comm;
-par_comm par_b, par_p, par_p1;
+EXTERN par_comm par_b, par_p, par_p1;
 
-int *bin,
-    *gbin;
+EXTERN int *bin, *gbin;
 
-MPI_Comm *comms;
-int *me;
-int *np;
+EXTERN MPI_Comm *comms;
+EXTERN int *me;
+EXTERN int *np;