Skip to content

Commit

Permalink
Merge branch 'main' into spatially_variable_ridges
Browse files Browse the repository at this point in the history
  • Loading branch information
danieldouglas92 authored Feb 15, 2024
2 parents 2f1e963 + a190ff6 commit 5e52643
Show file tree
Hide file tree
Showing 32 changed files with 50 additions and 9,888 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,5 @@ bin/
lib/
Testing/
doc/doxygen/
doc/manual/html/
doc/manual/pdf/
*.xcf
tests/unit_tests/approval_tests/received/*
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

### Changed
- Unified the directories `cookbooks/` and `doc/sphinx/user_manual/cookbooks`. All information about cookbooks including the documentation is now bundled in the top-level `cookbooks/` directory. \[Rene Gassmoeller; 2024-02-14; [#558](github.com/GeodynamicWorldBuilder/WorldBuilder/pull/558)\]
- Deleted the deprecated Latex manual. Use the new sphinx documentation instead, which can be build into a .pdf file as well. \[Rene Gassmoeller; 2024-02-14; [#595](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/595)
- Relocated the code that is used to calculate spreading center quantities like distance from the ridge, and spreading rate. Currently the spreading rate is just a constant value, but this will be changed in a follow up pull request. \[Daniel Douglas; 2024-02-14; [#590](https://github.com/GeodynamicWorldBuilder/WorldBuilder/pull/590)

### Fixed
Expand Down
10 changes: 2 additions & 8 deletions doc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,6 @@ if(WB_BUILD_DOCUMENTATION)

add_custom_target(manual
COMMAND
${CMAKE_COMMAND} -E copy_directory
${CMAKE_CURRENT_SOURCE_DIR}/sphinx/_static/ ${CMAKE_CURRENT_BINARY_DIR}/sphinx/_static/ &&
${SPHINX_EXECUTABLE} -b html -c ${CMAKE_CURRENT_BINARY_DIR}/sphinx -v
${SPHINX_SOURCE} ${SPHINX_BUILD} &&
${SPHINX_EXECUTABLE} -b latex -c ${CMAKE_CURRENT_BINARY_DIR}/sphinx -v
${SPHINX_SOURCE} ${SPHINX_BUILD} && cd ${SPHINX_BUILD} && make
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/sphinx
COMMENT "Generating documentation with Sphinx")
${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target manual_html)

endif()
110 changes: 0 additions & 110 deletions doc/manual/bibliography.bib

This file was deleted.

Loading

0 comments on commit 5e52643

Please sign in to comment.