Skip to content

Commit

Permalink
Merge branch 'develop' into feature/no-interpolation-2
Browse files Browse the repository at this point in the history
  • Loading branch information
gardner48 authored May 15, 2024
2 parents 30d1397 + c031884 commit 8f67284
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/double-precision.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ name: Build and Test - Ubuntu/gcc double precision (TPLs, no GPUs)

on:
push:
branches:
- main
- develop
pull_request:
merge_group:
workflow_dispatch:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/extended-precision.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
name: Build and Test - Ubuntu/gcc extended precision (TPLs, no GPUs)

on:
push:
branches:
- main
- develop
pull_request:
merge_group:
workflow_dispatch:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/single-precision.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
name: Build and Test - Ubuntu/gcc single precision (TPLs, no GPUs)

on:
push:
branches:
- main
- develop
pull_request:
merge_group:
workflow_dispatch:
Expand Down
2 changes: 2 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ stages:

# This is where jobs are included.
include:
- project: 'lc-templates/id_tokens'
file: 'id_tokens.yml'
- local: .gitlab/quartz-templates.yml
- local: .gitlab/quartz-jobs.yml
- local: .gitlab/lassen-templates.yml
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ ARKODE's SPRKStep time-stepping module.
Fixed a bug in `ARKodeSPRKTable_Create` where the coefficient arrays were not
allocated.

Fix bug on LLP64 platforms (like Windows 64-bit) where `KLU_INDEXTYPE` could be
32 bits wide even if `SUNDIALS_INT64_T` is defined.

### Deprecation Notices

Numerous ARKODE stepper-specific functions are now deprecated in favor of
Expand Down
5 changes: 4 additions & 1 deletion doc/shared/RecentChanges.rst
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,14 @@ ARKODE's SPRKStep time-stepping module.
Fixed a bug in :c:func:`ARKodeSPRKTable_Create` where the coefficient arrays
were not allocated.

Fix bug on LLP64 platforms (like Windows 64-bit) where ``KLU_INDEXTYPE`` could be
32 bits wide even if ``SUNDIALS_INT64_T`` is defined.

**Deprecation Notices**

Numerous ARKODE stepper-specific functions are now deprecated in favor of
ARKODE-wide functions.

Deprecated ``ARKStepSetOptimalParams`` function. This functions does not have an
ARKODE-wide equivalent, instructions have been added to the user guide for how
to retain the current functionality using other user-callable functions.
to retain the current functionality using other user-callable functions.
3 changes: 2 additions & 1 deletion src/sunlinsol/klu/sunlinsol_klu.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
* the SUNLINSOL package.
* -----------------------------------------------------------------*/

#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <sundials/sundials_math.h>
Expand Down Expand Up @@ -49,7 +50,7 @@
*/

#if defined(SUNDIALS_INT64_T)
#define KLU_INDEXTYPE long int
#define KLU_INDEXTYPE int64_t
#else
#define KLU_INDEXTYPE int
#endif
Expand Down

0 comments on commit 8f67284

Please sign in to comment.