Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions FModules/second_order_ASR.f90
Original file line number Diff line number Diff line change
Expand Up @@ -301,20 +301,20 @@ subroutine impose_ASR(FC,R2,pow,SClat,PBC,threshold,maxite,FC_out,verbose,nat,n_

do while (iter < maxite)

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

! check converg
if ( sum2nd < threshold .and. FCvar < threshold ) then
write(*,*) " "
write(*,"( ' * Convergence reached within threshold:' e20.6 )") threshold
write(*,"( ' * Convergence reached within threshold:', e20.6 )") threshold
write(*,*) " "
write(*,"( ' * Total FC relative variation:' e20.6 )") SUM(ABS(FC-FC_out))/ SUM(ABS(FC))
write(*,"( ' * Total FC relative variation:', e20.6 )") SUM(ABS(FC-FC_out))/ SUM(ABS(FC))
converged = .True.
EXIT
end if
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
project('CellConstructor',
['c','fortran'],
version: '1.5.0',
version: '1.5.1',
license: 'GPL',
meson_version: '>= 1.1.0', # <- set min version of meson.
default_options : [
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ build-backend = "mesonpy"
[project]
# Project metadata, which was previously in the `setup()` call of setup.py.
name = "CellConstructor"
version = "1.5.0" # Make sure this version matches meson.build
version = "1.5.1" # Make sure this version matches meson.build
description = "Python utilities interfaced with ASE for atomic crystal analysis"
authors = [{name = "Lorenzo Monacelli"}]
readme = "README.md"
Expand Down