Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge Develop to master (for v.3.5.2) #157

Merged
merged 19 commits into from
Mar 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/en/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
# The short X.Y version.
version = '3.5'
# The full version, including alpha/beta/rc tags.
release = u'3.5.1'
release = u'3.5.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 2 additions & 0 deletions doc/en/source/introduction_en.rst
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ Contributors

This software was developed by the following contributors.

* ver.3.5.2 (released on 2024/3/07)

* ver.3.5.1 (released on 2022/6/14)

* ver.3.5 (released on 2021/9/29)
Expand Down
2 changes: 1 addition & 1 deletion doc/ja/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
# The short X.Y version.
version = '3.5'
# The full version, including alpha/beta/rc tags.
release = u'3.5.1'
release = u'3.5.2'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 2 additions & 0 deletions doc/ja/source/introduction_ja.rst
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ What is :math:`{\mathcal H}\Phi`?

本ソフトウェアは以下の開発貢献者により開発されています。

- ver.3.5.2 (2024/3/7 リリース)

- ver.3.5.1 (2022/6/14 リリース)

- ver.3.5 (2021/9/29 リリース)
Expand Down
4 changes: 4 additions & 0 deletions doc/tutorial/en/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,10 @@
u'University of Tokyo', 'manual', 'True'),
]

latex_elements = {
'extrapackages': r'\usepackage{braket}'
}

# -- Options for manual page output ---------------------------------------

# One entry per manual page. List of tuples
Expand Down
2 changes: 1 addition & 1 deletion src/include/version_patch.h
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1
2
2 changes: 1 addition & 1 deletion test/te_hubbard_chain_interall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

mkdir -p te_hubbard_chain_interall/
cd te_hubbard_chain_interall
python "$1/test/testTECalc.py" -p "../../src/HPhi" -mpi "${MPIRUN}"
python3 "$1/test/testTECalc.py" -p "../../src/HPhi" -mpi "${MPIRUN}"

# Check value: flct
cat > reference.dat <<EOF
Expand Down
2 changes: 1 addition & 1 deletion test/te_hubbard_chain_interall_diagonal.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

mkdir -p te_hubbard_chain_interall_diagonal/
cd te_hubbard_chain_interall_diagonal
python "$1/test/testTECalc.py" -p "../../src/HPhi" -mpi "${MPIRUN}" -t "Diagonal"
python3 "$1/test/testTECalc.py" -p "../../src/HPhi" -mpi "${MPIRUN}" -t "Diagonal"

# Check value: flct
cat > reference.dat <<EOF
Expand Down
2 changes: 1 addition & 1 deletion test/te_kondo_chain_interall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

mkdir -p te_kondo_chain_interall/
cd te_kondo_chain_interall
python "$1/test/testTECalc.py" -p "../../src/HPhi" -mpi "${MPIRUN}" -m "Kondo"
python3 "$1/test/testTECalc.py" -p "../../src/HPhi" -mpi "${MPIRUN}" -m "Kondo"

# Check value: flct
cat > reference.dat <<EOF
Expand Down
2 changes: 1 addition & 1 deletion test/te_spin_chain_interall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

mkdir -p te_spin_chain_interall/
cd te_spin_chain_interall
python "$1/test/testTECalc.py" -p "../../src/HPhi" -mpi "${MPIRUN}" -m "Spin"
python3 "$1/test/testTECalc.py" -p "../../src/HPhi" -mpi "${MPIRUN}" -m "Spin"

# Check value: SS
cat > reference.dat <<EOF
Expand Down
Loading