OpenACC Merge

CMakeLists.txt

@@ -28,6 +28,9 @@ SET(SOURCES
   src/4_driver/runner.c
   )
 
+#SET_SOURCE_FILES_PROPERTIES( src/1_base/env.c src/4_driver/sweep.c src/4_driver/tester.c PROPERTIES LANGUAGE CXX )
+#set(CMAKE_VERBOSE_MAKEFILE ON)
+
 SET(CUDA_SOURCES)
 FOREACH(FILE IN LISTS SOURCES)
   STRING(REPLACE ".c" ".cu" FILE2 ${FILE})

README.rst

@@ -0,0 +1,52 @@
+
+Overview
+========
+
+Minisweep is a deterministic Sn radiation transport miniapp used for
+performance optimization and performance model evaluation on HPC
+architectures.
+
+Copyright and Licensing
+=======================
+
+Copyright (C) 2015-2017 Oak Ridge National Laboratory, UT-Battelle, LLC.
+
+This code is part of the Profugus project.  For copyright/licensing details, see https://github.com/ORNL-CEES/Profugus.
+
+Usage
+=====
+
+For usage details, see the file
+https://github.com/wdj/minisweep/blob/master/doc/how_to_run.txt.
+
+References
+==========
+
+For algorithm details, see:
+
+Christopher G. Baker, Gregory G. Davidson, Thomas M. Evans,
+Steven P. Hamilton, Joshua J. Jarrell, and Wayne Joubert,
+"High Performance Radiation Transport Simulations: Preparing for TITAN,"
+in *Proceedings of Supercomputing Conference SC12*,
+http://ieeexplore.ieee.org/xpls/abs_all.jsp?arnumber=6468508.
+
+Wayne Joubert,
+"Porting the Denovo Radiation Transport Code to Titan: Lessons Learned,"
+*OLCF Titan Workshop 2012*,
+https://www.olcf.ornl.gov/wp-content/uploads/2012/01/TitanWorkshop2012_Day3_Joubert.pdf.
+
+T. M. Evans, W. Joubert, S. P. Hamilton, S. R. Johnson, J. A Turner,
+G. G. Davidson, and T. M Pandya. 2015. "Three-Dimensional Discrete
+Ordinates Reactor Assembly Calculations on GPUs,"
+in *ANS MC2015 Joint International Conference on Mathematics and Computation (M&C), Supercomputing in Nuclear Applications (SNA) and the Monte Carlo (MC) Method*,
+Nashville, TN, American Nuclear Society, LaGrange Park, 2015,
+https://www.ornl.gov/content/three-dimensional-discrete-ordinates-reactor-assembly-calculations-gpus,
+http://www.casl.gov/docs/CASL-U-2015-0172-000.pdf.
+
+O.E. Bronson Messer, Ed D'Azevedo, Judy Hill, Wayne Joubert,
+Mark Berrill, and Christopher Zimmer,
+"MiniApps derived from production HPC applications using multiple
+programing models,"
+*The International Journal of High Performance Computing Applications*, 2016,
+http://journals.sagepub.com/doi/abs/10.1177/1094342016668241.
+

_gauss_seidel_prototype/Makefile

@@ -1,8 +1,8 @@
 
-CFLAGS = -g  -O3 
+CFLAGS = -O3 -Minfo=accel -acc -ta=tesla,cc60
 
 #all: atomics locks locks_llvm locks_xlc atomics_xlc
-TARGETS = gauss_seidel gauss_seidel_omp
+TARGETS = gauss_seidel gauss_seidel_acc
 
 OBJECTS = $(addsuffix .o, $(TARGETS))
 
@@ -39,7 +39,7 @@ CFLAGS += -DBLOCK_GRID_H=$(BLOCK_GRID_H)
 CFLAGS += -DCOUNTEXTENT=$(COUNTEXTENT)
 
 %:%.c
-	$(CC) -fopenmp $(CFLAGS) $< -o $@ -lm
+	pgcc $(CFLAGS) $< -o $@ -lm
 
 clean:
 	rm -f $(TARGETS) $(OBJECTS)

_gauss_seidel_prototype/gauss_seidel.c

@@ -348,12 +348,12 @@ int main( int argc, char** argv )
 {
     /*---Settings---*/
 
-    const int niterations = 10;
+    const int niterations = 1;
     const int ncellx = 200;
     const int ncelly = 200;
-    const int nu = 10;
+    const int nu = 32;
 
-    const int solve_method = solve_method_block_wavefronts;
+    const int solve_method = solve_method_wavefronts;
 
     /*
     const int solve_method = solve_method_standard;