Skip to content

Conversation

cnegre
Copy link
Collaborator

@cnegre cnegre commented Mar 1, 2019

Changes for xlf IBM compiler compatibility.


This change is Reviewable

@cnegre cnegre requested review from nicolasbock and suemni March 1, 2019 17:24
@ghost ghost assigned cnegre Mar 1, 2019
@ghost ghost added the in progress label Mar 1, 2019
@codecov
Copy link

codecov bot commented Mar 1, 2019

Codecov Report

Merging #128 into master will decrease coverage by 0.01%.
The diff coverage is 36.48%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #128      +/-   ##
==========================================
- Coverage   40.71%   40.69%   -0.02%     
==========================================
  Files          62       62              
  Lines       11717    11743      +26     
  Branches     1293     1313      +20     
==========================================
+ Hits         4770     4779       +9     
- Misses       6425     6437      +12     
- Partials      522      527       +5
Impacted Files Coverage Δ
src/prg_normalize_mod.F90 63.15% <ø> (ø) ⬆️
src/prg_sp2_mod.F90 82.84% <0%> (-0.25%) ⬇️
src/prg_genz_mod.F90 58.41% <0%> (-0.38%) ⬇️
src/latte_mods/tbparams_latte_mod.F90 94.95% <100%> (+0.02%) ⬆️
src/prg_densitymatrix_mod.F90 64.59% <100%> (+0.17%) ⬆️
src/prg_chebyshev_mod.F90 36.31% <100%> (+0.53%) ⬆️
src/prg_homolumo_mod.F90 80.35% <25%> (-2.34%) ⬇️
src/prg_system_mod.F90 41.71% <25%> (-0.37%) ⬇️
src/prg_sp2_fermi_mod.F90 72.35% <33.33%> (-0.6%) ⬇️
tests/src/main.F90 82.49% <85.71%> (+0.06%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e8636ad...e8f58eb. Read the comment docs.

type(bml_matrix_t),intent(inout) :: h_bml

real(dp) :: beta, maxMinusMin
real(dp), intent(in) :: mu, emin, emax
real(dp), intent(inout) :: scaledmu, alpha

stop
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is that a left over debug statement, or do you want to leave it here?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Good catch Nick, thanks!

@@ -895,7 +896,7 @@ program main
case("prg_system_parse_write_xyz")
call prg_parse_system(mol,"coords_100","xyz")
call prg_write_system(mol, "mysystem","xyz")
call system("diff -qs mysystem.xyz coords_100.xyz > tmp.tmp")
call system("diff -qs --ignore-space-change mysystem.xyz coords_100.xyz > tmp.tmp")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Alternatively, you could use --ignore-all-space which also includes changes in trailing whitespace.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I'll make that change, thanks!

@cnegre cnegre requested a review from nicolasbock March 5, 2019 18:24
Copy link
Collaborator

@nicolasbock nicolasbock left a comment

Choose a reason for hiding this comment

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

For performance it's better to do only one system call instead of two.

@@ -934,7 +935,8 @@ program main
!> Loading the tb parameters (electrons.dat)
call load_latteTBparams(tbparams,mol%splist,"./")
call write_latteTBparams(tbparams,"myelectrons.dat")
call system("diff -qs myelectrons.dat electrons.dat > tmp.tmp")
call system("diff -qs --ignore-all-space myelectrons.dat electrons.dat > tmp.tmp")
call system("diff --ignore-all-space myelectrons.dat electrons.dat")
Copy link
Collaborator

Choose a reason for hiding this comment

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

If you would like to print the diff and write it to file you can do this in one line with

call system("diff --report-identical-files --ignore-all-space myelectrons.dat electrons.dat | tee tmp.tmp")

Copy link
Collaborator

Choose a reason for hiding this comment

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

I have expanded the -s option to --report-identical-files which I personally find more readable. But that's not necessary for the above to work.

@cnegre cnegre requested a review from nicolasbock March 6, 2019 18:51
Copy link
Collaborator

@nicolasbock nicolasbock left a comment

Choose a reason for hiding this comment

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

Perfect, thanks! 👍

@cnegre cnegre merged commit ea456f4 into master Mar 7, 2019
@ghost ghost removed the in progress label Mar 7, 2019
@cnegre cnegre deleted the fixed-xlf branch June 16, 2021 04:18
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.

3 participants