Skip to content

Commit

Permalink
Fixes for compilation with intel compiler.
Browse files Browse the repository at this point in the history
  • Loading branch information
MaxSagebaum committed Jun 24, 2020
1 parent 5249f4f commit 7246118
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
12 changes: 12 additions & 0 deletions include/codi/expressions.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1070,6 +1070,18 @@ namespace codi {
template<typename Real, class B> \
CODI_INLINE bool OPERATOR(const unsigned long long& a, const Expression<Real, B>& b) { \
return a OP b.getValue(); \
} \
\
/** @brief Overload for OP with the CoDiPack expressions. @param[in] a The first argument of the operation. @param[in] b The second argument of the operation. @return The operation returns the same value the same version with double arguments. @tparam Real The real type used in the active types. @tparam A The expression for the first argument of the function */ \
template<typename Real, class A> \
CODI_INLINE bool OPERATOR(const Expression<Real, A>& a, const long double& b) { \
return a.getValue() OP b; \
} \
\
/** @brief Overload for OP with the CoDiPack expressions. @param[in] a The first argument of the operation. @param[in] b The second argument of the operation. @return The operation returns the same value the same version with double arguments. @tparam Real The real type used in the active types. @tparam B The expression for the second argument of the function*/ \
template<typename Real, class B> \
CODI_INLINE bool OPERATOR(const long double& a, const Expression<Real, B>& b) { \
return a OP b.getValue(); \
}

CODI_DEFINE_CONDITIONAL(operator==, ==)
Expand Down
4 changes: 2 additions & 2 deletions include/codi/tapes/modules/statementModule.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,10 @@ namespace codi {
#endif

// Push the regular Jacobian arguments
rhs.template calcGradient(insertData);
rhs.calcGradient(insertData);

// Push Jacobians from ReferencReal arguments
rhs.template pushLazyJacobies(insertData);
rhs.pushLazyJacobies(insertData);

// Store the Jacobians if the cobine optimization is enabled
#if CODI_EnableCombineJacobianArguments
Expand Down

0 comments on commit 7246118

Please sign in to comment.