Skip to content

replace Scalar/Vector/Matrix with Cabana #115

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

Open
kwitaechong wants to merge 1 commit into
base: master
Choose a base branch
from
Open

replace Scalar/Vector/Matrix with Cabana #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ set(HEADERS
Picasso.hpp
Picasso_AdaptiveMesh.hpp
Picasso_APIC.hpp
Picasso_BatchedLinearAlgebra.hpp
Picasso_BilinearMeshMapping.hpp
Picasso_CurvilinearMesh.hpp
Picasso_FacetGeometry.hpp
Expand Down
29 changes: 14 additions & 15 deletions src/Picasso_APIC.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#ifndef PICASSO_APIC_HPP
#define PICASSO_APIC_HPP

#include <Picasso_BatchedLinearAlgebra.hpp>
#include <Picasso_Types.hpp>

#include <Cabana_Grid.hpp>
Expand Down Expand Up @@ -91,7 +90,7 @@ KOKKOS_INLINE_FUNCTION void p2g(
constexpr int ncomp = ParticleField::extent_1;

// Affine Matrix
LinearAlgebra::Matrix<value_type, ncomp, 3> B_p;
Cabana::LinearAlgebra::Matrix<value_type, ncomp, 3> B_p;
for ( int d = 0; d < ncomp; ++d )
{
// B_p is sliced from c_p and is transposed.
Expand All @@ -105,7 +104,7 @@ KOKKOS_INLINE_FUNCTION void p2g(
value_type D_p_inv = inertialScaling( sd );

// Project momentum.
Vec3<value_type> distance;
Cabana::Vec3<value_type> distance;
value_type wm_ip;
for ( int i = 0; i < SplineDataType::num_knot; ++i )
for ( int j = 0; j < SplineDataType::num_knot; ++j )
Expand Down Expand Up @@ -187,7 +186,7 @@ KOKKOS_INLINE_FUNCTION void p2g(
constexpr int ncomp = ParticleVelocity::extent_1;

// Affine Matrix
LinearAlgebra::Matrix<value_type, ncomp, 3> B_p;
Cabana::LinearAlgebra::Matrix<value_type, ncomp, 3> B_p;
for ( int d = 0; d < ncomp; ++d )
{
// B_p is sliced from c_p and is transposed.
Expand All @@ -204,7 +203,7 @@ KOKKOS_INLINE_FUNCTION void p2g(
value_type D_p_inv = inertialScaling( sd );

// Project momentum.
Vec3<value_type> distance;
Cabana::Vec3<value_type> distance;
value_type wm_ip;
for ( int i = 0; i < SplineDataType::num_knot; ++i )
for ( int j = 0; j < SplineDataType::num_knot; ++j )
Expand Down Expand Up @@ -273,7 +272,7 @@ KOKKOS_INLINE_FUNCTION void p2g(
constexpr int ncomp = ParticleField::extent_1;

// Affine Matrix
LinearAlgebra::Matrix<value_type, ncomp, 3> B_p;
Cabana::LinearAlgebra::Matrix<value_type, ncomp, 3> B_p;
for ( int d = 0; d < ncomp; ++d )
{
// B_p is sliced from c_p and is transposed.
Expand All @@ -282,7 +281,7 @@ KOKKOS_INLINE_FUNCTION void p2g(
B_p( d, 2 ) = c_p( 3, d );
}
// Project momentum.
Vec3<value_type> gm_ip;
Cabana::Vec3<value_type> gm_ip;
value_type wm_ip;
for ( int i = 0; i < SplineDataType::num_knot; ++i )
for ( int j = 0; j < SplineDataType::num_knot; ++j )
Expand Down Expand Up @@ -360,7 +359,7 @@ KOKKOS_INLINE_FUNCTION void p2g(
"APIC requires 3 space dimensions" );

// Affine Matrix
LinearAlgebra::Matrix<value_type, 3, 3> B_p;
Cabana::LinearAlgebra::Matrix<value_type, 3, 3> B_p;
for ( int d = 0; d < 3; ++d )
{
// B_p is sliced from c_p and is transposed.
Expand All @@ -372,7 +371,7 @@ KOKKOS_INLINE_FUNCTION void p2g(
const int dim = SplineDataType::entity_type::dim;

// Project momentum.
Vec3<value_type> gm_ip;
Cabana::Vec3<value_type> gm_ip;
value_type wm_ip;
for ( int i = 0; i < SplineDataType::num_knot; ++i )
for ( int j = 0; j < SplineDataType::num_knot; ++j )
Expand Down Expand Up @@ -426,15 +425,15 @@ g2p( const GridField& u_i, ParticleField& c_p, const SplineDataType& sd,
constexpr int ncomp = ParticleField::extent_1;

// Affine Matrix
LinearAlgebra::Vector<value_type, ncomp> u_p;
LinearAlgebra::Matrix<value_type, ncomp, 3> B_p;
Cabana::LinearAlgebra::Vector<value_type, ncomp> u_p;
Cabana::LinearAlgebra::Matrix<value_type, ncomp, 3> B_p;

// Reset the particle values.
u_p = 0.0;
B_p = 0.0;

// Update particle.
Vec3<value_type> distance;
Cabana::Vec3<value_type> distance;
value_type w_ip;
for ( int i = 0; i < SplineDataType::num_knot; ++i )
for ( int j = 0; j < SplineDataType::num_knot; ++j )
Expand Down Expand Up @@ -496,8 +495,8 @@ g2p( const GridMomentum& u_i, ParticleVelocity& c_p, const SplineDataType& sd,
"APIC requires 3 space dimensions" );

// Affine Matrix
LinearAlgebra::Vector<value_type, 3> u_p;
LinearAlgebra::Matrix<value_type, 3, 3> B_p;
Cabana::LinearAlgebra::Vector<value_type, 3> u_p;
Cabana::LinearAlgebra::Matrix<value_type, 3, 3> B_p;

// Get the field dimension we are working on.
const int dim = SplineDataType::entity_type::dim;
Expand All @@ -507,7 +506,7 @@ g2p( const GridMomentum& u_i, ParticleVelocity& c_p, const SplineDataType& sd,
B_p = 0.0;

// Update particle.
Vec3<value_type> distance;
Cabana::Vec3<value_type> distance;
value_type w_ip;
for ( int i = 0; i < SplineDataType::num_knot; ++i )
for ( int j = 0; j < SplineDataType::num_knot; ++j )
Expand Down
Loading