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

Make Fortran compiler and options consistent #1057

Merged
merged 1 commit into from Jun 15, 2021

Conversation

speth
Copy link
Member

@speth speth commented Jun 14, 2021

In some cases, the setting of "SHF90" (the compiler to use for compiling shared objects from F90 code) does not inherit the setting of "F90" (the compiler to use for compiling normal objects from F90 code). For example, see the following extract from scons dump from this Users' Group post.

  'F03': 'gfortran',
  'F03FLAGS': '-O3',
  'F08': 'gfortran',
  'F08FLAGS': [],
  'F77': 'gfortran',
  'F77FLAGS': '-O3',
  'F90': 'gfortran',
  'F90FLAGS': '-O3',
  'F95': 'gfortran',
  'F95FLAGS': '-O3',
  'SHF03': '$F03',
  'SHF03FLAGS': ['$F03FLAGS'],
  'SHF08': '$F08',
  'SHF08FLAGS': ['$F08FLAGS'],
  'SHF77': '$F77',
  'SHF77FLAGS': ['$F77FLAGS'],
  'SHF90': 'f90',
  'SHF90FLAGS': ['$F90FLAGS'],
  'SHF95': '$F95',
  'SHF95FLAGS': ['$F95FLAGS'],
  'SHFORTRAN': 'f90',

Changes proposed in this pull request

  • Explicitly set values of SCons variables for SHF90, SHFORTRAN, etc.
  • Set compiler / flags for F08 to match other Fortran versions

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

In some cases, the setting of "SHF90" (the compiler to use for
compiling shared objects from F90 code) does not inherit the setting
of "F90" (the compiler to use for compiling normal objects from F90
code). This changes these two to be consistent, as well as the
corresponding variables for other Fortran compilers.
@speth
Copy link
Member Author

speth commented Jun 15, 2021

This change seems to have fixed the issue for the user who originally reported it.

@speth speth requested a review from a team June 15, 2021 13:42
@ischoegl ischoegl merged commit 9de22e8 into Cantera:main Jun 15, 2021
@speth speth deleted the fix-f90-shared branch June 15, 2021 15:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants