diff --git a/.clang-tidy b/.clang-tidy index 88cd7ebb..1bf263ce 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -1,2 +1,2 @@ Checks: '-*,modernize-*,cppcoreguidelines-*,-modernize-use-trailing-return-type' -HeaderFilterRegex: 'app4triqs' +HeaderFilterRegex: 'solid_dmft' diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index 79dfa304..7e2b5c01 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -32,7 +32,7 @@ Please provide the application version that you used. You can get this information from copy and pasting the output of ```bash -python -c "from app4triqs.version import *; show_version(); show_git_hash();" +python -c "from solid_dmft.version import *; show_version(); show_git_hash();" ``` from the command line. Also, please include the OS you are running and its version. diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9e2d12bb..18b17e1c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,7 +75,7 @@ jobs: make -j1 install VERBOSE=1 cd ../ - - name: Build app4triqs + - name: Build solid_dmft env: CC: ${{ matrix.cc }} CXX: ${{ matrix.cxx }} @@ -85,7 +85,7 @@ jobs: mkdir build && cmake -B build cmake --build build -j2 - - name: Test app4triqs + - name: Test solid_dmft env: DYLD_FALLBACK_LIBRARY_PATH: /usr/local/opt/llvm/lib run: | diff --git a/CMakeLists.txt b/CMakeLists.txt index e963ebe3..5e59c72f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,20 +1,20 @@ # ############################################################################## # -# app4triqs - An example application using triqs and cpp2py +# solid_dmft - An example application using triqs and cpp2py # # Copyright (C) ... # -# app4triqs is free software: you can redistribute it and/or modify it under the +# solid_dmft is free software: you can redistribute it and/or modify it under the # terms of the GNU General Public License as published by the Free Software # Foundation, either version 3 of the License, or (at your option) any later # version. # -# app4triqs is distributed in the hope that it will be useful, but WITHOUT ANY +# solid_dmft is distributed in the hope that it will be useful, but WITHOUT ANY # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # # You should have received a copy of the GNU General Public License along with -# app4triqs (in the file COPYING.txt in this directory). If not, see +# solid_dmft (in the file COPYING.txt in this directory). If not, see # . # # ############################################################################## @@ -30,7 +30,7 @@ endif() # ############ # Define Project -project(app4triqs VERSION 3.0.0 LANGUAGES C CXX) +project(solid_dmft VERSION 3.0.0 LANGUAGES C CXX) get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY) # ############ diff --git a/Dockerfile b/Dockerfile index 99350f0b..4e9a84f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # See ../triqs/packaging for other options FROM flatironinstitute/triqs:unstable-ubuntu-clang -ARG APPNAME=app4triqs +ARG APPNAME=solid_dmft COPY requirements.txt /src/$APPNAME/requirements.txt RUN pip3 install -r /src/$APPNAME/requirements.txt diff --git a/Jenkinsfile b/Jenkinsfile index 2db0c0ed..06af2192 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ -def projectName = "app4triqs" /* set to app/repo name */ +def projectName = "solid_dmft" /* set to app/repo name */ def dockerName = projectName.toLowerCase(); /* which platform to build documentation on */ diff --git a/LICENSE.txt b/LICENSE.txt index 4b35411e..83f768bd 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,18 +1,18 @@ -app4triqs - An example application using triqs and cpp2py +solid_dmft - An example application using triqs and cpp2py Copyright (C) 2017-2018, N. Wentzell, O. Parcollet Copyright (C) 2018-2019, The Simons Foundation authors: N. Wentzell, D. Simons, H. Strand, O. Parcollet -app4triqs is free software: you can redistribute it and/or modify it under the +solid_dmft is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. -app4triqs is distributed in the hope that it will be useful, but WITHOUT ANY +solid_dmft is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with -app4triqs (in the file COPYING.txt in this directory). If not, see +solid_dmft (in the file COPYING.txt in this directory). If not, see . diff --git a/README.md b/README.md index bacda20b..7f1b5fad 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -[![build](https://github.com/TRIQS/app4triqs/workflows/build/badge.svg)](https://github.com/TRIQS/app4triqs/actions?query=workflow%3Abuild) +[![build](https://github.com/TRIQS/solid_dmft/workflows/build/badge.svg)](https://github.com/TRIQS/solid_dmft/actions?query=workflow%3Abuild) -# app4triqs - A skeleton for a TRIQS application +# solid_dmft - A skeleton for a TRIQS application Initial Setup ------------- @@ -12,11 +12,11 @@ To adapt this skeleton for a new TRIQS application, the following steps are nece * Run the following commands in order after replacing **appname** accordingly ```bash -git clone https://github.com/triqs/app4triqs --branch python_only appname +git clone https://github.com/triqs/solid_dmft --branch python_only appname cd appname ./share/squash_history.sh ./share/replace_and_rename.py appname -git add -A && git commit -m "Adjust app4triqs skeleton for appname" +git add -A && git commit -m "Adjust solid_dmft skeleton for appname" ``` You can now add your github repository and push to it @@ -30,13 +30,13 @@ git push origin unstable If you prefer to use the [SSH interface](https://help.github.com/en/articles/connecting-to-github-with-ssh) to the remote repository, replace the http link with e.g. `git@github.com:username/appname`. -### Merging app4triqs skeleton updates ### +### Merging solid_dmft skeleton updates ### -You can merge future changes to the app4triqs skeleton into your project with the following commands +You can merge future changes to the solid_dmft skeleton into your project with the following commands ```bash git remote update -git merge app4triqs_remote/python_only -m "Merge latest app4triqs skeleton changes" +git merge solid_dmft_remote/python_only -m "Merge latest solid_dmft skeleton changes" ``` If you should encounter any conflicts resolve them and `git commit`. @@ -51,14 +51,14 @@ Getting Started --------------- After setting up your application as described above you should customize the following files and directories -according to your needs (replace app4triqs in the following by the name of your application) +according to your needs (replace solid_dmft in the following by the name of your application) * Adjust or remove the `README.md` and `doc/ChangeLog.md` file -* In the `python/app4triqs` subdirectory add your Python source files. +* In the `python/solid_dmft` subdirectory add your Python source files. * In the `test/python` subdirectory adjust the example test `Basic.py` or add your own tests. * Adjust any documentation examples given as `*.rst` files in the doc directory. * Adjust the sphinx configuration in `doc/conf.py.in` as necessary. -* The build and install process is identical to the one outline [here](https://triqs.github.io/app4triqs/unstable/install.html). +* The build and install process is identical to the one outline [here](https://triqs.github.io/solid_dmft/unstable/install.html). ### Optional ### ---------------- diff --git a/doc/ChangeLog.md b/doc/ChangeLog.md index 99deae8e..b3c846bc 100644 --- a/doc/ChangeLog.md +++ b/doc/ChangeLog.md @@ -1,7 +1,7 @@ Version 3.0.0 ============= -app4triqs version 3.0.0 is a compatibility +solid_dmft version 3.0.0 is a compatibility release for TRIQS version 3.0.0 that * introduces compatibility with Python 3 (Python 2 no longer supported) * adds a cmake-based dependency management @@ -11,7 +11,7 @@ release for TRIQS version 3.0.0 that Version 2.2.0 ============= -app4triqs Version 2.2.0 provides a project +solid_dmft Version 2.2.0 provides a project skeleton for TRIQS applications based on the TRIQS Library Version 2.2.0. It is intended for applications with both diff --git a/doc/_templates/sideb.html b/doc/_templates/sideb.html index b4cc0b15..07ecd3dc 100644 --- a/doc/_templates/sideb.html +++ b/doc/_templates/sideb.html @@ -10,5 +10,5 @@

- Visit the project on GitHub + Visit the project on GitHub

diff --git a/doc/about.rst b/doc/about.rst index 69272ffc..07f1348d 100644 --- a/doc/about.rst +++ b/doc/about.rst @@ -1,6 +1,6 @@ .. _about: -About app4triqs +About solid_dmft =============== An example application using ``cpp2py`` and TRIQS. diff --git a/doc/changelog.rst b/doc/changelog.rst index 7c169e86..eb202356 100644 --- a/doc/changelog.rst +++ b/doc/changelog.rst @@ -3,6 +3,6 @@ Changelog ========= -This document describes the main changes in APP4TRIQS. +This document describes the main changes in SOLID_DMFT. .. include:: ChangeLog.md diff --git a/doc/documentation.rst b/doc/documentation.rst index d77f01d4..98d5be64 100644 --- a/doc/documentation.rst +++ b/doc/documentation.rst @@ -24,10 +24,10 @@ Table of Contents Python reference manual ----------------------- -.. automodule:: app4triqs +.. automodule:: solid_dmft :members: -.. autoclass:: app4triqs.app4triqs_module.Toto +.. autoclass:: solid_dmft.solid_dmft_module.Toto :members: -.. autofunction:: app4triqs.app4triqs_module.chain +.. autofunction:: solid_dmft.solid_dmft_module.chain diff --git a/doc/index.rst b/doc/index.rst index 16a8278d..418de649 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -1,11 +1,11 @@ .. _welcome: -app4triqs +solid_dmft ========= -.. sidebar:: app4triqs 2.2.0 +.. sidebar:: solid_dmft 2.2.0 - This is the homepage of app4triqs v2.2.0. + This is the homepage of solid_dmft v2.2.0. For changes see the :ref:`changelog page `. An example application using cpp2py and :ref:`TRIQS `. @@ -13,7 +13,7 @@ An example application using cpp2py and :ref:`TRIQS `. This documentation is generated based on `rst `_ files and the comments in the sources and headers. -Learn how to use app4triqs in the :ref:`documentation`. +Learn how to use solid_dmft in the :ref:`documentation`. .. toctree:: :maxdepth: 2 diff --git a/doc/install.rst b/doc/install.rst index 111b9aa4..ab35b2b4 100644 --- a/doc/install.rst +++ b/doc/install.rst @@ -2,7 +2,7 @@ .. _install: -Compiling app4triqs from source +Compiling solid_dmft from source =============================== @@ -15,13 +15,13 @@ Prerequisites Installation steps ------------------ -#. Download the source code of the latest stable version by cloning the ``TRIQS/app4triqs`` repository from GitHub:: +#. Download the source code of the latest stable version by cloning the ``TRIQS/solid_dmft`` repository from GitHub:: - $ git clone https://github.com/TRIQS/app4triqs app4triqs.src + $ git clone https://github.com/TRIQS/solid_dmft solid_dmft.src #. Create and move to a new directory where you will compile the code:: - $ mkdir app4triqs.build && cd app4triqs.build + $ mkdir solid_dmft.build && cd solid_dmft.build #. Ensure that your shell contains the TRIQS environment variables by sourcing the ``triqsvars.sh`` file from your TRIQS installation:: @@ -29,7 +29,7 @@ Installation steps #. In the build directory call cmake, including any additional custom CMake options, see below:: - $ cmake ../app4triqs.src + $ cmake ../solid_dmft.src #. Compile the code, run the tests and install the application:: @@ -39,12 +39,12 @@ Installation steps Version compatibility --------------------- -Keep in mind that the version of ``app4triqs`` must be compatible with your TRIQS library version, +Keep in mind that the version of ``solid_dmft`` must be compatible with your TRIQS library version, see :ref:`TRIQS website `. In particular the Major and Minor Version numbers have to be the same. To use a particular version, go into the directory with the sources, and look at all available versions:: - $ cd app4triqs.src && git tag + $ cd solid_dmft.src && git tag Checkout the version of the code that you want:: @@ -55,14 +55,14 @@ and follow steps 2 to 4 above to compile the code. Custom CMake options -------------------- -The compilation of ``app4triqs`` can be configured using CMake-options:: +The compilation of ``solid_dmft`` can be configured using CMake-options:: - cmake ../app4triqs.src -DOPTION1=value1 -DOPTION2=value2 ... + cmake ../solid_dmft.src -DOPTION1=value1 -DOPTION2=value2 ... +-----------------------------------------------------------------+-----------------------------------------------+ | Options | Syntax | +=================================================================+===============================================+ -| Specify an installation path other than path_to_triqs | -DCMAKE_INSTALL_PREFIX=path_to_app4triqs | +| Specify an installation path other than path_to_triqs | -DCMAKE_INSTALL_PREFIX=path_to_solid_dmft | +-----------------------------------------------------------------+-----------------------------------------------+ | Build in Debugging Mode | -DCMAKE_BUILD_TYPE=Debug | +-----------------------------------------------------------------+-----------------------------------------------+ diff --git a/doc/issues.rst b/doc/issues.rst index ea52b95c..54a10c9d 100644 --- a/doc/issues.rst +++ b/doc/issues.rst @@ -4,7 +4,7 @@ Reporting issues ================ Please report all problems and bugs directly at the github issue page -``_. In order to make it easier for us +``_. In order to make it easier for us to solve the issue please follow these guidelines: #. In all cases specify which version of the application you are using. You can diff --git a/packaging/TRIQS-app4triqs-3.0.0-foss-2019a-Python-3.7.2.eb b/packaging/TRIQS-solid_dmft-3.0.0-foss-2019a-Python-3.7.2.eb similarity index 63% rename from packaging/TRIQS-app4triqs-3.0.0-foss-2019a-Python-3.7.2.eb rename to packaging/TRIQS-solid_dmft-3.0.0-foss-2019a-Python-3.7.2.eb index 42058438..ed8fa381 100644 --- a/packaging/TRIQS-app4triqs-3.0.0-foss-2019a-Python-3.7.2.eb +++ b/packaging/TRIQS-solid_dmft-3.0.0-foss-2019a-Python-3.7.2.eb @@ -1,10 +1,10 @@ easyblock = 'CMakeMake' -name = 'TRIQS-app4triqs' +name = 'TRIQS-solid_dmft' version = '3.0.0' versionsuffix = '-Python-%(pyver)s' -homepage = 'https://triqs.github.io/app4triqs/' +homepage = 'https://triqs.github.io/solid_dmft/' description = """ TRIQS (Toolbox for Research on Interacting Quantum Systems) is a scientific project providing a set of C++ and Python libraries to @@ -13,14 +13,14 @@ description = """ PROVIDE HERE A DESCRIPTION OF YOUR APPLICATION """ -docurls = ['https://triqs.github.io/app4triqs/%(version_major_minor)s.x/'] +docurls = ['https://triqs.github.io/solid_dmft/%(version_major_minor)s.x/'] software_license = 'LicenseGPLv3' toolchain = {'name': 'foss', 'version': '2019a'} toolchainopts = {'pic': True, 'usempi': True} -source_urls = ['https://github.com/TRIQS/app4triqs/releases/download/%(version)s/'] -sources = ['app4triqs-%(version)s.tar.gz'] +source_urls = ['https://github.com/TRIQS/solid_dmft/releases/download/%(version)s/'] +sources = ['solid_dmft-%(version)s.tar.gz'] checksums = ['PUT HERE THE SHA256 OF THE RELEASE TARBALL'] dependencies = [ @@ -45,21 +45,21 @@ separate_build_dir = True runtest = 'test' sanity_check_paths = { - 'files': ['lib/libapp4triqs_c.a'], - 'dirs': ['include/app4triqs', 'lib', 'share', - 'lib/python%(pyshortver)s/site-packages/app4triqs'], + 'files': ['lib/libsolid_dmft_c.a'], + 'dirs': ['include/solid_dmft', 'lib', 'share', + 'lib/python%(pyshortver)s/site-packages/solid_dmft'], } -sanity_check_commands = ["python -c 'import app4triqs'"] +sanity_check_commands = ["python -c 'import solid_dmft'"] modextrapaths = { 'CPLUS_INCLUDE_PATH': 'include', 'PYTHONPATH': 'lib/python%(pyshortver)s/site-packages', - 'CMAKE_PREFIX_PATH': 'lib/cmake/app4triqs', + 'CMAKE_PREFIX_PATH': 'lib/cmake/solid_dmft', } modextravars = { - 'APP4TRIQS_ROOT': '%(installdir)s', - 'APP4TRIQS_VERSION': '%(version)s', + 'SOLID_DMFT_ROOT': '%(installdir)s', + 'SOLID_DMFT_VERSION': '%(version)s', } moduleclass = 'phys' diff --git a/packaging/conda/meta.yaml b/packaging/conda/meta.yaml index 2fd369ef..be7d441f 100644 --- a/packaging/conda/meta.yaml +++ b/packaging/conda/meta.yaml @@ -1,11 +1,11 @@ {% set version = "3.0.0" %} package: - name: app4triqs + name: solid_dmft version: {{ version }} source: - url: https://github.com/TRIQS/app4triqs/releases/download/{{ version }}/app4triqs-{{ version }}.tar.gz + url: https://github.com/TRIQS/solid_dmft/releases/download/{{ version }}/solid_dmft-{{ version }}.tar.gz sha256: PUT HERE THE SHA256 OF YOUR RELEASE TARBALL build: @@ -42,10 +42,10 @@ test: - export OMPI_MCA_rmaps_base_oversubscribe=yes - export OMPI_MCA_btl_vader_single_copy_mechanism=none - export mpiexec="mpiexec --allow-run-as-root" - - python -c "import app4triqs" + - python -c "import solid_dmft" about: - home: https://triqs.github.io/app4triqs + home: https://triqs.github.io/solid_dmft license: GPL-3.0-or-later license_family: GPL license_file: LICENSE.txt diff --git a/python/app4triqs/CMakeLists.txt b/python/solid_dmft/CMakeLists.txt similarity index 100% rename from python/app4triqs/CMakeLists.txt rename to python/solid_dmft/CMakeLists.txt diff --git a/python/app4triqs/__init__.py b/python/solid_dmft/__init__.py similarity index 100% rename from python/app4triqs/__init__.py rename to python/solid_dmft/__init__.py diff --git a/python/app4triqs/version.py.in b/python/solid_dmft/version.py.in similarity index 100% rename from python/app4triqs/version.py.in rename to python/solid_dmft/version.py.in diff --git a/share/cmake/app4triqs-config-version.cmake.in b/share/cmake/solid_dmft-config-version.cmake.in similarity index 100% rename from share/cmake/app4triqs-config-version.cmake.in rename to share/cmake/solid_dmft-config-version.cmake.in diff --git a/share/cmake/app4triqs-config.cmake.in b/share/cmake/solid_dmft-config.cmake.in similarity index 100% rename from share/cmake/app4triqs-config.cmake.in rename to share/cmake/solid_dmft-config.cmake.in diff --git a/share/replace_and_rename.py b/share/replace_and_rename.py index b183fb40..776f973e 100755 --- a/share/replace_and_rename.py +++ b/share/replace_and_rename.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python import sys import os @@ -38,7 +38,8 @@ fpath = new_fpath # Replace app4triqs and APP4TRIQS in all files - with open(fpath, 'r') as f: + print(fpath) + with open(fpath, 'r', encoding="utf8", errors='ignore') as f: s = f.read() if "app4triqs" in s or "APP4TRIQS" in s: with open(fpath, 'w') as f: diff --git a/share/app4triqs.modulefile.in b/share/solid_dmft.modulefile.in similarity index 100% rename from share/app4triqs.modulefile.in rename to share/solid_dmft.modulefile.in diff --git a/share/app4triqsvars.sh.in b/share/solid_dmftvars.sh.in similarity index 100% rename from share/app4triqsvars.sh.in rename to share/solid_dmftvars.sh.in diff --git a/test/python/Basic.py b/test/python/Basic.py index c620577f..7cb7ffaf 100644 --- a/test/python/Basic.py +++ b/test/python/Basic.py @@ -2,7 +2,7 @@ import unittest -import app4triqs +import solid_dmft from triqs.archive import * from triqs.utility import mpi