diff --git a/src/dforce.f90 b/src/dforce.f90 index 3228b0a3..3c110cd0 100644 --- a/src/dforce.f90 +++ b/src/dforce.f90 @@ -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 ) ; diff --git a/src/global.f90 b/src/global.f90 index 72f73cc3..3f359850 100644 --- a/src/global.f90 +++ b/src/global.f90 @@ -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 diff --git a/src/newton.f90 b/src/newton.f90 index cd79da3b..123e60a0 100644 --- a/src/newton.f90 +++ b/src/newton.f90 @@ -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 @@ -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 @@ -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 diff --git a/src/xspech.f90 b/src/xspech.f90 index 09711395..03b3a9e2 100644 --- a/src/xspech.f90 +++ b/src/xspech.f90 @@ -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 @@ -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