Skip to content

Commit 6be1e8e

Browse files
Merge pull request #118 from SSCHAcode/fix_fortran_compiler
Bugfix for the ASR using the new fortran compiler
2 parents 4a3bb93 + 4228fd4 commit 6be1e8e

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

FModules/second_order_ASR.f90

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -301,20 +301,20 @@ subroutine impose_ASR(FC,R2,pow,SClat,PBC,threshold,maxite,FC_out,verbose,nat,n_
301301

302302
do while (iter < maxite)
303303

304-
if (verbose) write(*,"(' Iter #' I5 ' ====')") ite
304+
if (verbose) write(*,"(' Iter #', I5, ' ====')") ite
305305
if (verbose) write(*,*) ""
306306
call impose_ASR_2nd(FC_tmp,pow,SClat,PBC,.false.,FCvar,sum2nd,FC_out ,nat,n_blocks)
307-
if (verbose) write(*,"(' Sum on 2nd=' e20.6 ' Imp. ASR on 2nd: => delta FC=' e20.6)") sum2nd,FCvar
307+
if (verbose) write(*,"(' Sum on 2nd=', e20.6, ' Imp. ASR on 2nd: => delta FC=' e20.6)") sum2nd,FCvar
308308
call impose_perm_sym(FC_out, R2, SClat,PBC,.false.,FCvar,FC_tmp,nat,n_blocks)
309-
if (verbose) write(*,"(' ' 20X ' Imp. permut sym: => delta FC=' e20.6)") FCvar
309+
if (verbose) write(*,"(' ', 20X, ' Imp. permut sym: => delta FC=' e20.6)") FCvar
310310
if (verbose) write(*,*) ""
311311

312312
! check converg
313313
if ( sum2nd < threshold .and. FCvar < threshold ) then
314314
write(*,*) " "
315-
write(*,"( ' * Convergence reached within threshold:' e20.6 )") threshold
315+
write(*,"( ' * Convergence reached within threshold:', e20.6 )") threshold
316316
write(*,*) " "
317-
write(*,"( ' * Total FC relative variation:' e20.6 )") SUM(ABS(FC-FC_out))/ SUM(ABS(FC))
317+
write(*,"( ' * Total FC relative variation:', e20.6 )") SUM(ABS(FC-FC_out))/ SUM(ABS(FC))
318318
converged = .True.
319319
EXIT
320320
end if

meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project('CellConstructor',
22
['c','fortran'],
3-
version: '1.5.0',
3+
version: '1.5.1',
44
license: 'GPL',
55
meson_version: '>= 1.1.0', # <- set min version of meson.
66
default_options : [

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ build-backend = "mesonpy"
1111
[project]
1212
# Project metadata, which was previously in the `setup()` call of setup.py.
1313
name = "CellConstructor"
14-
version = "1.5.0" # Make sure this version matches meson.build
14+
version = "1.5.1" # Make sure this version matches meson.build
1515
description = "Python utilities interfaced with ASE for atomic crystal analysis"
1616
authors = [{name = "Lorenzo Monacelli"}]
1717
readme = "README.md"

0 commit comments

Comments
 (0)