Skip to content

Commit f72e813

Browse files
committed
Merge branch 'release1.2'
2 parents 844b2fe + ef55879 commit f72e813

File tree

545 files changed

+206718
-193285
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

545 files changed

+206718
-193285
lines changed

.gitignore

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,8 @@ Makefile
112112
make.sys
113113
*backup*
114114
*cisajs*.dat
115-
*Time*
115+
*Time_*
116+
*_Time*
116117
*.a
117118
*.aux
118119
*.bbl
@@ -126,11 +127,11 @@ userguide_*.pdf
126127
*.synctex.gz
127128
*.toc
128129
*~
129-
build
130+
build*
130131
#*
131132
html/
132133
GPATH
133134
GRTAGS
134135
GTAGS
135136
.idea
136-
.DS_Store
137+
.DS_Store

HPhiconfig.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ else
2727
cat > src/make.sys <<EOF
2828
CC = mpicc
2929
LAPACK_FLAGS = -Dlapack -mkl=parallel
30-
FLAGS = -qopenmp -O3 -xHOST -mcmodel=large -shared-intel -D MPI -g -traceback
30+
FLAGS = -qopenmp -O3 -ipo -xHOST -mcmodel=large -shared-intel -D MPI -g -traceback
3131
MTFLAGS = -DDSFMT_MEXP=19937 \$(FLAGS)
3232
INCLUDE_DIR=./include
3333
CP = cp -f -v
@@ -87,7 +87,7 @@ EOF
8787
cat > src/make.sys <<EOF
8888
CC = gcc
8989
LAPACK_FLAGS = -Dlapack -framework Accelerate
90-
FLAGS = -fopenmp
90+
FLAGS = -fopenmp -lm -O3 -D_OSX
9191
MTFLAGS = -DDSFMT_MEXP=19937 \$(FLAGS)
9292
INCLUDE_DIR=./include
9393
CP = cp -f -v
@@ -97,7 +97,7 @@ EOF
9797
cat > src/make.sys <<EOF
9898
CC = gcc
9999
LAPACK_FLAGS = -Dlapack -llapack -lblas
100-
FLAGS = -fopenmp -lm
100+
FLAGS = -fopenmp -lm -O3
101101
MTFLAGS = -DDSFMT_MEXP=19937 \$(FLAGS)
102102
INCLUDE_DIR=./include
103103
CP = cp -f -v

config/gcc.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# for GCC Compiler
22
set(CMAKE_C_COMPILER "gcc" CACHE STRING "" FORCE)
3+
#set(CMAKE_C_FLAGS_RELEASE "-Wall -W -Werror=format-security" CACHE STRING "" FORCE)

doc/HPhi_paper/tex/paper.pdf

471 KB
Binary file not shown.
File renamed without changes.

doc/banner/mt_08.jpg

91.7 KB
Loading

doc/banner/mt_08_ol_en.jpg

49.7 KB
Loading

doc/doc_origin/main.pdf

225 KB
Binary file not shown.

doc/en/chap01_en.tex

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ \subsection{Contributors}
5353
\label{subsec:contributors}
5454
This software is developed by following contributors.
5555
\begin{itemize}
56+
\item{ver.1.2 (released at 2016/11/14)}
57+
\item{ver.1.1 (released at 2016/5/13)}
5658
\item{ver.1.0 (released at 2016/4/5)}
5759
\begin{itemize}
5860
\item{\bf Developers}

doc/en/chap02_en.tex

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ \section{Installation}
4141
You can download $\HPhi$ in the following place.\\
4242
\url{https://github.com/QLMS/HPhi/releases}
4343

44-
You can obtain the $\HPhi$ directory by tiping
44+
You can obtain the $\HPhi$ directory by typing
4545
\begin{verbatim}
4646
$ tar xzvf HPhi-xxx.tar.gz
4747
\end{verbatim}
@@ -57,7 +57,7 @@ \subsection{Using \texttt{HPhiconfig.sh}}
5757
\end{verbatim}
5858
Then environmental configuration file \verb|make.sys| is generated in
5959
\verb|src/| directory.
60-
The command-line argment of \verb|HPhiconfig.sh| is as folows:
60+
The command-line argument of \verb|HPhiconfig.sh| is as follows:
6161
\begin{itemize}
6262
\item \verb|sekirei| : ISSP system-B ''sekirei''
6363
\item \verb|maki| : ISSP system-C ''maki''
@@ -76,7 +76,7 @@ \subsection{Using \texttt{HPhiconfig.sh}}
7676
MTFLAGS = -DDSFMT_MEXP=19937 $(FLAGS)
7777
INCLUDE_DIR=./include
7878
\end{verbatim}
79-
We explatin macros of this file as:
79+
We explain macros of this file as:
8080
\begin{itemize}
8181
\item \verb|CC| : The Compilation command (\verb|icc|, \verb|gcc|, \verb|fccpx|)
8282
\item \verb|LAPACK_FLAGS| : Compilation options for LAPACK. \verb|-Dlapack| can not be removed.
@@ -187,6 +187,7 @@ \section{Directory structure}
187187
| | |-HeisenbergChain/...
188188
| | |-HeisenbergSquare/...
189189
| | |-Kagome/...
190+
| | |-Kagome36Boost/...
190191
| | |-Kitaev/...
191192
| | --S1Chain/...
192193
| ---Standard/
@@ -203,11 +204,14 @@ \section{Directory structure}
203204
| |-HeisenbergSquare/...
204205
| |-Kitaev/...
205206
| --S1Chain/...
206-
---src/
207-
|--*.c
208-
|--CMakeLists.txt
209-
|--include/*.h
210-
---makefile_src
207+
|--src/
208+
| |--*.c
209+
| |--CMakeLists.txt
210+
| |--include/*.h
211+
| |--makefile_src
212+
| ---StdFace/
213+
|--test/
214+
---test_tool/
211215
\end{verbatim}
212216

213217
\section{Basic usage}

0 commit comments

Comments
 (0)