Skip to content

Commit

Permalink
Merge branch 'docs'
Browse files Browse the repository at this point in the history
  • Loading branch information
aoymt committed Nov 25, 2024
2 parents 0fbc5a2 + 599b4f0 commit 972a6ee
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 25 deletions.
11 changes: 4 additions & 7 deletions doc/en/source/acknowledgement.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
***************************
Acknowledgements
***************************
The development of ODAT-SE was supported by JSPS KAKENHI Grant Number 19H04125 "Unification of computational statistics and measurement technology by massively parallel machine"
and "Project for advancement of software usability in materials science" of The Institute for Solid State Physics, The University of Tokyo.
================================

A part of the design of and naming in software is inspired by `abics <https://github.com/issp-center-dev/abics>`_.
The development of 2DMAT and ODAT-SE was supported by JSPS KAKENHI Grant Numbers 19H04125, 20H00581, 21K19773, and 23K18465, and "Project for advancement of software usability in materials science" (FY2020, 2021, and 2024) of The Institute for Solid State Physics, The University of Tokyo.

For the implementation of the forward problem solver,
we thank T. Hanada (Tohoku Univ.), I. Mochizuki (KEK), W. Voegeli (Tokyo Gakugei Univ.), T. Shirasawa(AIST), R. Ahmed (Kyushu Univ.), and K. Wada(KEK). For adding a tutorial for customizing solver, we thank to K. Tsukamoto (ISSP).
A part of the design of and naming in software is inspired by `abics <https://github.com/issp-center-dev/abics>`_.
For adding a tutorial for customizing solver, we thank to K. Tsukamoto (ISSP).
17 changes: 11 additions & 6 deletions doc/en/source/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,17 @@ BibTeX::
Version Information
--------------------------------

- v3.0.0: 2024-XX-XX
- v2.1.0: 2022-04-08
- v2.0.0: 2022-01-17
- v1.0.1: 2021-04-15
- v1.0.0: 2021-03-12
- v0.1.0: 2021-02-08
- ODAT-SE

- v3.0.0: 2024-11-25

- 2DMAT

- v2.1.0: 2022-04-08
- v2.0.0: 2022-01-17
- v1.0.1: 2021-04-15
- v1.0.0: 2021-03-12
- v0.1.0: 2021-02-08


Main developers
Expand Down
10 changes: 5 additions & 5 deletions doc/ja/source/acknowledgement.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
***************************
謝辞
***************************
本ソフトウェアの開発は、科研費(2019-2021年度)「超並列マシンを用いた計算統計と測定技術の融合」および東京大学物性研究所 ソフトウェア高度化プロジェクト (2020, 2021, 2024 年度) の支援を受け開発されました。
================================

本ソフトウェアの開発は、科研費 19H04125, 20H00581, 21K19773, 23K18465 および東京大学物性研究所 ソフトウェア開発・高度化プロジェクト (2020, 2021, 2024 年度) の支援を受け開発されました。

本ソフトウェアの設計・変数命名の一部は `abics <https://github.com/issp-center-dev/abICS>`_ を参考にしています。
また、順問題ソルバーの実装にあたり、花田貴氏 (東北大学)、望月出海氏(KEK)、W. Voegeli氏(東京学芸大学)、白澤徹郎氏(AIST)、R. Ahmed氏(九州大学)、和田健氏(KEK)にお世話になりました。ソルバーの追加方法について、塚本恭平氏(物性研)にチュートリアルを追加していただきました。
この場を借りて感謝します。
また、ソルバーの追加方法について、塚本恭平氏(物性研)にチュートリアルを追加していただきました。この場を借りて感謝します。
17 changes: 11 additions & 6 deletions doc/ja/source/introduction.rst
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,17 @@ BibTeX::
バージョン履歴
----------------------

- v3.0.0 : 2024-XX-XX
- v2.1.0 : 2022-04-08
- v2.0.0 : 2022-01-17
- v1.0.1 : 2021-04-15
- v1.0.0 : 2021-03-12
- v0.1.0 : 2021-02-08
- ODAT-SE

- v3.0.0 : 2024-11-25

- 2DMAT

- v2.1.0 : 2022-04-08
- v2.0.0 : 2022-01-17
- v1.0.1 : 2021-04-15
- v1.0.0 : 2021-03-12
- v0.1.0 : 2021-02-08

主な開発者
----------------------
Expand Down
2 changes: 1 addition & 1 deletion doc/make.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh

if [ "_$1" == "_--latex" ]; then
if [ "_$1" = "_--latex" ]; then
BUILD_LATEX=ON
latexmk --version > /dev/null 2>&1 || { echo "Latexmk is not installed"; exit 1; }
else
Expand Down

0 comments on commit 972a6ee

Please sign in to comment.