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

Namespace update #315

Merged
merged 2 commits into from
Dec 13, 2024
Merged

Namespace update #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58e7c22
Put Compadre typedefs in Compadre:: namespace
kuberry Dec 9, 2024
0da9573
Bump to version 1.6.1
kuberry Dec 9, 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
2 changes: 1 addition & 1 deletion cmake/Compadre_Version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.6.0
1.6.1
8 changes: 4 additions & 4 deletions examples/GMLS_Manifold.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,10 @@ double sphere_harmonic54(double x, double y, double z) {

KOKKOS_INLINE_FUNCTION
void curl_sphere_harmonic54(double *curl, double x, double y, double z) {
const scalar_type lon = longitude(x, y, z); // theta
const scalar_type lat = acos(z); // phi
const scalar_type sigma_lon_comp = std::pow(sin(lat), 2) * (5.0* std::pow(cos(lat), 2) - 1.0) * cos(4.0 *lon);
const scalar_type sigma_lat_comp = 4*cos(lat) * std::pow(sin(lat), 3) * sin(4.0 * lon);
const Compadre::scalar_type lon = longitude(x, y, z); // theta
const Compadre::scalar_type lat = acos(z); // phi
const Compadre::scalar_type sigma_lon_comp = std::pow(sin(lat), 2) * (5.0* std::pow(cos(lat), 2) - 1.0) * cos(4.0 *lon);
const Compadre::scalar_type sigma_lat_comp = 4*cos(lat) * std::pow(sin(lat), 3) * sin(4.0 * lon);
// solution oriented for inward normal, so we flip sign for outward
curl[0] = -(-sin(lat)*sin(lon)*sigma_lon_comp + cos(lat)*cos(lon)*sigma_lat_comp);
curl[1] = -(sin(lat)*cos(lon)*sigma_lon_comp + cos(lat)*sin(lon)*sigma_lat_comp);
Expand Down
3 changes: 3 additions & 0 deletions src/Compadre_Typedefs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include <functional>
#include <string>

namespace Compadre {
/*!

Data types in Compadre Toolkit:
Expand Down Expand Up @@ -184,4 +185,6 @@ typename std::enable_if<2==T::rank,T>::type createView(std::string str, int dim_
//! compadre_kernel_assert_extreme_debug is similar to compadre_assert_debug, but is a call on the device,
//! namely inside of a function marked KOKKOS_INLINE_FUNCTION

} // Compadre namespace

#endif
Loading