Skip to content

Commit

Permalink
feat: rename solver into ponio (#47)
Browse files Browse the repository at this point in the history
<!-- Thank you for your contribution to ponio! -->
<!-- ༊彡 -->

<!-- Please check the following before submitting your PR -->
- [x] I have installed [pre-commit](https://pre-commit.com/) locally and
use it to validate my commits.
- [x] The PR title follows the [conventional
commits](https://www.conventionalcommits.org/en/v1.0.0/) convention.
Available tags: 'build', 'chore', 'ci', 'docs', 'feat', 'fix', 'perf',
'refactor', 'revert', 'style', 'test'
- [x] This new PR is tested.

## Description
<!-- A clear and concise description of what you have done in this PR.
-->
Rename `solver` directories into `ponio`.

## Code of Conduct
By submitting this PR, you agree to follow our [Code of
Conduct](https://github.com/hpc-maths/ponio/blob/master/solver/doc/CODE_OF_CONDUCT.md)
- [x] I agree to follow this project's Code of Conduct
  • Loading branch information
kivvix authored Mar 18, 2024
1 parent 810e93e commit b9419c8
Show file tree
Hide file tree
Showing 109 changed files with 3,300 additions and 17,795 deletions.
14 changes: 7 additions & 7 deletions .cppcheck
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ missingIncludeSystem
preprocessorErrorDirective
checkersReport
# suppress unusedFunction in butcher_methods.hpp
unusedFunction:solver/include/solver/runge_kutta/butcher_methods.hpp
unusedFunction:ponio/include/ponio/runge_kutta/butcher_methods.hpp
# possible false positive
unusedFunction:solver/include/solver/detail.hpp:82
unusedFunction:solver/include/solver/detail.hpp:91
unusedFunction:solver/include/solver/problem.hpp:114
unusedFunction:solver/include/solver/problem.hpp:153
unusedFunction:solver/include/solver/runge_kutta/exprk.hpp:27
unusedFunction:solver/include/solver/runge_kutta/exprk.hpp:42
unusedFunction:ponio/include/ponio/detail.hpp:82
unusedFunction:ponio/include/ponio/detail.hpp:91
unusedFunction:ponio/include/ponio/problem.hpp:114
unusedFunction:ponio/include/ponio/problem.hpp:153
unusedFunction:ponio/include/ponio/runge_kutta/exprk.hpp:27
unusedFunction:ponio/include/ponio/runge_kutta/exprk.hpp:42
2 changes: 1 addition & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@
<!-- Give the list of files used to test this new implementation. -->

## Code of Conduct
By submitting this PR, you agree to follow our [Code of Conduct](https://github.com/hpc-maths/ponio/blob/master/solver/doc/CODE_OF_CONDUCT.md)
By submitting this PR, you agree to follow our [Code of Conduct](https://github.com/hpc-maths/ponio/blob/master/ponio/doc/CODE_OF_CONDUCT.md)
- [ ] I agree to follow this project's Code of Conduct
2 changes: 1 addition & 1 deletion .github/workflows/conan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
- name: Unix test
if: runner.os != 'Windows'
run: |
./build/solver/test/Release/ponio_tests
./build/ponio/test/Release/ponio_tests
- name: Windows test
if: runner.os == 'Windows'
run: |
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ repos:
rev: v15.0.7
hooks:
- id: clang-format
files: solver/.*\.[hc]pp$
files: ponio/.*\.[hc]pp$
6 changes: 3 additions & 3 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ build:
python: "mambaforge-latest"
jobs:
pre_install:
- bash ./solver/doc/scripts/pre_install.sh
- bash ./ponio/doc/scripts/pre_install.sh
sphinx:
configuration: solver/doc/source/conf.py
configuration: ponio/doc/source/conf.py
conda:
environment: solver/doc/environment.yml
environment: ponio/doc/environment.yml
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ project_options(
)

# includes
set(INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/solver/include)
set(INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/ponio/include)

# generate butcher_methods.hpp
find_package(Python COMPONENTS Interpreter REQUIRED)
set(BUTCHER_METHODS "${INCLUDE_DIR}/solver/runge_kutta/butcher_methods.hpp")
set(BUTCHER_METHODS "${INCLUDE_DIR}/ponio/runge_kutta/butcher_methods.hpp")

set(Ndigit 36)

Expand All @@ -87,7 +87,7 @@ file(GLOB json_files

add_custom_command(
OUTPUT ${BUTCHER_METHODS}
COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/solver/code_generator.py ${json_files}
COMMAND ${Python_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/ponio/code_generator.py ${json_files}
-o ${BUTCHER_METHODS}
--Ndigit=${Ndigit}
COMMENT "Generating code..."
Expand Down Expand Up @@ -118,19 +118,19 @@ foreach(DEPENDENCY ${DEPENDENCIES_CONFIGURED})
find_package(${DEPENDENCY} CONFIG REQUIRED)
endforeach()

set(PONIO_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/solver/include)
set(PONIO_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/ponio/include)
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})

option(BUILD_TESTS "build the tests" OFF)
option(BUILD_DEMOS "build the demos" OFF)
option(BUILD_SAMURAI_DEMOS "build demos working with samurai" OFF)

if (BUILD_TESTS)
add_subdirectory(solver/test)
add_subdirectory(ponio/test)
endif()

if (BUILD_DEMOS)
add_subdirectory(solver/demos)
add_subdirectory(ponio/demos)
endif()

# package the project
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ Now you are ready to solve your problem with an explicit Runge-Kutta method, see
* [Documentation](https://ponio.readthedocs.io/en/latest/index.html)
* [Github repository](https://github.com/hpc-maths/ponio)
* [Demos](https://github.com/hpc-maths/ponio/tree/main/solver/demos)
* [Notebooks examples](https://github.com/hpc-maths/ponio/tree/main/solver/notebooks)
* [Demos](https://github.com/hpc-maths/ponio/tree/main/ponio/demos)
* [Notebooks examples](https://github.com/hpc-maths/ponio/tree/main/ponio/notebooks)
* [List of methods and their analysis](http://jmassot.perso.math.cnrs.fr/ponio/) (personal webpage of main developer)
## How to contribute
Expand Down
4 changes: 2 additions & 2 deletions pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ build = { depends_on = ["configure", "build_ninja"] }
build_test = { depends_on = ["configure_test", "build_ninja"] }
build_test_samurai = { depends_on = ["configure_test_samurai", "build_ninja"] }
build_debug = { cmd = "ninja -C build ponio", depends_on = ["configure_debug"] }
test = { cmd = "./build/solver/test/Release/ponio_tests", depends_on = [
test = { cmd = "./build/ponio/test/Release/ponio_tests", depends_on = [
"build_test",
] }
nbval = { cmd = "pytest --nbval --nbval-current-env -p no:warnings", cwd = "./solver/notebooks", depends_on = [
nbval = { cmd = "pytest --nbval --nbval-current-env -p no:warnings", cwd = "./ponio/notebooks", depends_on = [
"build",
] }
cppcheck = { cmd = "cppcheck --enable=all -q --project=./build/compile_commands.json --suppressions-list=.cppcheck --inline-suppr 2> cppcheck_err.txt", depends_on = [
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion solver/demos/CMakeLists.txt → ponio/demos/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,6 @@ foreach(demo IN LISTS demos)
endforeach()

foreach(demo IN LISTS demos)
add_custom_target(visu_${demo} python ${CMAKE_SOURCE_DIR}/solver/demos/${demo}.py)
add_custom_target(visu_${demo} python ${CMAKE_SOURCE_DIR}/ponio/demos/${demo}.py)
add_custom_target(${demo}_visu make visu_${demo})
endforeach()
8 changes: 4 additions & 4 deletions solver/demos/arenstorf.cpp → ponio/demos/arenstorf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#include <numeric>
#include <valarray>

#include <solver/observer.hpp>
#include <solver/problem.hpp>
#include <solver/runge_kutta.hpp>
#include <solver/solver.hpp>
#include <ponio/observer.hpp>
#include <ponio/problem.hpp>
#include <ponio/runge_kutta.hpp>
#include <ponio/solver.hpp>

/*
solve Arenstorf orbit problem
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions solver/demos/brownian.cpp → ponio/demos/brownian.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
#include <string>
#include <valarray>

#include <solver/observer.hpp>
#include <solver/problem.hpp>
#include <solver/runge_kutta.hpp>
#include <solver/solver.hpp>
#include <ponio/observer.hpp>
#include <ponio/problem.hpp>
#include <ponio/runge_kutta.hpp>
#include <ponio/solver.hpp>

#include <CLI/CLI.hpp>

Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions solver/demos/brusselator.cpp → ponio/demos/brusselator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
#include <iostream>
#include <valarray>

#include <solver/observer.hpp>
#include <solver/problem.hpp>
#include <solver/runge_kutta.hpp>
#include <solver/solver.hpp>
#include <solver/time_span.hpp>
#include <ponio/observer.hpp>
#include <ponio/problem.hpp>
#include <ponio/runge_kutta.hpp>
#include <ponio/solver.hpp>
#include <ponio/time_span.hpp>

// Brusselator

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

#include <Eigen/Dense>

#include <solver/eigen_linear_algebra.hpp>
#include <solver/observer.hpp>
#include <solver/problem.hpp>
#include <solver/runge_kutta.hpp>
#include <solver/solver.hpp>
#include <solver/time_span.hpp>
#include <ponio/eigen_linear_algebra.hpp>
#include <ponio/observer.hpp>
#include <ponio/problem.hpp>
#include <ponio/runge_kutta.hpp>
#include <ponio/solver.hpp>
#include <ponio/time_span.hpp>

struct lin_alg_2_2
{
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#include <numbers>
#include <numeric>

#include <solver/observer.hpp>
#include <solver/problem.hpp>
#include <solver/runge_kutta.hpp>
#include <solver/solver.hpp>
#include <ponio/observer.hpp>
#include <ponio/problem.hpp>
#include <ponio/runge_kutta.hpp>
#include <ponio/solver.hpp>

/*
solve Curtiss and Hirschfelder problem:
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#include <numbers>
#include <numeric>

#include <solver/observer.hpp>
#include <solver/problem.hpp>
#include <solver/runge_kutta.hpp>
#include <solver/solver.hpp>
#include <ponio/observer.hpp>
#include <ponio/problem.hpp>
#include <ponio/runge_kutta.hpp>
#include <ponio/solver.hpp>

/*
solve Curtiss and Hirschfelder problem:
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions solver/demos/exp.cpp → ponio/demos/exp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@
#include <iostream>
#include <tuple>

#include <solver/observer.hpp>
#include <solver/runge_kutta.hpp>
#include <solver/solver.hpp>
#include <ponio/observer.hpp>
#include <ponio/runge_kutta.hpp>
#include <ponio/solver.hpp>

// solve $\dot{u} = u$ with $u(t=0) = 1$, and $t\in[0,2]$.

int
main( int, char** )
{
const std::string dirname = "exp_data";
std::string const dirname = "exp_data";
auto filename = std::filesystem::path( dirname ) / "exp.dat";
observer::file_observer fobs( filename );

Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions solver/demos/heat.cpp → ponio/demos/heat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
#include <numbers>
#include <sstream>

#include <solver/observer.hpp>
#include <solver/runge_kutta.hpp>
#include <solver/solver.hpp>
#include <solver/time_span.hpp>
#include <ponio/observer.hpp>
#include <ponio/runge_kutta.hpp>
#include <ponio/solver.hpp>
#include <ponio/time_span.hpp>

// Heat
class heat_model
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions solver/demos/heat_rock.cpp → ponio/demos/heat_rock.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
#include <numbers>
#include <sstream>

#include <solver/observer.hpp>
#include <solver/runge_kutta.hpp>
#include <solver/solver.hpp>
#include <solver/time_span.hpp>
#include <ponio/observer.hpp>
#include <ponio/runge_kutta.hpp>
#include <ponio/solver.hpp>
#include <ponio/time_span.hpp>

// Heat
class heat_model
Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions solver/demos/heat_samurai.cpp → ponio/demos/heat_samurai.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
#include <samurai/mr/mesh.hpp>
#include <samurai/schemes/fv.hpp>

#include <solver/observer.hpp>
#include <solver/problem.hpp>
#include <solver/runge_kutta.hpp>
#include <solver/samurai_linear_algebra.hpp>
#include <solver/solver.hpp>
#include <ponio/observer.hpp>
#include <ponio/problem.hpp>
#include <ponio/runge_kutta.hpp>
#include <ponio/samurai_linear_algebra.hpp>
#include <ponio/solver.hpp>

#include <filesystem>

Expand Down
8 changes: 4 additions & 4 deletions solver/demos/lorenz.cpp → ponio/demos/lorenz.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#include <numeric>
#include <valarray>

#include <solver/observer.hpp>
#include <solver/runge_kutta.hpp>
#include <solver/solver.hpp>
#include <solver/time_span.hpp>
#include <ponio/observer.hpp>
#include <ponio/runge_kutta.hpp>
#include <ponio/solver.hpp>
#include <ponio/time_span.hpp>

int
main( int, char** )
Expand Down
File renamed without changes.
12 changes: 6 additions & 6 deletions solver/demos/lorenz_tuto.cpp → ponio/demos/lorenz_tuto.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
#include <Eigen/Dense>
#include <unsupported/Eigen/MatrixFunctions>

#include <solver/observer.hpp>
#include <solver/problem.hpp>
#include <solver/runge_kutta.hpp>
#include <solver/solver.hpp>
#include <solver/splitting.hpp>
#include <solver/time_span.hpp>
#include <ponio/observer.hpp>
#include <ponio/problem.hpp>
#include <ponio/runge_kutta.hpp>
#include <ponio/solver.hpp>
#include <ponio/splitting.hpp>
#include <ponio/time_span.hpp>

// Lorenz
/*
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
#include <string>
#include <valarray>

#include <solver/observer.hpp>
#include <solver/problem.hpp>
#include <solver/runge_kutta.hpp>
#include <solver/solver.hpp>
#include <solver/time_span.hpp>
#include <ponio/observer.hpp>
#include <ponio/problem.hpp>
#include <ponio/runge_kutta.hpp>
#include <ponio/solver.hpp>
#include <ponio/time_span.hpp>

#include <CLI/CLI.hpp>

Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions solver/demos/nagumo.cpp → ponio/demos/nagumo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
#include <numbers>
#include <sstream>

#include <solver/observer.hpp>
#include <solver/runge_kutta.hpp>
#include <solver/solver.hpp>
#include <solver/time_span.hpp>
#include <ponio/observer.hpp>
#include <ponio/runge_kutta.hpp>
#include <ponio/solver.hpp>
#include <ponio/time_span.hpp>

struct nagumo
{
Expand Down
8 changes: 4 additions & 4 deletions solver/demos/pendulum.cpp → ponio/demos/pendulum.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
#include <numeric>
#include <valarray>

#include <solver/observer.hpp>
#include <solver/problem.hpp>
#include <solver/runge_kutta.hpp>
#include <solver/solver.hpp>
#include <ponio/observer.hpp>
#include <ponio/problem.hpp>
#include <ponio/runge_kutta.hpp>
#include <ponio/solver.hpp>

/*
solve pendulum problem :
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

cmake . -B ./build -G "Ninja Multi-Config"
cmake --build ./build --config Release
pushd solver/doc
pushd ponio/doc
doxygen
ls
ls xml
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit b9419c8

Please sign in to comment.