Skip to content

Include final tweaks from v1.5 into develop #446

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.

Sign up for GitHub

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

Open
davidbowler wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Include final tweaks from v1.5 into develop #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0204c75
Change version number and date
davidbowler Feb 9, 2026
8fb7c2b
Merge branch 'develop' into release-1.5
davidbowler Feb 24, 2026
fbf301f
Update LibXC instructions and linking
davidbowler Feb 25, 2026
a7c0ab1
Merge pull request #429 from OrderN/release-1.5
davidbowler Feb 27, 2026
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ DOI for the specific version you have used in any given study.

## Version number

CONQUEST is now at version 1.4 (tag:v1.4)
CONQUEST is now at version 1.5 (tag:v1.5)
6 changes: 3 additions & 3 deletions docs/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,17 @@

# General information about the project.
project = u'CONQUEST'
copyright = u'2018-2024, CONQUEST Developers'
copyright = u'2018-2026, CONQUEST Developers'
author = u'CONQUEST Developers'

# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = u'1.4'
version = u'1.5'
# The full version, including alpha/beta/rc tags.
release = u'1.4'
release = u'1.5'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
4 changes: 2 additions & 2 deletions src/system/system.example.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ SCALAPACK = -lscalapack
#XC_COMPFLAGS =

# LibXC compatibility
# Choose LibXC version: v4 (deprecated) or v5/6/7 (v5, v6 and v7 have the same interface)
# Choose LibXC version: v4 (deprecated) or v5 (v5, v6 and v7 have the same interface)
#XC_LIBRARY = LibXC_v4
XC_LIBRARY = LibXC_v5
#XC_LIB = -lxcf90 -lxc
XC_LIBRARY = LibXC_v5
XC_LIB = -lxcf03 -lxc
XC_COMPFLAGS = -I/usr/local/include

Expand Down
3 changes: 2 additions & 1 deletion src/system/system.gha.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ LINKFLAGS=-fopenmp -L/usr/lib -L/usr/lib/x86_64-linux-gnu
# Set BLAS and LAPACK libraries
BLAS= -llapack -lblas
# LibXC compatibility (LibXC below) or Conquest XC library
XC_LIBRARY = LibXC_v5
#XC_LIBRARY = LibXC_v4
#XC_LIB = -lxcf90 -lxc
XC_LIBRARY = LibXC_v5
XC_LIB = -lxcf03 -lxc
XC_COMPFLAGS = -I/usr/include
# Set FFT library
Expand Down
5 changes: 3 additions & 2 deletions src/system/system.kathleen.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ OMP_DUMMY =
#XC_COMPFLAGS =

# LibXC compatibility
# Choose LibXC version: v4 (deprecated) or v5/6 (v5 and v6 have the same interface)
# Choose LibXC version: v4 (deprecated) or v5 (v5, v6 and v7 have the same interface)
# XC_LIBRARY = LibXC_v4
#XC_LIB = -lxcf90 -lxc
XC_LIBRARY = LibXC_v5
XC_LIB = -lxcf90 -lxc
XC_LIB = -lxcf03 -lxc
XC_COMPFLAGS = -I/usr/local/include

# Set FFT library
Expand Down
5 changes: 3 additions & 2 deletions src/system/system.mac.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,11 @@ SCALAPACK = -lscalapack
#XC_COMPFLAGS =

# LibXC compatibility
# Choose LibXC version: v4 (deprecated) or v5/6 (v5 and v6 have the same interface)
# Choose LibXC version: v4 (deprecated) or v5 (v5, v6 and v7 have the same interface)
#XC_LIBRARY = LibXC_v4
#XC_LIB = -lxcf90 -lxc
XC_LIBRARY = LibXC_v5
XC_LIB = -lxcf90 -lxc
XC_LIB = -lxcf03 -lxc
XC_COMPFLAGS = -I/opt/homebrew/Cellar/libxc/6.2.2/include

# Set FFT library
Expand Down
6 changes: 4 additions & 2 deletions src/system/system.myriad.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ OMPFLAGS= -fopenmp
#XC_COMPFLAGS =

# LibXC compatibility
# Choose LibXC version: v4 (deprecated) or v5/6 (v5 and v6 have the same interface)
# Choose LibXC version: v4 (deprecated) or v5 (v5, v6 and v7 have the same interface)
#XC_LIBRARY = LibXC_v4
#XC_LIB = -lxcf90 -lxc
XC_LIBRARY = LibXC_v5
XC_LIB = -lxcf90 -lxc
XC_LIB = -lxcf03 -lxc
XC_COMPFLAGS = -I/usr/local/include

# Compilation flags
Expand Down
3 changes: 2 additions & 1 deletion src/system/system.ubuntu.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ BLAS= -llapack -lblas
SCALAPACK = -lscalapack-openmpi

# LibXC compatibility
# Choose LibXC version: v4 (deprecated) or v5/6 (v5 and v6 have the same interface)
# Choose LibXC version: v4 (deprecated) or v5 (v5, v6 and v7 have the same interface)
# XC_LIBRARY = LibXC_v4
#XC_LIB = -lxcf90 -lxc
XC_LIBRARY = LibXC_v5
XC_LIB = -lxcf03 -lxc
XC_COMPFLAGS = -I${HOME}/local/include -I/usr/local/include
Expand Down