Skip to content

Fix compilation with ifort#70

Merged
danielhollas merged 1 commit into
masterfrom
ifort-fixes
Oct 1, 2021
Merged

Fix compilation with ifort#70
danielhollas merged 1 commit into
masterfrom
ifort-fixes

Conversation

@danielhollas

@danielhollas danielhollas commented Sep 27, 2021

Copy link
Copy Markdown
Contributor

These are all ugly hacks for now, but I don't have time to fix these things properly for now.
Long term we need to get rid of all GNU/GCC-specific stuff altogether.

@codecov

codecov Bot commented Sep 27, 2021

Copy link
Copy Markdown

Codecov Report

Merging #70 (dd56922) into master (89ef40d) will increase coverage by 0.00%.
The diff coverage is 96.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##           master      #70   +/-   ##
=======================================
  Coverage   68.98%   68.99%           
=======================================
  Files          38       38           
  Lines        5688     5689    +1     
=======================================
+ Hits         3924     3925    +1     
  Misses       1764     1764           
Impacted Files Coverage Δ
src/gle.F90 15.38% <ø> (ø)
src/transform.F90 87.02% <ø> (ø)
src/init.F90 66.47% <96.00%> (+0.04%) ⬆️


# Heuristic: if .vimrc exists, we presume we're dealing with a VIM user :-)
if [[ -f /home/$USER/.vimrc ]];then
if [[ -f ~/.vimrc ]];then

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Durham clusters don't have /home/$USER/ directory. :-)

Comment thread src/init.F90
print '(a)', ' '
end subroutine print_logo

end subroutine init

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

print_runtime_info has a system call to ldd. The fortran compiler is not happy with the fact that we also have a namelist called system. Putting print_runtime_info() outside of init() fixes that.

Comment thread water_potentials/Makefile
@@ -1,4 +1,3 @@
CXX = g++

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This should not be hardcoded, but defined in make.vars

@danielhollas danielhollas marked this pull request as ready for review September 28, 2021 15:39
@danielhollas

Copy link
Copy Markdown
Contributor Author

@suchanj can you take a look? btw: Big congrats on the poster prize! 🎉

I think I'll be submitting more PRs in the next few weeks. LMK if you're down for reviewing them, or whether I should merge them without review. Thanks!

@suchanj

suchanj commented Sep 29, 2021

Copy link
Copy Markdown
Contributor

@danielhollas Thanks! Regarding the new PRs - I'd like to stay in the loop but don't want to hinder the merging process by taking time. So I would propose that you merge whatever you need, but do not immediately delete the branches from repository so they would still be visible 👍

@danielhollas

Copy link
Copy Markdown
Contributor Author

@suchanj awesome, thanks! Sound good. I think some of them will be just some minor refactoring and cleanups. For anything bigger I'll always wait for you to take a look.

These are all ugly hacks that disable some
(fairly essential) functionalities.
Long term we need to get rid of GNU/gfortran specific stuff altogether.
@danielhollas danielhollas merged commit 9a58f6e into master Oct 1, 2021
@danielhollas danielhollas deleted the ifort-fixes branch October 1, 2021 17:29
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.

2 participants