From 013fc4a45c1e3cdeb9def132ed6d329662ad933c Mon Sep 17 00:00:00 2001
From: Pauli Virtanen <pauli.t.virtanen@jyu.fi>
Date: Fri, 9 Sep 2022 11:01:35 +0300
Subject: [PATCH] core: explicit scalar type for action
---
src/core.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/core.cpp b/src/core.cpp
index 9fa9ed6..631fd65 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -116,7 +116,7 @@ public:
{
if (Q.dim(0) != nx_ || Q.dim(1) != ny_)
throw std::out_of_range("Q array wrong size");
- return S(mask_, Q, omega_, U_, Omega_, Lx_, Ly_, eta_, D_);
+ return S<Complex>(mask_, Q, omega_, U_, Omega_, Lx_, Ly_, eta_, D_);
}
template <typename Scalar>
@@ -151,7 +151,7 @@ public:
CppAD::Independent(Q.storage(), dynamic);
Array<ADComplex, Shape<1> > res;
- res(0u) = S(mask_, Q, dynamic[0], U_, Omegadyn, Lx_, Ly_, eta_, D_);
+ res(0u) = S<ADComplex>(mask_, Q, dynamic[0], U_, Omegadyn, Lx_, Ly_, eta_, D_);
return {Q.storage(), res.storage()};
}
@@ -402,7 +402,7 @@ public:
}
Array<ADComplex, Shape<1> > res;
- res(0u) = S(mask_, Qdyn, dynamic[0], U, Omegadyn, Lx_, Ly_, eta_, D_);
+ res(0u) = S<ADComplex>(mask_, Qdyn, dynamic[0], U, Omegadyn, Lx_, Ly_, eta_, D_);
return {A.storage(), res.storage()};
}
@@ -426,7 +426,7 @@ public:
CppAD::Independent(Omega.storage(), dynamic);
Array<ADComplex, Shape<1> > res;
- res(0u) = S(mask_, Qdyn, dynamic[0], U_, Omega, Lx_, Ly_, eta_, D_);
+ res(0u) = S<ADComplex>(mask_, Qdyn, dynamic[0], U_, Omega, Lx_, Ly_, eta_, D_);
return {Omega.storage(), res.storage()};
}
--
GitLab