From e2d348fac9e868f5831fd3edaf51205960f53faf Mon Sep 17 00:00:00 2001 From: Jakob Fritz Date: Mon, 8 May 2023 08:42:09 +0200 Subject: [PATCH 1/5] Now the links seem correct when build locally --- docs/source/projects/doc_SDC_showdown.rst | 4 ++-- docs/source/projects/doc_asympconv.rst | 8 ++++---- docs/source/projects/doc_fput.rst | 8 ++++---- docs/source/projects/doc_fwsw_acoustic.rst | 6 +++--- docs/source/projects/doc_fwsw_boussinesq.rst | 2 +- docs/source/projects/doc_fwsw_theory.rst | 14 +++++++------- docs/source/projects/doc_hamiltonian_simple.rst | 4 ++-- docs/source/projects/doc_parallelSDC_nonlinear.rst | 4 ++-- .../projects/doc_parallelSDC_preconditioner.rst | 8 ++++---- .../doc_parallelSDC_preconditioner_MPI.rst | 8 ++++---- docs/source/projects/doc_solar_system.rst | 8 ++++---- docs/source/tutorial/doc_step_1_B.rst | 2 +- docs/source/tutorial/doc_step_1_D.rst | 2 +- docs/source/tutorial/doc_step_8_A.rst | 2 +- docs/source/tutorial/doc_step_8_B.rst | 4 ++-- 15 files changed, 42 insertions(+), 42 deletions(-) diff --git a/docs/source/projects/doc_SDC_showdown.rst b/docs/source/projects/doc_SDC_showdown.rst index 5898562872..d597621921 100644 --- a/docs/source/projects/doc_SDC_showdown.rst +++ b/docs/source/projects/doc_SDC_showdown.rst @@ -4,7 +4,7 @@ Full code: `pySDC/projects/SDC_showdown/SDC_timing_Fisher.py `_): -.. image:: ../data/boussinesq.png +.. image:: ../../data/boussinesq.png :width: 19% diff --git a/docs/source/projects/doc_fwsw_theory.rst b/docs/source/projects/doc_fwsw_theory.rst index da33d5d29c..2fa4991ae4 100644 --- a/docs/source/projects/doc_fwsw_theory.rst +++ b/docs/source/projects/doc_fwsw_theory.rst @@ -1,22 +1,22 @@ Results: -.. image:: ../data/stifflimit-specrad.png +.. image:: ../../data/stifflimit-specrad.png :width: 19% -.. image:: ../data/stifflimit-norm.png +.. image:: ../../data/stifflimit-norm.png :width: 19% -.. image:: ../data/stability-K3-M3.png +.. image:: ../../data/stability-K3-M3.png :width: 19% -.. image:: ../data/stab_vs_k_resolved.png +.. image:: ../../data/stab_vs_k_resolved.png :width: 19% -.. image:: ../data/stab_vs_k_unresolved.png +.. image:: ../../data/stab_vs_k_unresolved.png :width: 19% -.. image:: ../data/phase-K3-M3.png +.. image:: ../../data/phase-K3-M3.png :width: 19% -.. image:: ../data/ampfactor-K3-M3.png +.. image:: ../../data/ampfactor-K3-M3.png :width: 19% \ No newline at end of file diff --git a/docs/source/projects/doc_hamiltonian_simple.rst b/docs/source/projects/doc_hamiltonian_simple.rst index 84e2ced171..3de4c3603d 100644 --- a/docs/source/projects/doc_hamiltonian_simple.rst +++ b/docs/source/projects/doc_hamiltonian_simple.rst @@ -4,10 +4,10 @@ Full code: `pySDC/projects/Hamiltonian/simple_problems.py `_ @@ -17,5 +17,5 @@ Full code: `pySDC/projects/parallelSDC/newton_vs_sdc.py Date: Mon, 8 May 2023 09:53:32 +0200 Subject: [PATCH 2/5] Updated paths to included text --- docs/source/projects/doc_fput.rst | 2 +- docs/source/projects/doc_matrixPFASST_matrix.rst | 2 +- docs/source/projects/doc_matrixPFASST_propagator.rst | 2 +- docs/source/projects/doc_parallelSDC_nonlinear.rst | 2 +- docs/source/projects/doc_solar_system.rst | 4 ++-- docs/source/tutorial/doc_step_1_B.rst | 2 +- docs/source/tutorial/doc_step_8_A.rst | 2 +- docs/source/tutorial/doc_step_8_B.rst | 2 +- docs/source/tutorial/doc_step_8_C.rst | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/source/projects/doc_fput.rst b/docs/source/projects/doc_fput.rst index 873c7d2b0e..0fc6dfbafe 100644 --- a/docs/source/projects/doc_fput.rst +++ b/docs/source/projects/doc_fput.rst @@ -4,7 +4,7 @@ Full code: `pySDC/projects/Hamiltonian/fput.py Date: Mon, 8 May 2023 10:28:10 +0200 Subject: [PATCH 3/5] Updated path for literal includes and images Now it also links to the data-dir in docs/build/html --- docs/source/projects/doc_SDC_showdown.rst | 4 ++-- docs/source/projects/doc_asympconv.rst | 8 ++++---- docs/source/projects/doc_fput.rst | 8 ++++---- docs/source/projects/doc_fwsw_acoustic.rst | 6 +++--- docs/source/projects/doc_fwsw_boussinesq.rst | 2 +- docs/source/projects/doc_fwsw_theory.rst | 14 +++++++------- docs/source/projects/doc_hamiltonian_simple.rst | 4 ++-- docs/source/projects/doc_parallelSDC_nonlinear.rst | 4 ++-- .../projects/doc_parallelSDC_preconditioner.rst | 8 ++++---- .../doc_parallelSDC_preconditioner_MPI.rst | 8 ++++---- docs/source/projects/doc_solar_system.rst | 8 ++++---- docs/source/tutorial/doc_step_1_A.rst | 2 +- docs/source/tutorial/doc_step_1_B.rst | 2 +- docs/source/tutorial/doc_step_1_C.rst | 2 +- docs/source/tutorial/doc_step_1_D.rst | 4 ++-- docs/source/tutorial/doc_step_2_A.rst | 2 +- docs/source/tutorial/doc_step_2_B.rst | 2 +- docs/source/tutorial/doc_step_2_C.rst | 2 +- docs/source/tutorial/doc_step_3_A.rst | 2 +- docs/source/tutorial/doc_step_3_B.rst | 2 +- docs/source/tutorial/doc_step_3_C.rst | 2 +- docs/source/tutorial/doc_step_4_A.rst | 2 +- docs/source/tutorial/doc_step_4_B.rst | 2 +- docs/source/tutorial/doc_step_4_C.rst | 2 +- docs/source/tutorial/doc_step_4_D.rst | 2 +- docs/source/tutorial/doc_step_5_A.rst | 2 +- docs/source/tutorial/doc_step_5_B.rst | 2 +- docs/source/tutorial/doc_step_5_C.rst | 2 +- docs/source/tutorial/doc_step_6_A.rst | 4 ++-- docs/source/tutorial/doc_step_6_B.rst | 2 +- docs/source/tutorial/doc_step_6_C.rst | 4 ++-- docs/source/tutorial/doc_step_7_A.rst | 2 +- docs/source/tutorial/doc_step_7_B.rst | 2 +- docs/source/tutorial/doc_step_7_C.rst | 6 +++--- docs/source/tutorial/doc_step_8_A.rst | 2 +- docs/source/tutorial/doc_step_8_B.rst | 4 ++-- pySDC/projects/PinTSimE/README.rst | 6 +++--- pySDC/projects/Resilience/README.rst | 14 +++++++------- 38 files changed, 78 insertions(+), 78 deletions(-) diff --git a/docs/source/projects/doc_SDC_showdown.rst b/docs/source/projects/doc_SDC_showdown.rst index d597621921..177b6a2f7c 100644 --- a/docs/source/projects/doc_SDC_showdown.rst +++ b/docs/source/projects/doc_SDC_showdown.rst @@ -4,7 +4,7 @@ Full code: `pySDC/projects/SDC_showdown/SDC_timing_Fisher.py `_): -.. image:: ../../data/boussinesq.png +.. image:: ../../../docs/build/html/data/boussinesq.png :width: 19% diff --git a/docs/source/projects/doc_fwsw_theory.rst b/docs/source/projects/doc_fwsw_theory.rst index 2fa4991ae4..ae3fed2cfa 100644 --- a/docs/source/projects/doc_fwsw_theory.rst +++ b/docs/source/projects/doc_fwsw_theory.rst @@ -1,22 +1,22 @@ Results: -.. image:: ../../data/stifflimit-specrad.png +.. image:: ../../../docs/build/html/data/stifflimit-specrad.png :width: 19% -.. image:: ../../data/stifflimit-norm.png +.. image:: ../../../docs/build/html/data/stifflimit-norm.png :width: 19% -.. image:: ../../data/stability-K3-M3.png +.. image:: ../../../docs/build/html/data/stability-K3-M3.png :width: 19% -.. image:: ../../data/stab_vs_k_resolved.png +.. image:: ../../../docs/build/html/data/stab_vs_k_resolved.png :width: 19% -.. image:: ../../data/stab_vs_k_unresolved.png +.. image:: ../../../docs/build/html/data/stab_vs_k_unresolved.png :width: 19% -.. image:: ../../data/phase-K3-M3.png +.. image:: ../../../docs/build/html/data/phase-K3-M3.png :width: 19% -.. image:: ../../data/ampfactor-K3-M3.png +.. image:: ../../../docs/build/html/data/ampfactor-K3-M3.png :width: 19% \ No newline at end of file diff --git a/docs/source/projects/doc_hamiltonian_simple.rst b/docs/source/projects/doc_hamiltonian_simple.rst index 3de4c3603d..fff3ff6446 100644 --- a/docs/source/projects/doc_hamiltonian_simple.rst +++ b/docs/source/projects/doc_hamiltonian_simple.rst @@ -4,10 +4,10 @@ Full code: `pySDC/projects/Hamiltonian/simple_problems.py `_ @@ -17,5 +17,5 @@ Full code: `pySDC/projects/parallelSDC/newton_vs_sdc.py Date: Mon, 8 May 2023 11:22:56 +0200 Subject: [PATCH 4/5] Updated paths again, after it did not work in CI But worked locally --- docs/source/projects/doc_SDC_showdown.rst | 4 ++-- docs/source/projects/doc_asympconv.rst | 8 ++++---- docs/source/projects/doc_fput.rst | 10 +++++----- docs/source/projects/doc_fwsw_acoustic.rst | 6 +++--- docs/source/projects/doc_fwsw_boussinesq.rst | 2 +- docs/source/projects/doc_fwsw_theory.rst | 14 +++++++------- docs/source/projects/doc_hamiltonian_simple.rst | 4 ++-- docs/source/projects/doc_matrixPFASST_matrix.rst | 2 +- .../projects/doc_matrixPFASST_propagator.rst | 2 +- docs/source/projects/doc_parallelSDC_nonlinear.rst | 6 +++--- .../projects/doc_parallelSDC_preconditioner.rst | 8 ++++---- .../doc_parallelSDC_preconditioner_MPI.rst | 8 ++++---- docs/source/projects/doc_solar_system.rst | 12 ++++++------ pySDC/projects/PinTSimE/README.rst | 6 +++--- pySDC/projects/Resilience/README.rst | 14 +++++++------- 15 files changed, 53 insertions(+), 53 deletions(-) diff --git a/docs/source/projects/doc_SDC_showdown.rst b/docs/source/projects/doc_SDC_showdown.rst index 177b6a2f7c..5898562872 100644 --- a/docs/source/projects/doc_SDC_showdown.rst +++ b/docs/source/projects/doc_SDC_showdown.rst @@ -4,7 +4,7 @@ Full code: `pySDC/projects/SDC_showdown/SDC_timing_Fisher.py `_): -.. image:: ../../../docs/build/html/data/boussinesq.png +.. image:: ../data/boussinesq.png :width: 19% diff --git a/docs/source/projects/doc_fwsw_theory.rst b/docs/source/projects/doc_fwsw_theory.rst index ae3fed2cfa..da33d5d29c 100644 --- a/docs/source/projects/doc_fwsw_theory.rst +++ b/docs/source/projects/doc_fwsw_theory.rst @@ -1,22 +1,22 @@ Results: -.. image:: ../../../docs/build/html/data/stifflimit-specrad.png +.. image:: ../data/stifflimit-specrad.png :width: 19% -.. image:: ../../../docs/build/html/data/stifflimit-norm.png +.. image:: ../data/stifflimit-norm.png :width: 19% -.. image:: ../../../docs/build/html/data/stability-K3-M3.png +.. image:: ../data/stability-K3-M3.png :width: 19% -.. image:: ../../../docs/build/html/data/stab_vs_k_resolved.png +.. image:: ../data/stab_vs_k_resolved.png :width: 19% -.. image:: ../../../docs/build/html/data/stab_vs_k_unresolved.png +.. image:: ../data/stab_vs_k_unresolved.png :width: 19% -.. image:: ../../../docs/build/html/data/phase-K3-M3.png +.. image:: ../data/phase-K3-M3.png :width: 19% -.. image:: ../../../docs/build/html/data/ampfactor-K3-M3.png +.. image:: ../data/ampfactor-K3-M3.png :width: 19% \ No newline at end of file diff --git a/docs/source/projects/doc_hamiltonian_simple.rst b/docs/source/projects/doc_hamiltonian_simple.rst index fff3ff6446..84e2ced171 100644 --- a/docs/source/projects/doc_hamiltonian_simple.rst +++ b/docs/source/projects/doc_hamiltonian_simple.rst @@ -4,10 +4,10 @@ Full code: `pySDC/projects/Hamiltonian/simple_problems.py `_ @@ -17,5 +17,5 @@ Full code: `pySDC/projects/parallelSDC/newton_vs_sdc.py Date: Mon, 8 May 2023 13:08:57 +0200 Subject: [PATCH 5/5] Reverted back to commit before update of website That was 1f4ccb9b760765cb0d2dbe17b04e6d4c97eb78b4 --- .github/workflows/ci_pipeline.yml | 1 - docs/source/projects/doc_SDC_showdown.rst | 4 ++-- docs/source/projects/doc_asympconv.rst | 8 ++++---- docs/source/projects/doc_fput.rst | 10 +++++----- docs/source/projects/doc_fwsw_acoustic.rst | 6 +++--- docs/source/projects/doc_fwsw_boussinesq.rst | 2 +- docs/source/projects/doc_fwsw_theory.rst | 14 +++++++------- docs/source/projects/doc_hamiltonian_simple.rst | 4 ++-- docs/source/projects/doc_matrixPFASST_matrix.rst | 2 +- .../projects/doc_matrixPFASST_propagator.rst | 2 +- docs/source/projects/doc_parallelSDC_nonlinear.rst | 6 +++--- .../projects/doc_parallelSDC_preconditioner.rst | 8 ++++---- .../doc_parallelSDC_preconditioner_MPI.rst | 8 ++++---- docs/source/projects/doc_solar_system.rst | 12 ++++++------ docs/source/tutorial/doc_step_1_A.rst | 2 +- docs/source/tutorial/doc_step_1_B.rst | 4 ++-- docs/source/tutorial/doc_step_1_C.rst | 2 +- docs/source/tutorial/doc_step_1_D.rst | 4 ++-- docs/source/tutorial/doc_step_2_A.rst | 2 +- docs/source/tutorial/doc_step_2_B.rst | 2 +- docs/source/tutorial/doc_step_2_C.rst | 2 +- docs/source/tutorial/doc_step_3_A.rst | 2 +- docs/source/tutorial/doc_step_3_B.rst | 2 +- docs/source/tutorial/doc_step_3_C.rst | 2 +- docs/source/tutorial/doc_step_4_A.rst | 2 +- docs/source/tutorial/doc_step_4_B.rst | 2 +- docs/source/tutorial/doc_step_4_C.rst | 2 +- docs/source/tutorial/doc_step_4_D.rst | 2 +- docs/source/tutorial/doc_step_5_A.rst | 2 +- docs/source/tutorial/doc_step_5_B.rst | 2 +- docs/source/tutorial/doc_step_5_C.rst | 2 +- docs/source/tutorial/doc_step_6_A.rst | 4 ++-- docs/source/tutorial/doc_step_6_B.rst | 2 +- docs/source/tutorial/doc_step_6_C.rst | 4 ++-- docs/source/tutorial/doc_step_7_A.rst | 2 +- docs/source/tutorial/doc_step_7_B.rst | 2 +- docs/source/tutorial/doc_step_7_C.rst | 6 +++--- docs/source/tutorial/doc_step_8_A.rst | 4 ++-- docs/source/tutorial/doc_step_8_B.rst | 6 +++--- docs/source/tutorial/doc_step_8_C.rst | 2 +- pySDC/projects/PinTSimE/README.rst | 6 +++--- pySDC/projects/Resilience/README.rst | 14 +++++++------- 42 files changed, 88 insertions(+), 89 deletions(-) diff --git a/.github/workflows/ci_pipeline.yml b/.github/workflows/ci_pipeline.yml index 624da7ad51..4a8b4a794e 100644 --- a/.github/workflows/ci_pipeline.yml +++ b/.github/workflows/ci_pipeline.yml @@ -267,7 +267,6 @@ jobs: sphinx-build -b html docs/source docs/build/html mkdir -p docs/build/html/coverage mv htmlcov/* docs/build/html/coverage/. - cp -r data docs/build/html/ # - name: Build html II # if: "!contains(github.event.head_commit.message, '[CI-no-benchmarks]')" diff --git a/docs/source/projects/doc_SDC_showdown.rst b/docs/source/projects/doc_SDC_showdown.rst index 5898562872..7648190709 100644 --- a/docs/source/projects/doc_SDC_showdown.rst +++ b/docs/source/projects/doc_SDC_showdown.rst @@ -4,7 +4,7 @@ Full code: `pySDC/projects/SDC_showdown/SDC_timing_Fisher.py `_): -.. image:: ../data/boussinesq.png +.. image:: ../../../data/boussinesq.png :width: 19% diff --git a/docs/source/projects/doc_fwsw_theory.rst b/docs/source/projects/doc_fwsw_theory.rst index da33d5d29c..550a343249 100644 --- a/docs/source/projects/doc_fwsw_theory.rst +++ b/docs/source/projects/doc_fwsw_theory.rst @@ -1,22 +1,22 @@ Results: -.. image:: ../data/stifflimit-specrad.png +.. image:: ../../../data/stifflimit-specrad.png :width: 19% -.. image:: ../data/stifflimit-norm.png +.. image:: ../../../data/stifflimit-norm.png :width: 19% -.. image:: ../data/stability-K3-M3.png +.. image:: ../../../data/stability-K3-M3.png :width: 19% -.. image:: ../data/stab_vs_k_resolved.png +.. image:: ../../../data/stab_vs_k_resolved.png :width: 19% -.. image:: ../data/stab_vs_k_unresolved.png +.. image:: ../../../data/stab_vs_k_unresolved.png :width: 19% -.. image:: ../data/phase-K3-M3.png +.. image:: ../../../data/phase-K3-M3.png :width: 19% -.. image:: ../data/ampfactor-K3-M3.png +.. image:: ../../../data/ampfactor-K3-M3.png :width: 19% \ No newline at end of file diff --git a/docs/source/projects/doc_hamiltonian_simple.rst b/docs/source/projects/doc_hamiltonian_simple.rst index 84e2ced171..7f8b8a28ec 100644 --- a/docs/source/projects/doc_hamiltonian_simple.rst +++ b/docs/source/projects/doc_hamiltonian_simple.rst @@ -4,10 +4,10 @@ Full code: `pySDC/projects/Hamiltonian/simple_problems.py `_ @@ -17,5 +17,5 @@ Full code: `pySDC/projects/parallelSDC/newton_vs_sdc.py