Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove unused configuration variables #1472

Merged
merged 5 commits into from
Apr 9, 2023

Conversation

ischoegl
Copy link
Member

@ischoegl ischoegl commented Apr 5, 2023

Changes proposed in this pull request

Remove (mostly) unused environment variables in config.h

  • SOLARIS is unused
  • NEED_ALT_MAIN is used by a Fortran example but nowhere defined; there is no evidence of this being used outside of Cantera
  • LAPACK_NAMES_LOWERCASE has a SCons option, but is nowhere mentioned in C++ or Fortran; there is no evidence of this being used outside of Cantera
  • CT_USE_DEMANGLE is only required for Boost <1.56. The newly required DLL support was introduced in 1.61
  • DARWIN is only used to set an obscure data location /Applications/Cantera/data - it may be used for cantera-macos-pkg, but I am not sure how much use the installer sees; its main use appears to be for an installation with Matlab, but I believe that the toolbox is broken for M1?

Checklist

  • The pull request includes a clear description of this code change
  • Commit messages have short titles and reference relevant issues
  • Build passes (scons build & scons test) and unit tests address code coverage
  • Style & formatting of contributed code follows contributing guidelines
  • The pull request is ready for review

The SOLARIS variable is no longer used in the C++ code.
The NEED_ALT_MAIN variable is not defined anywhere in the code
@codecov
Copy link

codecov bot commented Apr 5, 2023

Codecov Report

Merging #1472 (e459a11) into main (5e04031) will increase coverage by 0.02%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main    #1472      +/-   ##
==========================================
+ Coverage   69.88%   69.90%   +0.02%     
==========================================
  Files         377      377              
  Lines       57298    57301       +3     
  Branches    19164    19164              
==========================================
+ Hits        40040    40054      +14     
+ Misses      14705    14694      -11     
  Partials     2553     2553              
Impacted Files Coverage Δ
include/cantera/base/global.h 81.81% <ø> (ø)
samples/f77/demo_ftnlib.cpp 51.85% <ø> (ø)
src/base/application.cpp 60.50% <ø> (ø)
src/base/application.h 80.85% <ø> (ø)
src/base/global.cpp 81.90% <100.00%> (ø)

... and 1 file with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@ischoegl ischoegl marked this pull request as ready for review April 5, 2023 11:20
@ischoegl ischoegl force-pushed the remove-solaris-variable branch 2 times, most recently from aec18d8 to 8c00ccc Compare April 5, 2023 12:51
@ischoegl ischoegl requested a review from a team April 5, 2023 14:47
Copy link
Member

@speth speth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the cleanup work on this, @ischoegl. Looks good to me besides the one comment below.

src/base/application.cpp Show resolved Hide resolved
@ischoegl
Copy link
Member Author

ischoegl commented Apr 8, 2023

Thanks! I removed the references as suggested. PS: ended up also removing references to Win XP and Win 2000 ...

Its only use is to set an alternative location for input data on macOS
Per release notes, Boost dll support was introduced in 1.61, see:
https://www.boost.org/users/history/version_1_61_0.html
@speth speth merged commit 775fe6f into Cantera:main Apr 9, 2023
@ischoegl ischoegl deleted the remove-solaris-variable branch April 9, 2023 14:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

2 participants