Skip to content

Commit

Permalink
BUGFIX: Removed build-breaking #ifdefs
Browse files Browse the repository at this point in the history
  • Loading branch information
paullric committed Jun 28, 2016
1 parent 2c632e2 commit 521c8c4
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
5 changes: 2 additions & 3 deletions src/atm/VerticalDynamicsFEM.h
Original file line number Diff line number Diff line change
Expand Up @@ -710,8 +710,7 @@ class VerticalDynamicsFEM :
/// </summary>
Vec m_vecR;
#endif
#if defined(USE_DIRECTSOLVE_APPROXJ) \
|| defined(USE_DIRECTSOLVE)

private:
/// <summary>
/// Jacobian matrix used in direct solve.
Expand All @@ -722,7 +721,7 @@ class VerticalDynamicsFEM :
/// Pivot matrix used in direct solve.
/// </summary>
DataArray1D<int> m_vecIPiv;
#endif

#ifdef USE_JACOBIAN_DIAGONAL
private:
/// <summary>
Expand Down
4 changes: 1 addition & 3 deletions src/atm/VerticalDynamicsSchur.h
Original file line number Diff line number Diff line change
Expand Up @@ -752,8 +752,7 @@ class VerticalDynamicsSchur :
/// </summary>
Vec m_vecR;
#endif
#if defined(USE_DIRECTSOLVE_APPROXJ) \
|| defined(USE_DIRECTSOLVE)

private:
/// <summary>
/// Jacobian matrix used in direct solve.
Expand All @@ -775,7 +774,6 @@ class VerticalDynamicsSchur :
/// </summary>
DataArray1D<double> m_dSolnSchur;

#endif
private:
/// <summary>
/// Number of off-diagonals in Jacobian.
Expand Down

0 comments on commit 521c8c4

Please sign in to comment.