rename main unit to mmc.c; use sse by default for mmclab; change rng …

…seed
fangq · Dec 24, 2015 · 7347929 · 7347929
1 parent e12e0d1
commit 7347929
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 16 deletions.
diff --git a/mmc/trunk/LICENSE.txt b/mmc/trunk/LICENSE.txt
@@ -3,7 +3,7 @@
 =                     Multi-threaded Edition with SSE4                        =
 ===============================================================================
 
-Copyright (C) 2011-2015  Qianqian Fang <q.fang at neu.edu>
+Copyright (C) 2010-2015  Qianqian Fang <q.fang at neu.edu>
 
 -------------------------------------------------------------------------------
 

diff --git a/mmc/trunk/commons/Makefile_common.mk b/mmc/trunk/commons/Makefile_common.mk
@@ -75,7 +75,7 @@ OBJS       := $(subst $(OBJDIR)/$(MMCSRC)/,$(MMCSRC)/,$(OBJS))
 OBJS       := $(addsuffix $(OBJSUFFIX), $(OBJS))
 
 release:   CCFLAGS+= -O3
-sse ssemath mexsse octsse: CCFLAGS+= -DMMC_USE_SSE -DHAVE_SSE2 -msse4
+sse ssemath mex oct mexsse octsse: CCFLAGS+= -DMMC_USE_SSE -DHAVE_SSE2 -msse4
 sse ssemath omp mex oct mexsse octsse:   CCFLAGS+= -O3 $(OPENMP) $(FASTMATH)
 sse ssemath omp:   ARFLAGS+= $(OPENMPLIB) $(FASTMATH)
 ssemath mexsse octsse:   CCFLAGS+=-DUSE_SSE2 -DMMC_USE_SSE_MATH

diff --git a/mmc/trunk/examples/dcs/dcs.inp b/mmc/trunk/examples/dcs/dcs.inp
@@ -1,5 +1,5 @@
 20000000
-27182818
+1648335518
 50.50 50.50 0.00
 0.00 0.00 1.00
 0 5e-009 5e-009

diff --git a/mmc/trunk/examples/planar/planar.inp b/mmc/trunk/examples/planar/planar.inp
@@ -1,5 +1,5 @@
 1000000                 # total photon counts (normally not used)
-12345678                # RNG seed, negative to generate
+1648335518                # RNG seed, negative to generate
 15.0 50.0 25.0          # source position in mm (corner 1)
 0.0 0.0 -1.0            # initial directional vector
 0 5e-09 1e-10           # time-gates(s): start, end, step

diff --git a/mmc/trunk/examples/planar/pointsrc.inp b/mmc/trunk/examples/planar/pointsrc.inp
@@ -1,5 +1,5 @@
 1000000                 # total photon counts (normally not used)
-12345678                # RNG seed, negative to generate
+1648335518                # RNG seed, negative to generate
 21.576111 52.056393 25.0    # source position in mm (corner 1)
 0.0 0.0 -1.0            # initial directional vector
 0 5e-09 1e-10           # time-gates(s): start, end, step

diff --git a/mmc/trunk/examples/regression/exitangle/tank_planar.inp b/mmc/trunk/examples/regression/exitangle/tank_planar.inp
@@ -1,5 +1,5 @@
 100000000   # total photon (not used)
-12345678          # RNG Seed
+1648335518          # RNG Seed
 5.00 5.00 23.00  # source origin position (mm)
 0.00 0.00 -1.00  # initial direction
 0  8.3383e-09  3.2571e-11 # time(s): begin, end, step

diff --git a/mmc/trunk/examples/replay/replaytest.inp b/mmc/trunk/examples/replay/replaytest.inp
@@ -1,5 +1,5 @@
 1000000             # total photon
-27182818            # RNG seed, negative to generate
+1648335518            # RNG seed, negative to generate
 30.1 30.2 0.0       # source position (mm)
 0. 0. 1.            # initial directional vector
 0.0 5e-9 5e-9       # time-gates(s): start, end, step

diff --git a/mmc/trunk/examples/sfdi2layer/sfdi.inp b/mmc/trunk/examples/sfdi2layer/sfdi.inp
@@ -1,5 +1,5 @@
 1000000                 # total photon counts (normally not used)
-12345678                # RNG seed, negative to generate
+1648335518                # RNG seed, negative to generate
 10.0 10.0 35.0          # source position in mm (corner 1)
 0.0 0.0 -1.0            # initial directional vector
 0 5e-09 1e-10           # time-gates(s): start, end, step

diff --git a/mmc/trunk/examples/sphere/planar.inp b/mmc/trunk/examples/sphere/planar.inp
@@ -1,5 +1,5 @@
 1000000                 # total photon counts (normally not used)
-12345678                # RNG seed, negative to generate
+1648335518                # RNG seed, negative to generate
 -5.0 -5.0 25.0          # source position in mm (corner 1)
 0.0 0.0 -1.0            # initial directional vector
 0 5e-09 1e-10           # time-gates(s): start, end, step

diff --git a/mmc/trunk/examples/statnoise/vartest.inp b/mmc/trunk/examples/statnoise/vartest.inp
@@ -1,5 +1,5 @@
 30000000                   # total photon
-27182818            # RNG seed, negative to generate
+1648335518            # RNG seed, negative to generate
 10.1 10.2 0.0        # source position (mm)
 0. 0. 1.                # initial directional vector
 0.e+00 5.e-09 5e-09  # time-gates(s): start, end, step

diff --git a/mmc/trunk/examples/validation/cube.inp b/mmc/trunk/examples/validation/cube.inp
@@ -1,5 +1,5 @@
 30000000                   # total photon
-27182818            # RNG seed, negative to generate
+1648335518            # RNG seed, negative to generate
 30.1 30.2 0.0        # source position (mm)
 0. 0. 1.                # initial directional vector
 0.e+00 5.e-09 1e-10  # time-gates(s): start, end, step

diff --git a/mmc/trunk/src/Makefile b/mmc/trunk/src/Makefile
@@ -3,9 +3,9 @@ BINARY=mmc
 
 PLATFORM = $(shell uname -s)
 ifeq ($(findstring MINGW32,$(PLATFORM)), MINGW32)
-  FILES=posix_randr simpmesh tettracing mcx_utils tictoc drand48_r_libgw32c tetray cjson/cJSON
+  FILES=posix_randr simpmesh tettracing mcx_utils tictoc drand48_r_libgw32c mmc cjson/cJSON
 else
-  FILES=posix_randr simpmesh tettracing mcx_utils tictoc tetray cjson/cJSON
+  FILES=posix_randr simpmesh tettracing mcx_utils tictoc mmc cjson/cJSON
 endif
 
 ifeq ($(findstring Darwin,$(PLATFORM)), Darwin)

diff --git a/mmc/trunk/src/makefile_sfmt b/mmc/trunk/src/makefile_sfmt
@@ -3,9 +3,9 @@ BINARY=mmc_sfmt
 
 PLATFORM = $(shell uname -s)
 ifeq ($(findstring MINGW32,$(PLATFORM)), MINGW32)
-  FILES=SFMT/SFMT sfmt_rand simpmesh tettracing mcx_utils tictoc drand48_r_libgw32c tetray cjson/cJSON
+  FILES=SFMT/SFMT sfmt_rand simpmesh tettracing mcx_utils tictoc drand48_r_libgw32c mmc cjson/cJSON
 else
-  FILES=SFMT/SFMT sfmt_rand simpmesh tettracing mcx_utils tictoc tetray cjson/cJSON
+  FILES=SFMT/SFMT sfmt_rand simpmesh tettracing mcx_utils tictoc mmc cjson/cJSON
 endif
 
 #ifeq ($(findstring Darwin,$(PLATFORM)), Darwin)

diff --git a/mmc/trunk/src/tetray.c → mmc/trunk/src/mmc.c b/mmc/trunk/src/tetray.c → mmc/trunk/src/mmc.c
@@ -17,7 +17,7 @@
 *******************************************************************************/
 
 /***************************************************************************//**
-\file    tetray.c
+\file    mmc.c
 
 \brief   << Main program of MMC >>
 *******************************************************************************/