sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix splash2 benchmark

Browse source 
During the last commit of splash2 benchmark it seems before committing
when we ran "make clean", it effectively undid what the patch at below
link did
http://www.capsl.udel.edu/splash/Download.html

Fix this since without this it is not possible to build the arcane
splash2 benchmark.
This commit is contained in:
Sanchayan Maity 2017-04-26 21:33:02 +05:30
parent 2fcc51c2c1
commit 0f4b39775c
135 changed files with 9862 additions and 8916 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
splash2/codes/Makefile.config
View file

@ -6,7 +6,7 @@ CFLAGS := $(CFLAGS) -Wpadded -Winline -Wpointer-arith -Wsign-compare -Wendif-lab
LDFLAGS := -lm libpthread.a m5op_x86.o LDFLAGS := -lm libpthread.a m5op_x86.o
BASEDIR := $(HOME)/GitSource/gem5/splash2/codes BASEDIR := $(HOME)/GitSource/gem5/splash2/codes
MACROS := $(BASEDIR)/null_macros/c.m4.null.POSIX_BARRIER MACROS := $(BASEDIR)/null_macros/c.m4.null.POSIX
M4 := m4 -s -Ulen -Uindex M4 := m4 -s -Ulen -Uindex
x = * x = *

29
splash2/codes/apps/barnes/stdinc.H
View file

@ -21,14 +21,13 @@
#ifndef _STDINC_H_ #ifndef _STDINC_H_
#define _STDINC_H_ #define _STDINC_H_
#include <math.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <time.h>
#include <sys/times.h> #include <sys/times.h>
#include <cmath>
#include <cstdio>
#include <cstdlib>
#include <cstring>
#include <ctime>
#define error(msg, ...) printf(msg, ##__VA_ARGS__); #define error(msg, ...) printf(msg, ##__VA_ARGS__);
/* /*
* STREAM: a replacement for FILE *. * STREAM: a replacement for FILE *.
@ -60,7 +59,7 @@ typedef char byte;
*/ */
typedef char *string; typedef char *string;
/* /*
* REAL: default type is double; * REAL: default type is double;
*/ */
@ -99,7 +98,7 @@ typedef real (*rproc)();
#define FOUR_PI 12.56637061435917295385 #define FOUR_PI 12.56637061435917295385
#define HALF_PI 1.57079632679489661923 #define HALF_PI 1.57079632679489661923
#define FRTHRD_PI 4.18879020478639098462 #define FRTHRD_PI 4.18879020478639098462
/* /*
* ABS: returns the absolute value of its argument * ABS: returns the absolute value of its argument
* MAX: returns the argument with the highest value * MAX: returns the argument with the highest value
@ -108,13 +107,13 @@ typedef real (*rproc)();
#define ABS(x) (((x) < 0) ? -(x) : (x)) #define ABS(x) (((x) < 0) ? -(x) : (x))
#include "code.h"
#include "code_io.h"
#include "defs.h"
#include "getparam.h"
#include "grav.h"
#include "load.h"
#include "util.h"
#include "vectmath.h" #include "vectmath.h"
#include "defs.h"
#include "code.h"
#include "util.h"
#include "load.h"
#include "code_io.h"
#include "grav.h"
#include "getparam.h"
#endif #endif

7
splash2/codes/apps/fmm/box.C
View file

@ -14,13 +14,12 @@
/* */ /* */
/*************************************************************************/ /*************************************************************************/
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "box.h"
#include "defs.h" #include "defs.h"
#include "memory.h" #include "memory.h"
#include "particle.h" #include "particle.h"
#include "box.h"
/* How many boxes can fit on one line */ /* How many boxes can fit on one line */
#define BOXES_PER_LINE 4 #define BOXES_PER_LINE 4

9
splash2/codes/apps/fmm/construct_grid.C
View file

@ -14,15 +14,14 @@
/* */ /* */
/*************************************************************************/ /*************************************************************************/
#include <cfloat> #include <stdio.h>
#include <cstdio> #include <float.h>
#include "box.h"
#include "construct_grid.h"
#include "defs.h" #include "defs.h"
#include "memory.h" #include "memory.h"
#include "particle.h" #include "particle.h"
#include "box.h"
#include "partition_grid.h" #include "partition_grid.h"
#include "construct_grid.h"
#define MY_PARTICLES (Local[my_id].Particles) #define MY_PARTICLES (Local[my_id].Particles)
#define MY_NUM_PARTICLES (Local[my_id].Num_Particles) #define MY_NUM_PARTICLES (Local[my_id].Num_Particles)

4
splash2/codes/apps/fmm/cost_zones.C
View file

@ -14,11 +14,11 @@
/* */ /* */
/*************************************************************************/ /*************************************************************************/
#include "box.h"
#include "cost_zones.h"
#include "defs.h" #include "defs.h"
#include "memory.h" #include "memory.h"
#include "box.h"
#include "partition_grid.h" #include "partition_grid.h"
#include "cost_zones.h"
#define NUM_DIRECTIONS 4 #define NUM_DIRECTIONS 4

7
splash2/codes/apps/fmm/defs.C
View file

@ -14,10 +14,9 @@
/* */ /* */
/*************************************************************************/ /*************************************************************************/
#include <cmath> #include <stdio.h>
#include <cstdarg> #include <stdarg.h>
#include <cstdio> #include <math.h>
#include "defs.h" #include "defs.h"
#include "memory.h" #include "memory.h"

10
splash2/codes/apps/fmm/defs.H
View file

@ -17,11 +17,11 @@
#ifndef _Defs_H #ifndef _Defs_H
#define _Defs_H 1 #define _Defs_H 1
#include <cassert> #include <stdio.h>
#include <climits> #include <stdlib.h>
#include <cmath> #include <assert.h>
#include <cstdio> #include <math.h>
#include <cstdlib> #include <limits.h>
/* Define booleans */ /* Define booleans */
#ifdef TRUE #ifdef TRUE

19
splash2/codes/apps/fmm/fmm.C
View file

@ -66,20 +66,19 @@
*/ */
#include <cerrno> #include <stdio.h>
#include <cmath> #include <math.h>
#include <cstdio> #include <errno.h>
#include <cstdlib> #include <stdlib.h>
#include <cstring> #include <string.h>
#include "box.h"
#include "construct_grid.h"
#include "cost_zones.h"
#include "defs.h" #include "defs.h"
#include "interactions.h"
#include "memory.h" #include "memory.h"
#include "particle.h" #include "particle.h"
#include "box.h"
#include "partition_grid.h" #include "partition_grid.h"
#include "cost_zones.h"
#include "construct_grid.h"
#include "interactions.h"
#define BASE ((((double) 4) - sqrt((double) 2)) / sqrt((double) 2)) #define BASE ((((double) 4) - sqrt((double) 2)) / sqrt((double) 2))
#define MAX_LINE_SIZE 100 #define MAX_LINE_SIZE 100

9
splash2/codes/apps/fmm/interactions.C
View file

@ -14,15 +14,14 @@
/* */ /* */
/*************************************************************************/ /*************************************************************************/
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "box.h"
#include "defs.h" #include "defs.h"
#include "interactions.h"
#include "memory.h" #include "memory.h"
#include "particle.h" #include "particle.h"
#include "box.h"
#include "partition_grid.h" #include "partition_grid.h"
#include "interactions.h"
static real Inv[MAX_EXPANSION_TERMS + 1]; static real Inv[MAX_EXPANSION_TERMS + 1];
static real OverInc[MAX_EXPANSION_TERMS + 1]; static real OverInc[MAX_EXPANSION_TERMS + 1];

3
splash2/codes/apps/fmm/memory.C
View file

@ -14,8 +14,7 @@
/* */ /* */
/*************************************************************************/ /*************************************************************************/
#include <cfloat> #include <float.h>
#include "defs.h" #include "defs.h"
#include "memory.h" #include "memory.h"

2
splash2/codes/apps/fmm/memory.H
View file

@ -17,9 +17,9 @@
#ifndef _Memory_H #ifndef _Memory_H
#define _Memory_H 1 #define _Memory_H 1
#include "box.h"
#include "defs.h" #include "defs.h"
#include "particle.h" #include "particle.h"
#include "box.h"
#define MAX_LOCKS 2048 #define MAX_LOCKS 2048

6
splash2/codes/apps/fmm/particle.C
View file

@ -14,11 +14,9 @@
/* */ /* */
/*************************************************************************/ /*************************************************************************/
#include <stdio.h>
#include <unistd.h> #include <unistd.h>
#include <stdlib.h>
#include <cstdio>
#include <cstdlib>
#include "defs.h" #include "defs.h"
#include "memory.h" #include "memory.h"
#include "particle.h" #include "particle.h"

7
splash2/codes/apps/fmm/partition_grid.C
View file

@ -14,13 +14,12 @@
/* */ /* */
/*************************************************************************/ /*************************************************************************/
#include <climits> #include <math.h>
#include <cmath> #include <limits.h>
#include "box.h"
#include "defs.h" #include "defs.h"
#include "memory.h" #include "memory.h"
#include "particle.h" #include "particle.h"
#include "box.h"
#include "partition_grid.h" #include "partition_grid.h"
#define DIVISOR(x) ((x <= 20) ? 1 : ((x - 20) * 50)) #define DIVISOR(x) ((x <= 20) ? 1 : ((x - 20) * 50))

2
splash2/codes/apps/fmm/partition_grid.H
View file

@ -17,8 +17,8 @@
#ifndef _Partition_H #ifndef _Partition_H
#define _Partition_H 1 #define _Partition_H 1
#include "box.h"
#include "defs.h" #include "defs.h"
#include "box.h"
/* Void function type */ /* Void function type */
typedef void (*partition_function)(long my_id, box *b); typedef void (*partition_function)(long my_id, box *b);

7
splash2/codes/apps/ocean/contiguous_partitions/jacobcalc.C
View file

@ -19,10 +19,9 @@
EXTERN_ENV EXTERN_ENV
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include <ctime> #include <time.h>
#include "decs.h" #include "decs.h"
void jacobcalc(double ***x, double ***y, double ***z, long pid, long firstrow, long lastrow, long firstcol, long lastcol) void jacobcalc(double ***x, double ***y, double ***z, long pid, long firstrow, long lastrow, long firstcol, long lastcol)

7
splash2/codes/apps/ocean/contiguous_partitions/jacobcalc2.C
View file

@ -19,10 +19,9 @@
EXTERN_ENV EXTERN_ENV
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include <ctime> #include <time.h>
#include "decs.h" #include "decs.h"
void jacobcalc2(double ****x, double ****y, double ****z, long psiindex, long pid, long firstrow, long lastrow, long firstcol, long lastcol) void jacobcalc2(double ****x, double ****y, double ****z, long psiindex, long pid, long firstrow, long lastrow, long firstcol, long lastcol)

7
splash2/codes/apps/ocean/contiguous_partitions/laplacalc.C
View file

@ -18,10 +18,9 @@
EXTERN_ENV EXTERN_ENV
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include <ctime> #include <time.h>
#include "decs.h" #include "decs.h"
void laplacalc(long procid, double ****x, double ****z, long psiindex, long firstrow, long lastrow, long firstcol, long lastcol) void laplacalc(long procid, double ****x, double ****z, long psiindex, long firstrow, long lastrow, long firstcol, long lastcol)

9
splash2/codes/apps/ocean/contiguous_partitions/main.C
View file

@ -56,11 +56,10 @@ MAIN_ENV
#define DOWNRIGHT 7 #define DOWNRIGHT 7
#define PAGE_SIZE 4096 #define PAGE_SIZE 4096
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include <cstdlib> #include <time.h>
#include <ctime> #include <stdlib.h>
#include "decs.h" #include "decs.h"
struct multi_struct *multi; struct multi_struct *multi;

9
splash2/codes/apps/ocean/contiguous_partitions/multi.C
View file

@ -21,11 +21,10 @@
EXTERN_ENV EXTERN_ENV
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include <cstdlib> #include <time.h>
#include <ctime> #include <stdlib.h>
#include "decs.h" #include "decs.h"
/* perform multigrid (w cycles) */ /* perform multigrid (w cycles) */

9
splash2/codes/apps/ocean/contiguous_partitions/slave1.C
View file

@ -20,11 +20,10 @@
EXTERN_ENV EXTERN_ENV
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include <cstdlib> #include <time.h>
#include <ctime> #include <stdlib.h>
#include "decs.h" #include "decs.h"
void slave() void slave()

9
splash2/codes/apps/ocean/contiguous_partitions/slave2.C
View file

@ -20,11 +20,10 @@
EXTERN_ENV EXTERN_ENV
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include <cstdlib> #include <time.h>
#include <ctime> #include <stdlib.h>
#include "decs.h" #include "decs.h"
void slave2(long procid, long firstrow, long lastrow, long numrows, long firstcol, long lastcol, long numcols) void slave2(long procid, long firstrow, long lastrow, long numrows, long firstcol, long lastcol, long numcols)

5
splash2/codes/apps/ocean/contiguous_partitions/subblock.C
View file

@ -16,9 +16,8 @@
EXTERN_ENV EXTERN_ENV
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "decs.h" #include "decs.h"
void subblock() void subblock()

7
splash2/codes/apps/ocean/non_contiguous_partitions/jacobcalc.C
View file

@ -17,10 +17,9 @@
/* does the arakawa jacobian calculation (of the x and y matrices, /* does the arakawa jacobian calculation (of the x and y matrices,
putting the results in the z matrix) for a subblock. */ putting the results in the z matrix) for a subblock. */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include <ctime> #include <time.h>
#include "decs.h" #include "decs.h"
void jacobcalc(double x[IMAX][JMAX], double y[IMAX][JMAX], double z[IMAX][JMAX], long pid, long firstrow, long lastrow, long firstcol, long lastcol, long numrows, long numcols) void jacobcalc(double x[IMAX][JMAX], double y[IMAX][JMAX], double z[IMAX][JMAX], long pid, long firstrow, long lastrow, long firstcol, long lastcol, long numrows, long numcols)

7
splash2/codes/apps/ocean/non_contiguous_partitions/laplacalc.C
View file

@ -20,10 +20,9 @@
performs the laplacian calculation for a subblock. */ performs the laplacian calculation for a subblock. */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include <ctime> #include <time.h>
#include "decs.h" #include "decs.h"
void laplacalc(double x[IMAX][JMAX], double z[IMAX][JMAX], long firstrow, long lastrow, long firstcol, long lastcol, long numrows, long numcols) void laplacalc(double x[IMAX][JMAX], double z[IMAX][JMAX], long firstrow, long lastrow, long firstcol, long lastcol, long numrows, long numcols)

9
splash2/codes/apps/ocean/non_contiguous_partitions/main.C
View file

@ -23,11 +23,10 @@
/* */ /* */
/*************************************************************************/ /*************************************************************************/
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include <cstdlib> #include <time.h>
#include <ctime> #include <stdlib.h>
#include "decs.h" #include "decs.h"
MAIN_ENV MAIN_ENV

9
splash2/codes/apps/ocean/non_contiguous_partitions/multi.C
View file

@ -19,11 +19,10 @@
iterations, w cycles, and the method of half-injection for iterations, w cycles, and the method of half-injection for
residual computation */ residual computation */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include <cstdlib> #include <time.h>
#include <ctime> #include <stdlib.h>
#include "decs.h" #include "decs.h"
/* perform multigrid (w cycles) */ /* perform multigrid (w cycles) */

8
splash2/codes/apps/ocean/non_contiguous_partitions/slave1.C
View file

@ -18,10 +18,10 @@
subroutine slave subroutine slave
**************** */ **************** */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include <cstdlib> #include <time.h>
#include <ctime> #include <stdlib.h>
#include "decs.h" #include "decs.h"

9
splash2/codes/apps/ocean/non_contiguous_partitions/slave2.C
View file

@ -18,11 +18,10 @@
subroutine slave2 subroutine slave2
**************** */ **************** */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include <cstdlib> #include <time.h>
#include <ctime> #include <stdlib.h>
#include "decs.h" #include "decs.h"
void slave2(long procid, long firstrow, long lastrow, long numrows, long firstcol, long lastcol, long numcols) void slave2(long procid, long firstrow, long lastrow, long numrows, long firstcol, long lastcol, long numcols)

2
splash2/codes/apps/radiosity/display.C
View file

@ -14,7 +14,7 @@
/* */ /* */
/*************************************************************************/ /*************************************************************************/
#include <cstdio> #include <stdio.h>
EXTERN_ENV; EXTERN_ENV;

2
splash2/codes/apps/radiosity/elemman.C
View file

@ -23,7 +23,7 @@
*/ */
#include <cstdio> #include <stdio.h>
EXTERN_ENV; EXTERN_ENV;

3
splash2/codes/apps/radiosity/glibps/glibps.c
View file

@ -8,9 +8,8 @@
* *
***************************************************************/ ***************************************************************/
#include <math.h>
#include <stdio.h> #include <stdio.h>
#include <math.h>
#include "pslib.h" #include "pslib.h"
#define SCREEN_WIDTH (6.0*72) #define SCREEN_WIDTH (6.0*72)

2
splash2/codes/apps/radiosity/modelman.C
View file

@ -24,7 +24,7 @@
* *
*************************************************************************/ *************************************************************************/
#include <cstdio> #include <stdio.h>
EXTERN_ENV; EXTERN_ENV;

2
splash2/codes/apps/radiosity/patchman.C
View file

@ -24,7 +24,7 @@
* *
*************************************************************************/ *************************************************************************/
#include <cstdio> #include <stdio.h>
EXTERN_ENV; EXTERN_ENV;

20
splash2/codes/apps/radiosity/rad_main.C
View file

@ -22,15 +22,12 @@
* *
***************************************************************/ ***************************************************************/
#include <cstdio> #include <stdio.h>
#include <cstring> #include <string.h>
#if defined(SGI_GL) #if defined(SGI_GL)
#include <gl.h> #include <gl.h>
#if defined(GL_NASA) #if defined(GL_NASA)
#include <panel.h> #include <panel.h>
#endif #endif
#endif #endif
@ -283,16 +280,9 @@ int main(int argc, char *argv[])
min_vertex_time = timing[i]->vertex_time; min_vertex_time = timing[i]->vertex_time;
} }
printf("\n\n%8s%20lu%20lu%12lu%12lu\n","Max", max_rad_time, max_refine_time, printf("\n\n%8s%20lu%20lu%12lu%12lu\n","Max", max_rad_time, max_refine_time, max_wait_time, max_vertex_time);
max_wait_time, max_vertex_time); printf("\n%8s%20lu%20lu%12lu%12lu\n","Min", min_rad_time, min_refine_time, min_wait_time, min_vertex_time);
printf("\n%8s%20lu%20lu%12lu%12lu\n","Min", min_rad_time, min_refine_time, printf("\n%8s%20lu%20lu%12lu%12lu\n","Avg", (long) (((double) total_rad_time) / ((double) (1.0 * n_processors))), (long) (((double) total_refine_time) / ((double) (1.0 * n_processors))), (long) (((double) total_wait_time) / ((double) (1.0 * n_processors))), (long) (((double) total_vertex_time) / ((double) (1.0 * n_processors))));
min_wait_time, min_vertex_time);
printf("\n%8s%20lu%20lu%12lu%12lu\n","Avg",
(long) (((double) total_rad_time) /
((double) (1.0 * n_processors))),
(long) (((double) total_refine_time) / ((double) (1.0 * n_processors))),
(long) (((double) total_wait_time) / ((double) (1.0 * n_processors))),
(long) (((double) total_vertex_time) / ((double) (1.0 * n_processors))));
printf("\n\n"); printf("\n\n");
} }

2
splash2/codes/apps/radiosity/rad_tools.C
View file

@ -20,7 +20,7 @@
* *
***************************************************************/ ***************************************************************/
#include <cstdio> #include <stdio.h>
EXTERN_ENV; EXTERN_ENV;

4
splash2/codes/apps/radiosity/radiosity.H
View file

@ -21,8 +21,7 @@ of the program, as well as lobal data structure declarations */
#ifndef _RADIOSITY_H #ifndef _RADIOSITY_H
#define _RADIOSITY_H #define _RADIOSITY_H
#include <cmath> #include <math.h>
include(parallel.h) include(parallel.h)
include(patch.h) include(patch.h)
include(model.h) include(model.h)
@ -30,6 +29,7 @@ include(task.h)
#include "glib.h" #include "glib.h"
#include "pslib.h" #include "pslib.h"
/**************************************** /****************************************
* *
* Configuration Parameters * Configuration Parameters

2
splash2/codes/apps/radiosity/room_model.C
View file

@ -28,7 +28,7 @@
EXTERN_ENV; EXTERN_ENV;
#include <cstdio> #include <stdio.h>
include(radiosity.h) include(radiosity.h)

2
splash2/codes/apps/radiosity/smallobj.C
View file

@ -21,7 +21,7 @@
* *
*************************************************************************/ *************************************************************************/
#include <cstdio> #include <stdio.h>
EXTERN_ENV; EXTERN_ENV;

2
splash2/codes/apps/radiosity/taskman.C
View file

@ -24,7 +24,7 @@
* *
*************************************************************************/ *************************************************************************/
#include <cstdio> #include <stdio.h>
EXTERN_ENV; EXTERN_ENV;

4
splash2/codes/apps/radiosity/visible.C
View file

@ -21,8 +21,8 @@
* *
***************************************************************/ ***************************************************************/
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
EXTERN_ENV; EXTERN_ENV;

7
splash2/codes/apps/raytrace/bbox.C
View file

@ -25,11 +25,12 @@
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "rt.h" #include "rt.h"
/* /*
* NAME * NAME
* InquireBoundBoxValues - return min and max bound values for each coordinate axis * InquireBoundBoxValues - return min and max bound values for each coordinate axis

7
splash2/codes/apps/raytrace/cr.C
View file

@ -26,11 +26,12 @@
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "rt.h" #include "rt.h"
GRID *gridlist = NULL; GRID *gridlist = NULL;
/* /*

9
splash2/codes/apps/raytrace/env.C
View file

@ -25,12 +25,13 @@
* routines to manipulate lights, colors, and to print the environment. * routines to manipulate lights, colors, and to print the environment.
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include <cstring> #include <string.h>
#include "rt.h" #include "rt.h"
/* /*
* Define environment specification opcodes. * Define environment specification opcodes.
*/ */

7
splash2/codes/apps/raytrace/fbuf.C
View file

@ -31,11 +31,12 @@
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "rt.h" #include "rt.h"
static struct /* Runlength pixel definition. */ static struct /* Runlength pixel definition. */
{ {
U8 r, g, b; /* Color. */ U8 r, g, b; /* Color. */

10
splash2/codes/apps/raytrace/geo.C
View file

@ -27,14 +27,14 @@
*/ */
#include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#include <math.h>
#include <cmath> #include <string.h>
#include <cstdio>
#include <cstring>
#include "rt.h" #include "rt.h"
/* /*
* Allocate and initialize sphere function pointer array. * Allocate and initialize sphere function pointer array.
*/ */

5
splash2/codes/apps/raytrace/huprn.C
View file

@ -25,9 +25,8 @@
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "rt.h" #include "rt.h"
VOID prn_voxel(VOXEL *v) VOID prn_voxel(VOXEL *v)

7
splash2/codes/apps/raytrace/husetup.C
View file

@ -26,11 +26,12 @@
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "rt.h" #include "rt.h"
/* /*
* NAME * NAME
* Huniform_defaults - setup the five HUG parameter defaults * Huniform_defaults - setup the five HUG parameter defaults

5
splash2/codes/apps/raytrace/hutv.C
View file

@ -23,9 +23,8 @@
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "rt.h" #include "rt.h"
/* /*

7
splash2/codes/apps/raytrace/isect.C
View file

@ -26,11 +26,12 @@
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "rt.h" #include "rt.h"
/* /*
* NAME * NAME
* Intersect - intersect ray with objects in linked list * Intersect - intersect ray with objects in linked list

6
splash2/codes/apps/raytrace/main.C
View file

@ -80,11 +80,11 @@
#define VERSION "1.00" #define VERSION "1.00"
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "rt.h" #include "rt.h"
CHAR *ProgName = "RAYTRACE"; /* The program name. */ CHAR *ProgName = "RAYTRACE"; /* The program name. */
INT nprocs = 1; /* The number of processors to use. */ INT nprocs = 1; /* The number of processors to use. */
INT MaxGlobMem = 32; /* Maximum global memory needed (MB).*/ INT MaxGlobMem = 32; /* Maximum global memory needed (MB).*/

7
splash2/codes/apps/raytrace/matrix.C
View file

@ -25,11 +25,12 @@
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "rt.h" #include "rt.h"
typedef REAL GJMATRIX[4][8]; /* Matrix for Gauss-Jordan inversion.*/ typedef REAL GJMATRIX[4][8]; /* Matrix for Gauss-Jordan inversion.*/

7
splash2/codes/apps/raytrace/memory.C
View file

@ -29,11 +29,12 @@
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "rt.h" #include "rt.h"
#define CKSM 0x55AA55AA #define CKSM 0x55AA55AA
#define PAGESIZE (4*1024) #define PAGESIZE (4*1024)
#define THRESHOLD (sizeof(NODE) + 16) #define THRESHOLD (sizeof(NODE) + 16)

7
splash2/codes/apps/raytrace/poly.C
View file

@ -25,11 +25,12 @@
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "rt.h" #include "rt.h"
/* /*
* NAME * NAME
* PolyName - return the object name * PolyName - return the object name

5
splash2/codes/apps/raytrace/raystack.C
View file

@ -35,9 +35,8 @@
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "rt.h" #include "rt.h"
#define PAGE_SIZE 4096 #define PAGE_SIZE 4096

9
splash2/codes/apps/raytrace/rltotiff/rltotiff.c
View file

@ -14,12 +14,11 @@
/* */ /* */
/*************************************************************************/ /*************************************************************************/
#include <malloc.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include "tiff_rgba_io.h" #include "tiff_rgba_io.h"
#include <stdio.h>
#include <unistd.h>
#include <malloc.h>
#include <stdlib.h>
typedef short SHORT; typedef short SHORT;
typedef long LONG; typedef long LONG;

1
splash2/codes/apps/raytrace/rltotiff/tiff_rgba_io.c
View file

@ -25,7 +25,6 @@ static char sccsid[] = "@(#)savemap.c 1.3 2/6/9q";
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <tiffio.h> #include <tiffio.h>
#include "tiff_rgba_io.h" #include "tiff_rgba_io.h"
#define streq(a,b) (strcmp(a,b) == 0) #define streq(a,b) (strcmp(a,b) == 0)

7
splash2/codes/apps/raytrace/shade.C
View file

@ -28,11 +28,12 @@
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "rt.h" #include "rt.h"
/* /*
* NAME * NAME
* SpecularDirection - compute reflected ray * SpecularDirection - compute reflected ray

7
splash2/codes/apps/raytrace/sph.C
View file

@ -25,11 +25,12 @@
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "rt.h" #include "rt.h"
/* /*
* NAME * NAME
* SphName - return the object name * SphName - return the object name

5
splash2/codes/apps/raytrace/trace.C
View file

@ -25,9 +25,8 @@
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "rt.h" #include "rt.h"
/* /*

7
splash2/codes/apps/raytrace/tri.C
View file

@ -25,11 +25,12 @@
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "rt.h" #include "rt.h"
#define X_NORM 1 #define X_NORM 1
#define Y_NORM 2 #define Y_NORM 2
#define Z_NORM 3 #define Z_NORM 3

7
splash2/codes/apps/raytrace/workpool.C
View file

@ -30,11 +30,12 @@
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "rt.h" #include "rt.h"
/* /*
* NAME * NAME
* PutJob - put another job into pid's work pool * PutJob - put another job into pid's work pool

1
splash2/codes/apps/volrend/file.C
View file

@ -17,7 +17,6 @@
/********** storing/loading of large arrays to/from files **********/ /********** storing/loading of large arrays to/from files **********/
#include <fcntl.h> #include <fcntl.h>
#include "incl.h" #include "incl.h"
#define PMODE 0644 /* RW for owner, R for group, R for others */ #define PMODE 0644 /* RW for owner, R for group, R for others */

16
splash2/codes/apps/volrend/incl.H
View file

@ -21,15 +21,13 @@
*************************************************************************/ *************************************************************************/
#include <sys/types.h> #include "user_options.h" /* User options defined at compile time */
#include <climits>
#include <cmath> /* Definitions for mathematical library */
#include <cstdio> /* Definitions for standard I/O library */
#include "address.h" /* Map address macros */
#include "const.h" /* Constant definitions */ #include "const.h" /* Constant definitions */
#include "my_types.h" /* User defined type */
#include "global.h" /* Global variables */ #include "global.h" /* Global variables */
#include "macros.h" /* Definition of general C macros */ #include "macros.h" /* Definition of general C macros */
#include "my_types.h" /* User defined type */ #include "address.h" /* Map address macros */
#include "user_options.h" /* User options defined at compile time */ #include <stdio.h> /* Definitions for standard I/O library */
#include <math.h> /* Definitions for mathematical library */
#include <limits.h>
#include <sys/types.h>

10
splash2/codes/apps/volrend/main.C
View file

@ -26,13 +26,11 @@
*************************************************************************/ *************************************************************************/
#include <sys/resource.h>
#include <sys/time.h>
#include <climits>
#include <cstring>
#include "incl.h" #include "incl.h"
#include <string.h>
#include <sys/time.h>
#include <sys/resource.h>
#include <limits.h>
#include "tiffio.h" #include "tiffio.h"
#define SH_MEM_AMT 60000000 #define SH_MEM_AMT 60000000

3
splash2/codes/apps/volrend/map.C
View file

@ -20,8 +20,7 @@
* * * *
******************************************************************************/ ******************************************************************************/
#include <cstring> #include <string.h>
#include "incl.h" #include "incl.h"
/* The following declarations show the layout of the .den file. */ /* The following declarations show the layout of the .den file. */

3
splash2/codes/apps/volrend/normal.C
View file

@ -21,8 +21,7 @@
* * * *
******************************************************************************/ ******************************************************************************/
#include <cstring> #include <string.h>
#include "incl.h" #include "incl.h"
/* The following declarations show the layout of the .norm file. */ /* The following declarations show the layout of the .norm file. */

3
splash2/codes/apps/volrend/octree.C
View file

@ -20,8 +20,7 @@
* * * *
******************************************************************************/ ******************************************************************************/
#include <cstring> #include <string.h>
#include "incl.h" #include "incl.h"
#define WRITE_PYR(IBIT,ILEVEL,IZ,IY,IX)\ #define WRITE_PYR(IBIT,ILEVEL,IZ,IY,IX)\

3
splash2/codes/apps/volrend/opacity.C
View file

@ -21,8 +21,7 @@
* * * *
******************************************************************************/ ******************************************************************************/
#include <cstring> #include <string.h>
#include "incl.h" #include "incl.h"
/* The following declarations show the layout of the .opc file. */ /* The following declarations show the layout of the .opc file. */

4
splash2/codes/apps/water-nsquared/bndry.C
View file

@ -15,11 +15,11 @@
/*************************************************************************/ /*************************************************************************/
EXTERN_ENV EXTERN_ENV
#include "global.h"
#include "mddata.h"
#include "mdvar.h" #include "mdvar.h"
#include "parameters.h" #include "parameters.h"
#include "mddata.h"
#include "split.h" #include "split.h"
#include "global.h"
/* this routine puts the molecules back inside the box if they are out */ /* this routine puts the molecules back inside the box if they are out */
void BNDRY(long ProcID) void BNDRY(long ProcID)

13
splash2/codes/apps/water-nsquared/cnstnt.C
View file

@ -15,15 +15,14 @@
/*************************************************************************/ /*************************************************************************/
EXTERN_ENV EXTERN_ENV
#include <cstdio> #include <stdio.h>
#include "cnst.h"
#include "fileio.h"
#include "frcnst.h"
#include "global.h"
#include "parameters.h"
#include "water.h" #include "water.h"
#include "wwpot.h" #include "wwpot.h"
#include "cnst.h"
#include "frcnst.h"
#include "fileio.h"
#include "parameters.h"
#include "global.h"
/* set up some constants /* set up some constants
* N : NORDER + 1 = 7 for a sixth-order method * N : NORDER + 1 = 7 for a sixth-order method

3
splash2/codes/apps/water-nsquared/cshift.C
View file

@ -15,8 +15,7 @@
/*************************************************************************/ /*************************************************************************/
EXTERN_ENV EXTERN_ENV
#include <cmath> #include <math.h>
#include "global.h" #include "global.h"
/* return the value of a with the same sign as b */ /* return the value of a with the same sign as b */

12
splash2/codes/apps/water-nsquared/initia.C
View file

@ -15,16 +15,16 @@
/*************************************************************************/ /*************************************************************************/
EXTERN_ENV EXTERN_ENV
#include "math.h"
#include "stdio.h"
#include "mdvar.h"
#include "water.h"
#include "cnst.h" #include "cnst.h"
#include "fileio.h" #include "fileio.h"
#include "global.h"
#include "math.h"
#include "mddata.h"
#include "mdvar.h"
#include "parameters.h" #include "parameters.h"
#include "mddata.h"
#include "split.h" #include "split.h"
#include "stdio.h" #include "global.h"
#include "water.h"
void INITIA() void INITIA()
{ {

10
splash2/codes/apps/water-nsquared/interf.C
View file

@ -15,15 +15,15 @@
/*************************************************************************/ /*************************************************************************/
EXTERN_ENV EXTERN_ENV
#include "cnst.h"
#include "global.h"
#include "math.h" #include "math.h"
#include "mddata.h"
#include "mdvar.h" #include "mdvar.h"
#include "parameters.h"
#include "split.h"
#include "water.h" #include "water.h"
#include "wwpot.h" #include "wwpot.h"
#include "cnst.h"
#include "parameters.h"
#include "mddata.h"
#include "split.h"
#include "global.h"
double ****PFORCES; double ****PFORCES;

10
splash2/codes/apps/water-nsquared/intraf.C
View file

@ -15,15 +15,15 @@
/*************************************************************************/ /*************************************************************************/
EXTERN_ENV EXTERN_ENV
#include "frcnst.h"
#include "global.h"
#include "math.h" #include "math.h"
#include "mddata.h" #include "frcnst.h"
#include "mdvar.h" #include "mdvar.h"
#include "parameters.h"
#include "split.h"
#include "water.h" #include "water.h"
#include "wwpot.h" #include "wwpot.h"
#include "parameters.h"
#include "mddata.h"
#include "split.h"
#include "global.h"
void INTRAF(double *VIR, long ProcID) void INTRAF(double *VIR, long ProcID)
{ {

4
splash2/codes/apps/water-nsquared/kineti.C
View file

@ -15,12 +15,12 @@
/*************************************************************************/ /*************************************************************************/
EXTERN_ENV EXTERN_ENV
#include "global.h"
#include "math.h" #include "math.h"
#include "mddata.h"
#include "mdvar.h" #include "mdvar.h"
#include "parameters.h" #include "parameters.h"
#include "mddata.h"
#include "split.h" #include "split.h"
#include "global.h"
/* this routine computes kinetic energy in each of the three spatial /* this routine computes kinetic energy in each of the three spatial
dimensions, and puts the computed values in the SUM array */ dimensions, and puts the computed values in the SUM array */

14
splash2/codes/apps/water-nsquared/mdmain.C
View file

@ -15,16 +15,16 @@
/*************************************************************************/ /*************************************************************************/
EXTERN_ENV EXTERN_ENV
#include "cnst.h"
#include "fileio.h"
#include "global.h"
#include "mddata.h"
#include "mdvar.h"
#include "parameters.h"
#include "split.h"
#include "stdio.h" #include "stdio.h"
#include "parameters.h"
#include "mdvar.h"
#include "water.h" #include "water.h"
#include "wwpot.h" #include "wwpot.h"
#include "cnst.h"
#include "mddata.h"
#include "fileio.h"
#include "split.h"
#include "global.h"
/************************************************************************/ /************************************************************************/

12
splash2/codes/apps/water-nsquared/poteng.C
View file

@ -15,15 +15,15 @@
/*************************************************************************/ /*************************************************************************/
EXTERN_ENV EXTERN_ENV
#include "frcnst.h"
#include "global.h"
#include "math.h"
#include "mddata.h"
#include "mdvar.h" #include "mdvar.h"
#include "parameters.h" #include "frcnst.h"
#include "split.h"
#include "water.h" #include "water.h"
#include "wwpot.h" #include "wwpot.h"
#include "math.h"
#include "parameters.h"
#include "mddata.h"
#include "split.h"
#include "global.h"
void POTENG(double *POTA, double *POTR, double *PTRF, long ProcID) void POTENG(double *POTA, double *POTR, double *PTRF, long ProcID)
{ {

4
splash2/codes/apps/water-nsquared/predcor.C
View file

@ -15,11 +15,11 @@
/*************************************************************************/ /*************************************************************************/
EXTERN_ENV EXTERN_ENV
#include "global.h"
#include "mddata.h"
#include "mdvar.h" #include "mdvar.h"
#include "parameters.h" #include "parameters.h"
#include "mddata.h"
#include "split.h" #include "split.h"
#include "global.h"
/* predicts new values for displacement and its five derivatives /* predicts new values for displacement and its five derivatives
* *

14
splash2/codes/apps/water-nsquared/syscons.C
View file

@ -15,16 +15,16 @@
/*************************************************************************/ /*************************************************************************/
EXTERN_ENV EXTERN_ENV
#include <cmath>
#include "cnst.h"
#include "global.h"
#include "mddata.h"
#include "mdvar.h"
#include "parameters.h"
#include "stdio.h" #include "stdio.h"
#include <math.h>
#include "parameters.h"
#include "mdvar.h"
#include "water.h" #include "water.h"
#include "wwpot.h" #include "wwpot.h"
#include "cnst.h"
#include "mddata.h"
#include "global.h"
void SYSCNS() /* sets up some system constants */ void SYSCNS() /* sets up some system constants */
{ {

15
splash2/codes/apps/water-nsquared/water.C
View file

@ -44,21 +44,20 @@
*/ */
MAIN_ENV MAIN_ENV
#include <cstdio> #include <stdio.h>
#include <cstring> #include <string.h>
#include "split.h" #include "split.h"
/* include files for declarations */ /* include files for declarations */
#include "parameters.h"
#include "mdvar.h"
#include "water.h"
#include "wwpot.h"
#include "cnst.h" #include "cnst.h"
#include "mddata.h"
#include "fileio.h" #include "fileio.h"
#include "frcnst.h" #include "frcnst.h"
#include "global.h" #include "global.h"
#include "mddata.h"
#include "mdvar.h"
#include "parameters.h"
#include "water.h"
#include "wwpot.h"
long NMOL,NORDER,NATMO,NATMO3,NMOL1; long NMOL,NORDER,NATMO,NATMO3,NMOL1;
long NATOMS; long NATOMS;

7
splash2/codes/apps/water-spatial/bndry.C
View file

@ -16,13 +16,12 @@
EXTERN_ENV EXTERN_ENV
#include <cstdio> #include <stdio.h>
#include "global.h"
#include "mddata.h"
#include "mdvar.h" #include "mdvar.h"
#include "parameters.h" #include "parameters.h"
#include "mddata.h"
#include "split.h" #include "split.h"
#include "global.h"
void BNDRY(long ProcID) /* this routine puts the molecules back inside the box if they are out */ void BNDRY(long ProcID) /* this routine puts the molecules back inside the box if they are out */
{ {

15
splash2/codes/apps/water-spatial/cnstnt.C
View file

@ -16,16 +16,15 @@
EXTERN_ENV EXTERN_ENV
#include <cstdio> #include <stdio.h>
#include "cnst.h"
#include "fileio.h"
#include "frcnst.h"
#include "global.h"
#include "mddata.h"
#include "parameters.h"
#include "water.h" #include "water.h"
#include "wwpot.h" #include "wwpot.h"
#include "cnst.h"
#include "frcnst.h"
#include "fileio.h"
#include "parameters.h"
#include "mddata.h"
#include "global.h"
/* set up some constants; this routine is executed by /* set up some constants; this routine is executed by
* a single processor before others are created * a single processor before others are created

7
splash2/codes/apps/water-spatial/cshift.C
View file

@ -16,12 +16,11 @@
EXTERN_ENV EXTERN_ENV
#include <cmath> #include <math.h>
#include "global.h"
#include "mddata.h"
#include "parameters.h" #include "parameters.h"
#include "mddata.h"
#include "water.h" #include "water.h"
#include "global.h"
/* return the value of a with the same sign as b */ /* return the value of a with the same sign as b */
#define sign(a,b) (b < 0 ) ? ( (a < 0) ? a : -a) : ( (a < 0) ? -a : a) #define sign(a,b) (b < 0 ) ? ( (a < 0) ? a : -a) : ( (a < 0) ? -a : a)

13
splash2/codes/apps/water-spatial/initia.C
View file

@ -16,17 +16,16 @@
EXTERN_ENV EXTERN_ENV
#include <cmath> #include <math.h>
#include <cstdio> #include <stdio.h>
#include "mdvar.h"
#include "water.h"
#include "cnst.h" #include "cnst.h"
#include "fileio.h" #include "fileio.h"
#include "global.h"
#include "mddata.h"
#include "mdvar.h"
#include "parameters.h" #include "parameters.h"
#include "mddata.h"
#include "split.h" #include "split.h"
#include "water.h" #include "global.h"
void INITIA() void INITIA()
{ {

15
splash2/codes/apps/water-spatial/interf.C
View file

@ -16,17 +16,16 @@
EXTERN_ENV EXTERN_ENV
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "cnst.h"
#include "global.h"
#include "mddata.h"
#include "mdvar.h" #include "mdvar.h"
#include "parameters.h"
#include "split.h"
#include "water.h" #include "water.h"
#include "wwpot.h" #include "wwpot.h"
#include "cnst.h"
#include "parameters.h"
#include "mddata.h"
#include "split.h"
#include "global.h"
void INTERF(long DEST, double *VIR, long ProcID) void INTERF(long DEST, double *VIR, long ProcID)
{ {

13
splash2/codes/apps/water-spatial/intraf.C
View file

@ -16,17 +16,16 @@
EXTERN_ENV EXTERN_ENV
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "frcnst.h" #include "frcnst.h"
#include "global.h"
#include "mddata.h"
#include "mdvar.h" #include "mdvar.h"
#include "parameters.h"
#include "split.h"
#include "water.h" #include "water.h"
#include "wwpot.h" #include "wwpot.h"
#include "parameters.h"
#include "mddata.h"
#include "split.h"
#include "global.h"
void INTRAF(double *VIR, long ProcID) void INTRAF(double *VIR, long ProcID)
{ {

7
splash2/codes/apps/water-spatial/kineti.C
View file

@ -16,13 +16,12 @@
EXTERN_ENV EXTERN_ENV
#include <cmath> #include <math.h>
#include "global.h"
#include "mddata.h"
#include "mdvar.h" #include "mdvar.h"
#include "parameters.h" #include "parameters.h"
#include "mddata.h"
#include "split.h" #include "split.h"
#include "global.h"
/* this routine computes kinetic energy in each of the three spatial /* this routine computes kinetic energy in each of the three spatial
dimensions, and puts the computed values in the SUM array */ dimensions, and puts the computed values in the SUM array */

14
splash2/codes/apps/water-spatial/mdmain.C
View file

@ -16,17 +16,17 @@
EXTERN_ENV EXTERN_ENV
#include <cstdio> #include <stdio.h>
#include "cnst.h"
#include "fileio.h"
#include "global.h"
#include "mddata.h"
#include "mdvar.h"
#include "parameters.h" #include "parameters.h"
#include "split.h" #include "mdvar.h"
#include "water.h" #include "water.h"
#include "wwpot.h" #include "wwpot.h"
#include "cnst.h"
#include "mddata.h"
#include "fileio.h"
#include "split.h"
#include "global.h"
/************************************************************************/ /************************************************************************/

13
splash2/codes/apps/water-spatial/poteng.C
View file

@ -16,16 +16,15 @@
EXTERN_ENV EXTERN_ENV
#include <cmath>
#include "frcnst.h"
#include "global.h"
#include "mddata.h"
#include "mdvar.h" #include "mdvar.h"
#include "parameters.h" #include "frcnst.h"
#include "split.h"
#include "water.h" #include "water.h"
#include "wwpot.h" #include "wwpot.h"
#include <math.h>
#include "parameters.h"
#include "mddata.h"
#include "split.h"
#include "global.h"
void POTENG(double *POTA, double *POTR, double *PTRF, long ProcID) void POTENG(double *POTA, double *POTR, double *PTRF, long ProcID)
{ {

4
splash2/codes/apps/water-spatial/predcor.C
View file

@ -16,11 +16,11 @@
EXTERN_ENV EXTERN_ENV
#include "global.h"
#include "mddata.h"
#include "mdvar.h" #include "mdvar.h"
#include "parameters.h" #include "parameters.h"
#include "mddata.h"
#include "split.h" #include "split.h"
#include "global.h"
/* predicts new values for displacement and its five derivatives /* predicts new values for displacement and its five derivatives
* using Gear's sixth-order predictor-corrector method * using Gear's sixth-order predictor-corrector method

13
splash2/codes/apps/water-spatial/syscons.C
View file

@ -15,16 +15,17 @@
/*************************************************************************/ /*************************************************************************/
EXTERN_ENV EXTERN_ENV
#include <cmath> #include <stdio.h>
#include <cstdio> #include <math.h>
#include "cnst.h"
#include "global.h"
#include "mddata.h"
#include "mdvar.h"
#include "parameters.h" #include "parameters.h"
#include "mdvar.h"
#include "water.h" #include "water.h"
#include "wwpot.h" #include "wwpot.h"
#include "cnst.h"
#include "mddata.h"
#include "global.h"
void SYSCNS() /* sets up some system constants */ void SYSCNS() /* sets up some system constants */
{ {

10
splash2/codes/apps/water-spatial/water.C
View file

@ -45,22 +45,22 @@ MAIN_ENV
(and not have fewer boxes than processors). (and not have fewer boxes than processors).
*/ */
#include <cmath> #include <stdio.h>
#include <cstdio> #include <string.h>
#include <cstring> #include <math.h>
/* include files for declarations */ /* include files for declarations */
#include "cnst.h" #include "cnst.h"
#include "fileio.h" #include "fileio.h"
#include "frcnst.h" #include "frcnst.h"
#include "global.h"
#include "mddata.h"
#include "mdvar.h" #include "mdvar.h"
#include "parameters.h" #include "parameters.h"
#include "randno.h" #include "randno.h"
#include "split.h" #include "split.h"
#include "water.h" #include "water.h"
#include "wwpot.h" #include "wwpot.h"
#include "mddata.h"
#include "global.h"
long NATOMS; long NATOMS;
long I2; long I2;

3
splash2/codes/kernels/cholesky/amal.C
View file

@ -16,8 +16,7 @@
EXTERN_ENV EXTERN_ENV
#include <cstdio> #include <stdio.h>
#include "matrix.h" #include "matrix.h"
long *next_in_super, *member_of, *super_parent; long *next_in_super, *member_of, *super_parent;

3
splash2/codes/kernels/cholesky/assign.C
View file

@ -16,8 +16,7 @@
EXTERN_ENV EXTERN_ENV
#include <cmath> #include <math.h>
#include "matrix.h" #include "matrix.h"
#define MISS_COST 4.74 #define MISS_COST 4.74

3
splash2/codes/kernels/cholesky/bfac.C
View file

@ -16,9 +16,8 @@
EXTERN_ENV EXTERN_ENV
#include <cmath>
#include "matrix.h" #include "matrix.h"
#include <math.h>
long vMiss=0, wMiss=0, xMiss=0, yMiss=0; /* Local but don't care */ long vMiss=0, wMiss=0, xMiss=0, yMiss=0; /* Local but don't care */
extern long BS; extern long BS;

3
splash2/codes/kernels/cholesky/bksolve.C
View file

@ -16,9 +16,8 @@
EXTERN_ENV EXTERN_ENV
#include <cmath>
#include "matrix.h" #include "matrix.h"
#include <math.h>
double *TriBSolve(BMatrix LB, double *b, long *PERM) double *TriBSolve(BMatrix LB, double *b, long *PERM)
{ {

3
splash2/codes/kernels/cholesky/block2.C
View file

@ -16,8 +16,7 @@
EXTERN_ENV EXTERN_ENV
#include <cmath> #include <math.h>
#include "matrix.h" #include "matrix.h"
extern long *node; /* ALL GLOBAL */ extern long *node; /* ALL GLOBAL */

3
splash2/codes/kernels/cholesky/fo.C
View file

@ -16,9 +16,8 @@
EXTERN_ENV EXTERN_ENV
#include <cmath>
#include "matrix.h" #include "matrix.h"
#include <math.h>
extern struct GlobalMemory *Global; extern struct GlobalMemory *Global;
extern BMatrix LB; extern BMatrix LB;

2
splash2/codes/kernels/cholesky/matrix.H
View file

@ -14,7 +14,7 @@
/* */ /* */
/*************************************************************************/ /*************************************************************************/
#include <cstdio> #include <stdio.h>
#define FitsInCache 2048 #define FitsInCache 2048

1
splash2/codes/kernels/cholesky/mf.C
View file

@ -17,7 +17,6 @@
EXTERN_ENV EXTERN_ENV
#include "matrix.h" #include "matrix.h"
#define HashNum 1024 #define HashNum 1024
#define Bucket(desti, destj, src) ((desti+destj+src)%HashNum) #define Bucket(desti, destj, src) ((desti+destj+src)%HashNum)

Some files were not shown because too many files have changed in this diff Show more