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
8 changes: 4 additions & 4 deletions src/dforce.f90
Original file line number Diff line number Diff line change
Expand Up @@ -571,11 +571,11 @@ subroutine dforce( NGdof, position, force, LComputeDerivatives, LComputeAxis)
if( Wdforce .and. myid.eq.0 ) then

cput = GETTIME
; ; write(ounit,4000) cput-cpus, ForceErr, cput-cpuo, "|BB|e", alog10(BBe(1:min(Mvol-1,28)))
if( Igeometry.ge.3 ) write(ounit,4001) "|II|o", alog10(IIo(1:min(Mvol-1,28)))
; ; write(ounit,4000) cput-cpus, ForceErr, cput-cpuo, "|BB|e", log10(BBe(1:min(Mvol-1,28)))
if( Igeometry.ge.3 ) write(ounit,4001) "|II|o", log10(IIo(1:min(Mvol-1,28)))
if( NOTstellsym ) then
; ; write(ounit,4001) "|BB|o", alog10(BBo(1:min(Mvol-1,28)))
if( Igeometry.ge.3 ) write(ounit,4001) "|II|e", alog10(IIe(1:min(Mvol-1,28)))
; ; write(ounit,4001) "|BB|o", log10(BBo(1:min(Mvol-1,28)))
if( Igeometry.ge.3 ) write(ounit,4001) "|II|e", log10(IIe(1:min(Mvol-1,28)))
endif

endif ! end of if( Wdforce .and. myid.eq.0 ) ;
Expand Down
2 changes: 1 addition & 1 deletion src/global.f90
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ module numerical
REAL, parameter :: vsmall = 100*machprec !< very small number
REAL, parameter :: small = 10000*machprec !< small number
REAL, parameter :: sqrtmachprec = sqrt(machprec) !< square root of machine precision
REAL, parameter :: logtolerance = 1.0e-32 !< this is used to avoid taking alog10(zero); see e.g. dforce;
REAL, parameter :: logtolerance = 1.0e-32 !< this is used to avoid taking log10(zero); see e.g. dforce;

end module numerical

Expand Down
24 changes: 12 additions & 12 deletions src/newton.f90
Original file line number Diff line number Diff line change
Expand Up @@ -151,14 +151,14 @@ subroutine newton( NGdof, position, ihybrd )

if( myid.eq.0 ) then ! screen output;
cput = GETTIME
; write(ounit,1000) cput-cpus, nFcalls, nDcalls, ForceErr, cput-lastcpu, "|BB|e", alog10(BBe(1:min(Mvol-1,28)))
; write(ounit,1000) cput-cpus, nFcalls, nDcalls, ForceErr, cput-lastcpu, "|BB|e", log10(BBe(1:min(Mvol-1,28)))
if( Igeometry.ge.3 ) then ! include spectral constraints;
;write(ounit,1001) "|II|o", alog10(IIo(1:min(Mvol-1,28)))
;write(ounit,1001) "|II|o", log10(IIo(1:min(Mvol-1,28)))
endif
if( NOTstellsym ) then
;write(ounit,1001) "|BB|o", alog10(BBo(1:min(Mvol-1,28)))
;write(ounit,1001) "|BB|o", log10(BBo(1:min(Mvol-1,28)))
if( Igeometry.ge.3 ) then ! include spectral constraints;
write(ounit,1001) "|II|e", alog10(IIe(1:min(Mvol-1,28)))
write(ounit,1001) "|II|e", log10(IIe(1:min(Mvol-1,28)))
endif
endif
endif
Expand Down Expand Up @@ -492,14 +492,14 @@ subroutine fcn1( NGdof, xx, fvec, irevcm )

cput = GETTIME

; write(ounit,1000) cput-cpus, nFcalls, nDcalls, ForceErr, cput-lastcpu, "|BB|e", alog10(BBe(1:min(Mvol-1,28)))
; write(ounit,1000) cput-cpus, nFcalls, nDcalls, ForceErr, cput-lastcpu, "|BB|e", log10(BBe(1:min(Mvol-1,28)))
if( Igeometry.ge.3 ) then ! include spectral constraints;
;write(ounit,1001) "|II|o", alog10(IIo(1:min(Mvol-1,28)))
;write(ounit,1001) "|II|o", log10(IIo(1:min(Mvol-1,28)))
endif
if( NOTstellsym ) then
;write(ounit,1001) "|BB|o", alog10(BBo(1:min(Mvol-1,28)))
;write(ounit,1001) "|BB|o", log10(BBo(1:min(Mvol-1,28)))
if( Igeometry.ge.3 ) then ! include spectral constraints;
write(ounit,1001) "|II|e", alog10(IIe(1:min(Mvol-1,28)))
write(ounit,1001) "|II|e", log10(IIe(1:min(Mvol-1,28)))
endif
endif
lastcpu = GETTIME
Expand Down Expand Up @@ -625,14 +625,14 @@ subroutine fcn2( NGdof, xx, fvec, fjac, Ldfjac, irevcm )

cput = GETTIME

; write(ounit,1000) cput-cpus, nFcalls, nDcalls, ForceErr, cput-lastcpu, "|BB|e", alog10(BBe(1:min(Mvol-1,28)))
; write(ounit,1000) cput-cpus, nFcalls, nDcalls, ForceErr, cput-lastcpu, "|BB|e", log10(BBe(1:min(Mvol-1,28)))
if( Igeometry.ge.3 ) then ! include spectral constraints;
;write(ounit,1001) "|II|o", alog10(IIo(1:min(Mvol-1,28)))
;write(ounit,1001) "|II|o", log10(IIo(1:min(Mvol-1,28)))
endif
if( NOTstellsym ) then
;write(ounit,1001) "|BB|o", alog10(BBo(1:min(Mvol-1,28)))
;write(ounit,1001) "|BB|o", log10(BBo(1:min(Mvol-1,28)))
if( Igeometry.ge.3 ) then ! include spectral constraints;
write(ounit,1001) "|II|e", alog10(IIe(1:min(Mvol-1,28)))
write(ounit,1001) "|II|e", log10(IIe(1:min(Mvol-1,28)))
endif
endif
lastcpu = GETTIME
Expand Down
16 changes: 8 additions & 8 deletions src/xspech.f90
Original file line number Diff line number Diff line change
Expand Up @@ -541,14 +541,14 @@ subroutine spec

if( myid.eq.0 ) then
cput = GETTIME
write(ounit,1000) cput-cpus, nfreeboundaryiterations, ForceErr, cput-lastcpu, "|BB|e", alog10(BBe(1:min(Mvol-1,28)))
write(ounit,1000) cput-cpus, nfreeboundaryiterations, ForceErr, cput-lastcpu, "|BB|e", log10(BBe(1:min(Mvol-1,28)))
if( Igeometry.ge.3 ) then ! include spectral constraints; 04 Dec 14;
write(ounit,1001) "|II|o", alog10(IIo(1:min(Mvol-1,28)))
write(ounit,1001) "|II|o", log10(IIo(1:min(Mvol-1,28)))
endif
if( NOTstellsym ) then
write(ounit,1001) "|BB|o", alog10(BBo(1:min(Mvol-1,28)))
write(ounit,1001) "|BB|o", log10(BBo(1:min(Mvol-1,28)))
if( Igeometry.ge.3 ) then ! include spectral constraints; 04 Dec 14;
write(ounit,1001) "|II|e", alog10(IIe(1:min(Mvol-1,28)))
write(ounit,1001) "|II|e", log10(IIe(1:min(Mvol-1,28)))
endif
endif
endif
Expand Down Expand Up @@ -847,14 +847,14 @@ subroutine final_diagnostics
!
! if( myid.eq.0 ) then
! cput = GETTIME
! write(ounit,1000) cput-cpus, nfreeboundaryiterations, ForceErr, cput-lastcpu, "|BB|e", alog10(BBe(1:min(Mvol-1,28)))
! write(ounit,1000) cput-cpus, nfreeboundaryiterations, ForceErr, cput-lastcpu, "|BB|e", log10(BBe(1:min(Mvol-1,28)))
! if( Igeometry.ge.3 ) then ! include spectral constraints; 04 Dec 14;
! write(ounit,1001) "|II|o", alog10(IIo(1:min(Mvol-1,28)))
! write(ounit,1001) "|II|o", log10(IIo(1:min(Mvol-1,28)))
! endif
! if( NOTstellsym ) then
! write(ounit,1001) "|BB|o", alog10(BBo(1:min(Mvol-1,28)))
! write(ounit,1001) "|BB|o", log10(BBo(1:min(Mvol-1,28)))
! if( Igeometry.ge.3 ) then ! include spectral constraints; 04 Dec 14;
! write(ounit,1001) "|II|e", alog10(IIe(1:min(Mvol-1,28)))
! write(ounit,1001) "|II|e", log10(IIe(1:min(Mvol-1,28)))
! endif
! endif
! endif
Expand Down