Skip to content

Feature/arkode sts#541

Merged
gardner48 merged 411 commits intodevelopfrom
feature/arkode-sts
Nov 15, 2024
Merged

Feature/arkode sts#541
gardner48 merged 411 commits intodevelopfrom
feature/arkode-sts

Conversation

@maggul
Copy link
Copy Markdown
Collaborator

@maggul maggul commented Jul 12, 2024

This is a draft PR for feedback on new STS module.

@drreynolds
Copy link
Copy Markdown
Collaborator

Unfortunately, the rebase to develop seems to have marked hundreds of files as conflicts. I'll work on fixing this branch now, so that it will be easier for folks to review.

@drreynolds drreynolds force-pushed the feature/arkode-sts branch from 12940d0 to 62bccbd Compare July 12, 2024 16:14
@balos1
Copy link
Copy Markdown
Member

balos1 commented Jul 12, 2024

Unfortunately, the rebase to develop seems to have marked hundreds of files as conflicts. I'll work on fixing this branch now, so that it will be easier for folks to review.

Yeah, I think in the future we should not rebase develop on main (if main is updated directly) and instead do a merge. I don't see a real advantage to having the same linear history for main and develop, and it seems the rebase has a pretty big downside.

@drreynolds
Copy link
Copy Markdown
Collaborator

and it seems the rebase has a pretty big downside.

Indeed. Although rebasing might be no big deal for branches with 1-2 commits, it is a huge waste of time for a branch with any appreciable amount of development.

Comment thread include/arkode/arkode_lsrkstep.h Outdated
Comment thread include/arkode/arkode_lsrkstep.h Outdated
Comment thread include/arkode/arkode_lsrkstep.h Outdated
Comment thread include/arkode/arkode_lsrkstep.h Outdated
Comment thread include/arkode/arkode_lsrkstep.h Outdated
Comment thread include/arkode/arkode_lsrkstep.h
Comment thread include/arkode/arkode_lsrkstep.h Outdated
Comment thread examples/arkode/C_serial/CMakeLists.txt Outdated
Copy link
Copy Markdown
Collaborator

@drreynolds drreynolds left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still need to look at the changes in src/arkode, but I wanted to share my comments so far.

Comment thread examples/arkode/C_serial/erk_analytic.c
Comment thread examples/arkode/C_serial/erk_analytic.out Outdated
Comment thread examples/arkode/C_serial/ark_analytic.c Outdated
Comment thread examples/arkode/C_serial/lsrk_analytic.c Outdated
Comment thread examples/arkode/C_serial/lsrk_analytic.c Outdated
Comment thread examples/arkode/C_serial/lsrk_analytic.c Outdated
Comment thread examples/arkode/C_serial/lsrk_analytic_VarJac.c Outdated
Comment thread examples/arkode/C_serial/lsrk_analytic_VarJac.c Outdated
Comment thread examples/arkode/C_serial/lsrk_analytic_VarJac.c Outdated
Comment thread examples/arkode/C_serial/lsrk_analytic_VarJac.c Outdated
Copy link
Copy Markdown
Collaborator

@drreynolds drreynolds left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One more set of comments, covering the rest of this draft PR.

Comment thread src/arkode/arkode_lsrkstep_impl.h Outdated
Comment thread src/arkode/arkode_lsrkstep_impl.h Outdated
Comment thread src/arkode/arkode_lsrkstep_impl.h Outdated
Comment thread src/arkode/arkode_lsrkstep_impl.h Outdated
Comment thread src/arkode/arkode_lsrkstep_io.c Outdated
Comment thread src/arkode/arkode_lsrkstep.c Outdated
Comment thread src/arkode/arkode_lsrkstep.c Outdated
Comment thread src/arkode/arkode_lsrkstep.c Outdated
Comment thread src/arkode/arkode_lsrkstep.c Outdated
Comment thread src/arkode/arkode_lsrkstep.c Outdated
@maggul maggul marked this pull request as ready for review September 9, 2024 16:51
@balos1 balos1 added this to the SUNDIALS Next milestone Sep 10, 2024
Copy link
Copy Markdown
Collaborator

@drreynolds drreynolds left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've finished reviewing the documentation updates. I'll review the code soon.

Comment thread CHANGELOG.md Outdated
Comment thread doc/shared/RecentChanges.rst Outdated
Comment thread doc/arkode/guide/source/Constants.rst
Comment thread doc/arkode/guide/source/Mathematics.rst Outdated
Comment thread doc/arkode/guide/source/Mathematics.rst Outdated
Comment thread doc/arkode/guide/source/Usage/LSRKStep/User_callable.rst Outdated
Comment thread doc/arkode/guide/source/Usage/LSRKStep/User_callable.rst Outdated
Comment thread doc/arkode/guide/source/Usage/LSRKStep/User_supplied.rst Outdated
Comment thread doc/arkode/guide/source/Usage/LSRKStep/User_supplied.rst Outdated
Comment thread doc/shared/sundials.bib Outdated
Comment thread examples/arkode/C_serial/lsrk_analytic.c Outdated
Comment thread examples/arkode/C_serial/lsrk_analytic.c Outdated
Comment thread examples/arkode/C_serial/lsrk_analytic_VarJac.c Outdated
Comment thread examples/arkode/C_serial/lsrk_analytic_VarJac.c Outdated
Comment thread examples/arkode/C_serial/lsrk_ssp_analytic.c Outdated
Comment thread src/arkode/arkode_lsrkstep.c Outdated
Comment thread src/arkode/arkode_lsrkstep.c Outdated
Comment thread src/arkode/arkode_lsrkstep.c Outdated
Comment thread src/arkode/arkode_lsrkstep.c Outdated
Comment thread src/arkode/arkode_lsrkstep.c Outdated
@maggul maggul assigned maggul and unassigned maggul Sep 11, 2024
maggul and others added 5 commits September 11, 2024 16:38
Co-authored-by: Daniel R. Reynolds <reynolds@smu.edu>
Co-authored-by: Daniel R. Reynolds <reynolds@smu.edu>
Co-authored-by: Daniel R. Reynolds <reynolds@smu.edu>
Co-authored-by: Daniel R. Reynolds <reynolds@smu.edu>
Co-authored-by: Daniel R. Reynolds <reynolds@smu.edu>
Comment thread src/arkode/arkode_lsrkstep.c Outdated
Comment thread src/arkode/arkode_lsrkstep.c Outdated
Comment thread src/arkode/arkode_lsrkstep.c Outdated
Comment thread include/arkode/arkode.h
Comment thread src/arkode/arkode_lsrkstep.c
Comment thread src/arkode/arkode_lsrkstep.c Outdated
Comment thread src/arkode/arkode_lsrkstep.c
Comment thread src/arkode/arkode_lsrkstep.c
Comment thread src/arkode/arkode_lsrkstep.c Outdated
Comment thread src/arkode/arkode_lsrkstep.c Outdated
Copy link
Copy Markdown
Collaborator

@drreynolds drreynolds left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One minor item (I'll commit it myself in a moment).

Comment thread src/arkode/arkode_lsrkstep.c Outdated
Broke long comment into multiple lines.
drreynolds
drreynolds previously approved these changes Nov 15, 2024
drreynolds
drreynolds previously approved these changes Nov 15, 2024
Comment thread src/arkode/arkode_lsrkstep.c Outdated
Copy link
Copy Markdown
Member

@gardner48 gardner48 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good. Once the CI passes I'll merge sundials-codes/answers#39 and update the submodule here.

gardner48 pushed a commit to sundials-codes/answers that referenced this pull request Nov 15, 2024
Output files for LSRKStep, see llnl/sundials#541
@gardner48 gardner48 merged commit a3fa77f into develop Nov 15, 2024
@gardner48 gardner48 deleted the feature/arkode-sts branch November 15, 2024 23:36
gardner48 added a commit that referenced this pull request Jul 21, 2025
Add LSRKStep module to ARKODE with RKC, RKL, and SSPs methods.

---------

Co-authored-by: Daniel R. Reynolds <reynolds@smu.edu>
Co-authored-by: David Gardner <gardner48@llnl.gov>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants