Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
a05e85f
working on joss paper
prashjha Oct 18, 2024
632b9f1
fix github action
prashjha Oct 18, 2024
0b8f342
use plain latex syntax without preamble
prashjha Oct 18, 2024
f695f33
fix pdf compile error
prashjha Oct 18, 2024
2080c19
fix pdf compile error
prashjha Oct 18, 2024
e93a07b
change image size and upload pdf to the repository
prashjha Oct 18, 2024
3115eb7
(auto) Paper PDF Draft
prashjha Oct 18, 2024
abd70b9
WIP: draft
prashjha Oct 18, 2024
ba65732
(auto) Paper PDF Draft
prashjha Oct 18, 2024
5dc4e67
WIP: draft
prashjha Oct 18, 2024
1563777
Merge branch 'joss' of github.com:prashjha/PeriDEM into joss
prashjha Oct 18, 2024
fb9df37
WIP: draft
prashjha Oct 18, 2024
b8caadc
(auto) Paper PDF Draft
prashjha Oct 18, 2024
d21f906
WIP: draft
prashjha Oct 18, 2024
d1fe8bd
Merge branch 'joss' of github.com:prashjha/PeriDEM into joss
prashjha Oct 18, 2024
1eb7899
WIP: draft
prashjha Oct 18, 2024
24dc7f5
(auto) Paper PDF Draft
prashjha Oct 18, 2024
9bfcaee
WIP: joss paper. Update paper.md
prashjha Oct 18, 2024
3276467
(auto) Paper PDF Draft
prashjha Oct 18, 2024
6a69b74
WIP: joss paper
prashjha Oct 18, 2024
839240b
(auto) Paper PDF Draft
prashjha Oct 18, 2024
a215e61
WIP: joss paper
prashjha Oct 18, 2024
bb2580e
(auto) Paper PDF Draft
prashjha Oct 18, 2024
d2e41f0
WIP: joss paper
prashjha Oct 18, 2024
f70c30b
(auto) Paper PDF Draft
prashjha Oct 18, 2024
5c5ce29
WIP: joss paper
prashjha Oct 18, 2024
64340b8
(auto) Paper PDF Draft
prashjha Oct 18, 2024
8e703ea
WIP: joss paper
prashjha Oct 18, 2024
209c6cb
(auto) Paper PDF Draft
prashjha Oct 18, 2024
50f1407
Merge pull request #33 from prashjha/main
prashjha Oct 18, 2024
b0f6d08
(auto) Paper PDF Draft
prashjha Oct 18, 2024
03204ab
fix missing doi
prashjha Oct 22, 2024
03d6d5d
Update paper.bib
prashjha Oct 22, 2024
c1014d3
(auto) Paper PDF Draft
prashjha Oct 22, 2024
81ffd1e
Update paper.bib
prashjha Oct 22, 2024
4803a6e
(auto) Paper PDF Draft
prashjha Oct 22, 2024
4474a8d
Update paper.bib
prashjha Oct 28, 2024
cd94176
(auto) Paper PDF Draft
prashjha Oct 28, 2024
6d06b51
add ellipse geometry. It requires six parameters, rx, ry, x, y, z, theta
prashjha Jun 7, 2025
8f73cbd
add hanging node tests before writing mesh to file
prashjha Jun 7, 2025
d869655
JOSS review: update summary and statement of need sections based on t…
prashjha Nov 26, 2025
803880b
(auto) Paper PDF Draft
prashjha Nov 26, 2025
957e445
JOSS review: fix reference call
prashjha Nov 26, 2025
ca615fb
JOSS review: replace theory by referring to specific sections of JMPS…
prashjha Nov 26, 2025
9fff86e
(auto) Paper PDF Draft
prashjha Nov 26, 2025
106b007
JOSS review: refine text
prashjha Nov 26, 2025
3b199e3
Merge branch 'joss' of github.com:prashjha/PeriDEM into joss
prashjha Nov 26, 2025
7c564e8
JOSS review: add acknowledgement
prashjha Nov 26, 2025
48a7518
JOSS review: add acknowledgement
prashjha Nov 26, 2025
5dfb6b8
(auto) Paper PDF Draft
prashjha Nov 26, 2025
ba3cc77
JOSS review: add acknowledgement
prashjha Nov 26, 2025
cedc4e6
(auto) Paper PDF Draft
prashjha Nov 26, 2025
f6514ed
JOSS review: final refinement
prashjha Nov 26, 2025
f0cd6c7
(auto) Paper PDF Draft
prashjha Nov 26, 2025
a406c24
JOSS review: final refinement
prashjha Nov 26, 2025
e96667a
(auto) Paper PDF Draft
prashjha Nov 26, 2025
e6d34c0
JOSS review: final refinement
prashjha Nov 26, 2025
55b7014
(auto) Paper PDF Draft
prashjha Nov 26, 2025
499efd7
JOSS review: final refinement
prashjha Nov 26, 2025
023c22b
(auto) Paper PDF Draft
prashjha Nov 26, 2025
a517a15
JOSS review: final refinement
prashjha Nov 26, 2025
2d7ca98
(auto) Paper PDF Draft
prashjha Nov 26, 2025
1a082d0
JOSS review: final refinement
prashjha Nov 26, 2025
6149982
(auto) Paper PDF Draft
prashjha Nov 26, 2025
d6037f8
JOSS review: final refinement
prashjha Nov 26, 2025
60f6af9
(auto) Paper PDF Draft
prashjha Nov 26, 2025
b7a679a
JOSS review: final refinement
prashjha Nov 26, 2025
fa48417
(auto) Paper PDF Draft
prashjha Nov 26, 2025
6ebf6be
JOSS review: final refinement
prashjha Nov 26, 2025
d0cac0b
(auto) Paper PDF Draft
prashjha Nov 26, 2025
74f760d
JOSS review: final refinement
prashjha Nov 26, 2025
7072bfd
(auto) Paper PDF Draft
prashjha Nov 26, 2025
e054c54
JOSS review: final refinement
prashjha Nov 26, 2025
c2c0220
(auto) Paper PDF Draft
prashjha Nov 26, 2025
d5891f9
JOSS review: final refinement
prashjha Nov 26, 2025
5acc772
(auto) Paper PDF Draft
prashjha Nov 26, 2025
61ec5d6
JOSS review: final refinement
prashjha Nov 26, 2025
1760e8a
(auto) Paper PDF Draft
prashjha Nov 26, 2025
536ae10
JOSS review: final refinement
prashjha Nov 26, 2025
0cc2f0d
(auto) Paper PDF Draft
prashjha Nov 26, 2025
8cd382b
Merge pull request #46 from prashjha/joss
prashjha Nov 26, 2025
b1887c3
JOSS review: allow joss pdf processing only on joss branch
prashjha Nov 26, 2025
5d3d2f9
(auto) Paper PDF Draft
prashjha Nov 26, 2025
84216f7
Merge pull request #47 from prashjha/joss
prashjha Nov 26, 2025
bab82db
JOSS review: pixi.toml file to build library following matthewfeicker…
prashjha Nov 29, 2025
e0dc3c0
JOSS review: Related to #45, pixi build is verified on mac and ubunut…
prashjha Nov 29, 2025
941de34
JOSS review: For #45, the library now supports install.
prashjha Nov 29, 2025
a846f9b
JOSS review: For #45, discuss using installed PeriDEM as package
prashjha Nov 29, 2025
4a6fb71
JOSS review: For #45, update README to mention testing install
prashjha Nov 29, 2025
9a0e3b7
JOSS review: #45, fix MPI issue in circleci build error
prashjha Nov 29, 2025
0c16b1e
Merge pull request #48 from prashjha/fix-joss
prashjha Nov 29, 2025
2bdf9dc
MNT: Update cmake dependency to allow for CMake policy v4
matthewfeickert Dec 10, 2025
dacd8e4
ENH: Add 'start' and additional tasks to Pixi manifest
matthewfeickert Dec 10, 2025
8d6fc46
MNT: Enable Pixi 'insecure' post link scripts locally
matthewfeickert Dec 10, 2025
58737c3
Merge pull request #49 from matthewfeickert/mnt/update-pixi
prashjha Dec 10, 2025
20fe4b3
Update figures with adaptation notes in paper.md #50
prashjha Dec 17, 2025
4e40ffc
(auto) Paper PDF Draft
prashjha Dec 17, 2025
c8c09d9
fix reference inside figure caption #50
prashjha Dec 17, 2025
8668778
(auto) Paper PDF Draft
prashjha Dec 17, 2025
e0c5b6d
Update figure caption formatting in paper.md #50
prashjha Dec 17, 2025
c64779d
(auto) Paper PDF Draft
prashjha Dec 17, 2025
df30518
JOSS paper edits
kyleniemeyer Dec 19, 2025
d18f8ad
Merge pull request #51 from kyleniemeyer/patch-1
prashjha Dec 19, 2025
21e1d8d
(auto) Paper PDF Draft
prashjha Dec 19, 2025
c069207
Merge pull request #52 from prashjha/joss
prashjha Dec 22, 2025
c07af21
add joss paper details
prashjha Dec 22, 2025
4d61092
Merge pull request #53 from prashjha/prashjha-patch-1
prashjha Dec 22, 2025
0c333c9
Merge origin/main into modular-merge-main
prashjha Apr 6, 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
4 changes: 3 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,9 @@ workflows:
- build:
filters:
branches:
ignore: gh-pages
ignore:
- gh-pages
- joss
- documentation:
filters:
branches:
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/pdf-joss.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Draft PDF

on:
push:
branches:
- joss

jobs:
paper:
runs-on: ubuntu-latest
name: Paper Draft
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Build draft PDF
uses: openjournals/openjournals-draft-action@master
with:
journal: joss
# This should be the path to the paper within your repo.
paper-path: docs/joss/paper.md
- name: Upload
uses: actions/upload-artifact@v4
with:
name: paper
# This is the output path where Pandoc will write the compiled
# PDF. Note, this should be the same directory as the input
# paper.md
path: docs/joss/paper.pdf
- name: Commit PDF to repository
uses: EndBug/add-and-commit@v9
with:
message: '(auto) Paper PDF Draft'
# This should be the path to the paper within your repo.
add: 'docs/joss/paper.pdf' # 'paper/*.pdf' to commit all PDFs in the paper directory
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ build2
build*
cmake-build*

# pixi lock file
pixi.lock

# ide directory
.idea
.idea/workspace.xml
Expand Down
1 change: 1 addition & 0 deletions .pixi/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
run-post-link-scripts = "insecure"
74 changes: 60 additions & 14 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
# Distributed under the Boost Software License, Version 1.0. (See accompanying
# file LICENSE)

cmake_minimum_required(VERSION 3.10)
cmake_minimum_required(VERSION 3.10...4.3)

#----------------------------------#
#<<<<<<<<<< Project name >>>>>>>>>>#
#----------------------------------#
project(PeriDEM LANGUAGES CXX C)
project(PeriDEM VERSION 0.2.1 LANGUAGES CXX C)

# Homebrew LLVM on macOS: default CMAKE_AR is /usr/bin/ar while CMAKE_RANLIB may be
# llvm-ranlib; mixing them produces invalid .a archives (bogus members like "/").
Expand All @@ -26,18 +26,24 @@ endif()
set(CMAKE_PROJECT_HOMEPAGE_URL "https://github.com/prashjha/PeriDEM")
set(CMAKE_PROJECT_DESCRIPTION "PeriDEM -- Peridynamics-based high-fidelity model for granular media")

# version
set(VERSION_MAJOR 0)
set(VERSION_MINOR 2)
set(VERSION_UPDATE 0)

#----------------------------------#
#<<<<<<<<<< Project setting >>>>>>>>>>#
#----------------------------------#

# config files
configure_file("${PROJECT_SOURCE_DIR}/PeriDEMConfig.h.in"
"${PROJECT_SOURCE_DIR}/src/PeriDEMConfig.h")
# Configure header with version info
configure_file(
"${PROJECT_SOURCE_DIR}/PeriDEMConfig.h.in"
"${PROJECT_BINARY_DIR}/PeriDEMConfig.h"
@ONLY
)

# Use version from project() for CMake package config
include(CMakePackageConfigHelpers)
write_basic_package_version_file(
"${CMAKE_CURRENT_BINARY_DIR}/PeriDEMConfigVersion.cmake"
VERSION ${PROJECT_VERSION}
COMPATIBILITY AnyNewerVersion
)

# executable directory
set(EXECUTABLE_OUTPUT_PATH "${PROJECT_BINARY_DIR}/bin")
Expand Down Expand Up @@ -170,9 +176,9 @@ include_directories(${GMSH_INCLUDE_DIRS})
if (${Enable_CMAKE_Debug_Build})
message(STATUS "Including key directories")
endif()
include_directories(SYSTEM external)
include_directories(${MPI_INCLUDE_PATH})
include_directories(src)
# include_directories(SYSTEM external)
# include_directories(${MPI_INCLUDE_PATH})
# include_directories(src)

#----------------------------------#
#<<<<<<<<<< Subdirectories >>>>>>>>>>#
Expand Down Expand Up @@ -226,12 +232,52 @@ endif()
#----------------------------------#
add_executable(PeriDEM src/main.cpp)

target_include_directories(PeriDEM
PUBLIC
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>
$<INSTALL_INTERFACE:include>
)
target_link_libraries(PeriDEM PUBLIC Model)

install(TARGETS PeriDEM Model Util RW Inp Material Loading Fracture Geom FE Mesh MeshGen Particle NSearch
EXPORT PeriDEMTargets
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)

install(EXPORT PeriDEMTargets
FILE PeriDEMTargets.cmake
NAMESPACE PeriDEM::
DESTINATION lib/cmake/PeriDEM
)


#----------------------------------#
#<<<<<<<<<< PeriDEM install >>>>>>>>>>#
#----------------------------------#
install(TARGETS PeriDEM DESTINATION bin)
install(FILES ${PROJECT_BINARY_DIR}/PeriDEMConfig.h DESTINATION include)
install(DIRECTORY src/ DESTINATION include FILES_MATCHING PATTERN "*.h")
install(FILES external/csv/csv.h DESTINATION include/csv)
install(DIRECTORY external/nanoflann/ DESTINATION include/nanoflann FILES_MATCHING PATTERN "*.hpp")
install(DIRECTORY external/taskflow/taskflow/ DESTINATION include/taskflow)
# fmt: add when external/fmt is populated (e.g. submodule): install(DIRECTORY external/fmt/include/ DESTINATION include)

configure_package_config_file(
cmake/PeriDEMConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/PeriDEMConfig.cmake
INSTALL_DESTINATION lib/cmake/PeriDEM
)

install(FILES
${CMAKE_CURRENT_BINARY_DIR}/PeriDEMConfig.cmake
${CMAKE_CURRENT_BINARY_DIR}/PeriDEMConfigVersion.cmake
${PROJECT_SOURCE_DIR}/cmake/FindMetis.cmake
DESTINATION lib/cmake/PeriDEM
)



#----------------------------------#
#<<<<<<<<<< Post build operations >>>>>>>>>>#
Expand Down
10 changes: 7 additions & 3 deletions PeriDEMConfig.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,12 @@

#include<cstddef>

size_t const MAJOR_VERSION = @VERSION_MAJOR@;
size_t const MINOR_VERSION = @VERSION_MINOR@;
size_t const UPDATE_VERSION = @VERSION_UPDATE@;
#define PERIDEM_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
#define PERIDEM_VERSION_MINOR @PROJECT_VERSION_MINOR@
#define PERIDEM_VERSION_PATCH @PROJECT_VERSION_PATCH@

const size_t MAJOR_VERSION = PERIDEM_VERSION_MAJOR;
const size_t MINOR_VERSION = PERIDEM_VERSION_MINOR;
const size_t UPDATE_VERSION = PERIDEM_VERSION_PATCH;

#endif
Loading
Loading