From 521c8c47275e12e6ce2ab40d13f96bbb79a01b52 Mon Sep 17 00:00:00 2001 From: Paul Ullrich Date: Tue, 28 Jun 2016 10:24:24 -0700 Subject: [PATCH] BUGFIX: Removed build-breaking #ifdefs --- src/atm/VerticalDynamicsFEM.h | 5 ++--- src/atm/VerticalDynamicsSchur.h | 4 +--- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/atm/VerticalDynamicsFEM.h b/src/atm/VerticalDynamicsFEM.h index d8543a0..d483bec 100644 --- a/src/atm/VerticalDynamicsFEM.h +++ b/src/atm/VerticalDynamicsFEM.h @@ -710,8 +710,7 @@ class VerticalDynamicsFEM : /// Vec m_vecR; #endif -#if defined(USE_DIRECTSOLVE_APPROXJ) \ - || defined(USE_DIRECTSOLVE) + private: /// /// Jacobian matrix used in direct solve. @@ -722,7 +721,7 @@ class VerticalDynamicsFEM : /// Pivot matrix used in direct solve. /// DataArray1D m_vecIPiv; -#endif + #ifdef USE_JACOBIAN_DIAGONAL private: /// diff --git a/src/atm/VerticalDynamicsSchur.h b/src/atm/VerticalDynamicsSchur.h index e75e5e9..c3149ad 100644 --- a/src/atm/VerticalDynamicsSchur.h +++ b/src/atm/VerticalDynamicsSchur.h @@ -752,8 +752,7 @@ class VerticalDynamicsSchur : /// Vec m_vecR; #endif -#if defined(USE_DIRECTSOLVE_APPROXJ) \ - || defined(USE_DIRECTSOLVE) + private: /// /// Jacobian matrix used in direct solve. @@ -775,7 +774,6 @@ class VerticalDynamicsSchur : /// DataArray1D m_dSolnSchur; -#endif private: /// /// Number of off-diagonals in Jacobian.