Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add template args to DataBox #47

Merged
merged 9 commits into from
Jan 22, 2024
Merged

Add template args to DataBox #47

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a34e356
Add template args
brryan Dec 8, 2023
95905d1
update spiner, try to fix CI
jonahm-LANL Dec 8, 2023
b5fa194
portability path
jonahm-LANL Dec 8, 2023
c1fcfc8
come on...
jonahm-LANL Dec 8, 2023
f597c8b
ok add ports-of-call submodule and that seems to fix things
jonahm-LANL Dec 8, 2023
d5115e1
well it works with HDF5 turned off now at least...
jonahm-LANL Dec 8, 2023
52fa0df
OK FINALLY
jonahm-LANL Dec 8, 2023
46a6dde
brryan fix
jonahm-LANL Dec 9, 2023
34de0ed
One more using statement
brryan Jan 22, 2024
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
8 changes: 5 additions & 3 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: true
submodules: recursive
- name: Set system to non-interactive mode
run: export DEBIAN_FRONTEND=noninteractive
- name: install dependencies
run: sudo apt-get install -y --force-yes -qq build-essential libhdf5-serial-dev
run: |
sudo apt-get update -y -qq
sudo apt-get install -y --force-yes -qq build-essential libhdf5-serial-dev
- name: build and run tests
run: |
mkdir -p bin
Expand Down
4 changes: 2 additions & 2 deletions singularity-opac/neutrinos/mean_opacity_neutrinos.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,8 @@ class MeanOpacity {
PORTABLE_INLINE_FUNCTION Real fromLog_(const Real lx) const {
return std::pow(10., lx);
}
Spiner::DataBox lkappaPlanck_;
Spiner::DataBox lkappaRosseland_;
Spiner::DataBox<Real> lkappaPlanck_;
Spiner::DataBox<Real> lkappaRosseland_;
const char *filename_;
};

Expand Down
4 changes: 2 additions & 2 deletions singularity-opac/photons/mean_opacity_photons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ class MeanOpacity {
PORTABLE_INLINE_FUNCTION Real fromLog_(const Real lx) const {
return std::pow(10., lx);
}
Spiner::DataBox lkappaPlanck_;
Spiner::DataBox lkappaRosseland_;
Spiner::DataBox<Real> lkappaPlanck_;
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Thanks for fixing the mean_s_opacity functions as well -- should we move these original changes to the using Databox = pattern you have elsewhere for consistency? I can do this if you want to hand the PR back to me

Copy link
Collaborator

Choose a reason for hiding this comment

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

Sure, that sounds good. Thanks!

Spiner::DataBox<Real> lkappaRosseland_;
const char *filename_;
};

Expand Down
2 changes: 1 addition & 1 deletion test/catch2_define.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// publicly, and to permit others to do so.
// ======================================================================

#include "../utils/ports-of-call/portability.hpp"
#include <ports-of-call/portability.hpp>

#define CATCH_CONFIG_RUNNER
#include <catch2/catch.hpp>
Expand Down
2 changes: 1 addition & 1 deletion utils/spiner
Open in desktop
Submodule spiner updated 54 files
+2 −1 .github/PULL_REQUEST_TEMPLATE.md
+46 −0 .github/workflows/deps.yml
+40 −0 .github/workflows/docs.yml
+24 −0 .github/workflows/formatting.yml
+36 −0 .github/workflows/install.yml
+11 −6 .github/workflows/tests.yml
+5 −0 .gitignore
+157 −0 .gitlab-ci.yml
+5 −0 .gitlab-ci/config/spack/upstreams.yaml
+3 −4 .gitmodules
+213 −0 CMakeLists.txt
+0 −1 Catch2
+93 −32 README.md
+66 −0 cmake/Format.cmake
+232 −0 cmake/content.cmake
+22 −0 cmake/spinerConfig.cmake.in
+10 −0 doc/index.html
+1 −0 doc/sphinx/.gitignore
+27 −0 doc/sphinx/Makefile
+3 −0 doc/sphinx/README
+1 −0 doc/sphinx/_static/placeholder
+27 −0 doc/sphinx/_templates/versions.html
+57 −0 doc/sphinx/conf.py
+68 −0 doc/sphinx/index.rst
+35 −0 doc/sphinx/make.bat
+93 −0 doc/sphinx/src/building.rst
+503 −0 doc/sphinx/src/databox.rst
+54 −0 doc/sphinx/src/getting-started.rst
+178 −0 doc/sphinx/src/interpolation.rst
+102 −0 doc/sphinx/src/sphinx-howto.rst
+70 −0 doc/sphinx/src/statement-of-need.rst
+ − figs/spiner_interpolation_benchmark.png
+1 −0 installtest/.gitignore
+43 −0 installtest/CMakeLists.txt
+7 −0 installtest/libtest.cpp
+0 −79 ports-of-call/README.md
+0 −232 ports-of-call/portability.hpp
+0 −492 ports-of-call/portable_arrays.hpp
+50 −0 spack-repo/packages/ports-of-call/package.py
+106 −0 spack-repo/packages/spiner/package.py
+6 −0 spack-repo/repo.yaml
+206 −162 spiner/databox.hpp
+21 −0 spiner/interpolation.hpp
+221 −0 spiner/piecewise_grid_1d.hpp
+57 −34 spiner/regular_grid_1d.hpp
+5 −0 spiner/sp5.hpp
+0 −0 spiner/spiner_types.hpp
+112 −0 test/CMakeLists.txt
+0 −71 test/Makefile
+0 −78 test/Makefile.kokkos
+135 −0 test/benchmark.cpp
+8 −7 test/convergence.cpp
+7 −9 test/plot_convergence.py
+196 −22 test/test.cpp
Loading