Skip to content

Commit

Permalink
Merge remote-tracking branch 'develop/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
k.ido committed Jul 21, 2018
2 parents eb6e8db + ff06627 commit 35b7943
Show file tree
Hide file tree
Showing 160 changed files with 14,406 additions and 6,586 deletions.
10 changes: 10 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,13 @@ add_subdirectory(src/ComplexUHF)
add_subdirectory(src/pfapack)
add_subdirectory(src/mVMC)
add_subdirectory(tool)

# Build and enable tests
# testing setup
# enable_testing() must be called in the top-level CMakeLists.txt before any add_subdirectory() is called.
option(Testing "Enable testing" OFF)

if (Testing)
enable_testing(test)
add_subdirectory(test)
endif()
42 changes: 42 additions & 0 deletions dist.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
#!/bin/sh
#
# ############# Note ################################
# Before packing, you should clean the GIT directory as
# $ git clean -f -d -x
# #####################################################
#
# Version ID
#
major=`awk '$2=="VERSION_MAJOR"{print $3}' src/mVMC/include/version.h`
minor=`awk '$2=="VERSION_MINOR"{print $3}' src/mVMC/include/version.h`
patch=`awk '$2=="VERSION_PATCH"{print $3}' src/mVMC/include/version.h`
vid=`echo ${major}.${minor}.${patch}`
#
mkdir mVMC-${vid}
#
cp -rf * mVMC-${vid}
#
# Build docments
#
cd mVMC-${vid}/doc/jp
make -f makefile_doc_jp
sed -i -e "s/mathjax/pngmath/g" conf.py
make latexpdfja
make html
cd ../en
sed -i -e "s/mathjax/pngmath/g" conf.py
make latexpdfja
make html
cd ../../
#
# Remove some files
#
find ./ -name ".git*" -delete
rm dist.sh
rm -rf mVMC-${vid}
#
# Pack
#
cd ../
tar czvf mVMC-${vid}.tar.gz mVMC-${vid}
rm -rf mVMC-${vid}
9 changes: 9 additions & 0 deletions doc/bib/ref.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
.. _Tahara2008: http://dx.doi.org/10.1143/JPSJ.77.114701
.. _Mutsuo2008: http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT
.. _PFAPACK: https://dl.acm.org/citation.cfm?doid=2331130.2331138
.. _HPhi: http://ma.cms-initiative.jp/ja/listapps/hphi
.. _Morita2015: http://journals.jps.jp/doi/abs/10.7566/JPSJ.84.024720
.. _Misawa2014: https://journals.aps.org/prb/abstract/10.1103/PhysRevB.90.115137
.. _ImadaMiyake: http://journals.jps.jp/doi/abs/10.1143/JPSJ.79.112001
.. _Gros: https://www.sciencedirect.com/science/article/pii/0003491689900778
.. _NeuscammanUmrigarChan: https://journals.aps.org/prb/abstract/10.1103/PhysRevB.85.045103
8 changes: 4 additions & 4 deletions doc/fourier/en/Makefile → doc/en/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,17 @@ qthelp:
@echo
@echo "Build finished; now you can run "qcollectiongenerator" with the" \
".qhcp project file in $(BUILDDIR)/qthelp, like this:"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/fourier.qhcp"
@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/mVMC.qhcp"
@echo "To view the help file:"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/fourier.qhc"
@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/mVMC.qhc"

devhelp:
$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
@echo
@echo "Build finished."
@echo "To view the help file:"
@echo "# mkdir -p $$HOME/.local/share/devhelp/fourier"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/fourier"
@echo "# mkdir -p $$HOME/.local/share/devhelp/mVMC"
@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/mVMC"
@echo "# devhelp"

epub:
Expand Down
11 changes: 11 additions & 0 deletions doc/en/acknowledge.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Acknowledgement
===============

We would like to express our sincere gratitude to Mr. Daisuke Tahara for
providing us his code of variational Monte Carlo method. A part of mVMC
is based on his original code. We also acknowledge Dr. Hiroshi Shinaoka,
Dr. Youhei Yamaji, Dr. Moyuru Kurita, and Dr. Ryui Kaneko for their
cooperation on developing mVMC. We would also like to thank the support
from “Project for advancement of software usability in materials
science” by The Institute for Solid State Physics, The University of
Tokyo, for development of mVMC ver.0.1, ver. 0.2, and ver. 1.0.
Loading

0 comments on commit 35b7943

Please sign in to comment.