User Tools

Site Tools


download

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
download [2018/10/08 12:28]
tmueller
download [2020/08/21 10:15] (current)
Line 6: Line 6:
 [[http://www.gnu.org/licenses/gpl.html#TOC1| the GPL license]]. [[http://www.gnu.org/licenses/gpl.html#TOC1| the GPL license]].
  
-Installation instructions can be found [[howto:compile | on the wiki]] and in the ''INSTALL'' file which is part of the download.+Installation instructions can be found [[howto:compile | on the wiki]] and in the ''INSTALL.md'' file which is part of the download.
  
 The sparse matrix library DBCSR is part of CP2K, and made available standalone at [[dbcsr | the DBCSR page]]. The sparse matrix library DBCSR is part of CP2K, and made available standalone at [[dbcsr | the DBCSR page]].
Line 38: Line 38:
 [[https://apps.fedoraproject.org/packages/cp2k|{{fedora_logo.png?150}}]] [[https://apps.fedoraproject.org/packages/cp2k|{{fedora_logo.png?150}}]]
 [[https://packages.ubuntu.com/search?keywords=cp2k|{{ubuntu_logo.png?150}}]] [[https://packages.ubuntu.com/search?keywords=cp2k|{{ubuntu_logo.png?150}}]]
-[[https://github.com/Homebrew/homebrew-science/blob/master/cp2k.rb|{{homebrew_logo.png?150}}]]+[[https://aur.archlinux.org/packages/cp2k|{{arch_linux_logo.png?150}}]] 
 +[[https://formulae.brew.sh/formula/cp2k|{{homebrew_logo.png?150}}]]
 [[https://hub.docker.com/u/cp2k/|{{docker_logo.png?150}}]] [[https://hub.docker.com/u/cp2k/|{{docker_logo.png?150}}]]
 [[http://easybuild.readthedocs.io/en/latest/version-specific/Supported_software.html#list-software-cp2k-272|{{easybuild_logo_alpha.png?150}}]] [[http://easybuild.readthedocs.io/en/latest/version-specific/Supported_software.html#list-software-cp2k-272|{{easybuild_logo_alpha.png?150}}]]
 [[http://spack.readthedocs.io/en/latest/package_list.html?highlight=cp2k#cp2k|{{spack-logo.png?100}}]] [[http://spack.readthedocs.io/en/latest/package_list.html?highlight=cp2k#cp2k|{{spack-logo.png?100}}]]
 +[[https://anaconda.org/conda-forge/cp2k|{{conda_forge_logo.png?150}}]]
  
 ==== From a third party ==== ==== From a third party ====
Line 53: Line 55:
 The code in Git is under constant development. Check the [[http://dashboard.cp2k.org| Dashboard]] for current issues.  The code in Git is under constant development. Check the [[http://dashboard.cp2k.org| Dashboard]] for current issues. 
 </note> </note>
 +
 +The [[https://git-scm.com/|Git]] (''git'') program must be installed on your machine for this to work.
 +
 +=== Initial checkout ===
  
 The latest and all prior versions are available from the [[https://github.com/cp2k/cp2k/|CP2K GitHub repository]].  The latest and all prior versions are available from the [[https://github.com/cp2k/cp2k/|CP2K GitHub repository]]. 
Line 59: Line 65:
  
 <code> <code>
-git clone https://github.com/cp2k/cp2k.git cp2k+git clone --recursive https://github.com/cp2k/cp2k.git cp2k
 </code> </code>
  
Line 65: Line 71:
  
 <code> <code>
-git clone -b support/v6.1 https://github.com/cp2k/cp2k.git cp2k+git clone --recursive -b support/v7.1 https://github.com/cp2k/cp2k.git cp2k
 </code> </code>
  
-Your clone of the Git repository (any branchcan be updated using the following commands:+=== Keeping your clone up-to-date (Git >= 2.14=== 
 + 
 +Set the following once on your CP2K Git clone. It will tell Git to automatically update included submodules as well and to always use rebase instead of merge. 
 + 
 +<code> 
 +cd cp2k 
 +git config submodule.recurse true 
 +git config pull.rebase true 
 +</code> 
 + 
 +After setting this option, update with the following: 
 <code> <code>
 cd cp2k cd cp2k
Line 74: Line 91:
 </code> </code>
  
-The [[https://git-scm.com/|Git]] (''git''program must be installed on your machine for this to work.+If you want to set the options globally (valid for all Git commands on your machine), you can use the ''%%--%%global'' parameter for ''git config''
 + 
 +<code> 
 +git config --global submodule.recurse true 
 +git config --global pull.rebase true 
 +</code> 
 + 
 +=== Keeping your clone up-to-date (Git < 2.14=== 
 + 
 +Set the following once on your CP2K Git clone. It will tell Git to always use rebase instead of merge. 
 + 
 +<code> 
 +cd cp2k 
 +git config pull.rebase true 
 +</code> 
 + 
 +After setting this option, update with the following: 
 + 
 +<code> 
 +cd cp2k 
 + 
 +git pull 
 +git submodule update --recursive 
 +</code>
download.1539001713.txt.gz · Last modified: 2020/08/21 10:15 (external edit)