Skip to content

Commit 97c329d

Browse files
committed
Fix dispersion function to reflect new API
1 parent 069e1d8 commit 97c329d

1 file changed

Lines changed: 9 additions & 15 deletions

File tree

graph_framework/dispersion.hpp

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -930,21 +930,17 @@ namespace dispersion {
930930
///
931931
/// ωpi is the plasma frequency and ωci is the cyclotron frequency.
932932
///
933-
/// @param[in] w Omega variable.
934-
/// @param[in] kx Kx variable.
935-
/// @param[in] ky Ky variable.
936-
/// @param[in] kz Kz variable.
937-
/// @param[in] x x variable.
938-
/// @param[in] y y variable.
939-
/// @param[in] z z variable.
940-
/// @param[in] t Current time.
941-
/// @param[in] eq The plasma equilibrium.
933+
/// @param[in] w Omega variable.
934+
/// @param[in] k_vec Wave number.
935+
/// @param[in] x x variable.
936+
/// @param[in] y y variable.
937+
/// @param[in] z z variable.
938+
/// @param[in] t Current time.
939+
/// @param[in] eq The plasma equilibrium.
942940
//------------------------------------------------------------------------------
943941
virtual graph::shared_leaf<T, SAFE_MATH>
944942
D(graph::shared_leaf<T, SAFE_MATH> w,
945-
graph::shared_leaf<T, SAFE_MATH> kx,
946-
graph::shared_leaf<T, SAFE_MATH> ky,
947-
graph::shared_leaf<T, SAFE_MATH> kz,
943+
graph::shared_vector<T, SAFE_MATH> k_vec,
948944
graph::shared_leaf<T, SAFE_MATH> x,
949945
graph::shared_leaf<T, SAFE_MATH> y,
950946
graph::shared_leaf<T, SAFE_MATH> z,
@@ -991,9 +987,7 @@ namespace dispersion {
991987
e33 = 1.0 - e33/w2;
992988

993989
// Wave numbers.
994-
auto n = (kx*eq->get_esup1(x, y, z) +
995-
ky*eq->get_esup2(x, y, z) +
996-
kz*eq->get_esup3(x, y, z))/w;
990+
auto n = k_vec`/w;
997991
auto b_hat = b_vec->unit();
998992

999993
auto npara = b_hat->dot(n);

0 commit comments

Comments
 (0)