Skip to content

Commit 3237f82

Browse files
Distinguish between PRECISE and PRECISION keywords
1 parent bfc5302 commit 3237f82

15 files changed

Lines changed: 19 additions & 19 deletions

File tree

src/MOZYME/scfcri.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ subroutine scfcri (selcon)
4545
!
4646
i = Index (keywrd, " TS") + Index (keywrd, " FORCETS") + Index (keywrd, " IRC=")
4747
if (i /= 0) scfcrt = 2.0d-3
48-
precis = (Index (keywrd, " PRECIS") /= 0)
48+
precis = (Index (keywrd, " PRECISE") /= 0)
4949
i = Index (keywrd, " RELSCF")
5050
if (i /= 0) then
5151
scfcrt = reada (keywrd, i) * scfcrt

src/forces/dcart.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ subroutine dcart(coord, dxyz)
9797
end if
9898
large = index(keywrd,'LARGE') /= 0
9999
debug = index(keywrd,'DERIV') + index(keywrd,'DCART') /= 0
100-
force = index(keywrd,'PREC') + index(keywrd,'FORCE') /= 0
100+
force = index(keywrd,'PRECISE') + index(keywrd,'FORCE') /= 0
101101
end if
102102
icuc = (l123 + 1)/2
103103
numtot = numat*l123

src/forces/deriv.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ subroutine deriv(geo, gradnt)
7575
saddle = index(keywrd, " SADDLE") /= 0
7676
debug = index(keywrd,' DERIV') /= 0
7777
field = index(keywrd,' FIELD') /= 0
78-
precis = index(keywrd,' PREC') /= 0
78+
precis = index(keywrd,' PRECISE') /= 0
7979
DH_correction = (index(keywrd,' PM6-D') + index(keywrd,' PM6-H') /= 0 .or. &
8080
method_PM7 .or. method_pm6_org .or. method_pm8 )
8181
intn = index(keywrd,' XYZ') == 0

src/forces/dernvo.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ subroutine dernvo()
127127
icalcn = numcal
128128
debug = index(keywrd,'DERNVO') /= 0
129129
large = index(keywrd,'LARGE') /= 0
130-
dcar = index(keywrd,'FORC') + index(keywrd,'PREC') /= 0
130+
dcar = index(keywrd,'FORC') + index(keywrd,'PRECISE') /= 0
131131
nvax = 3*numat
132132
end if
133133
dxyzr(:nvax) = 0.D0

src/forces/fmat.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ subroutine fmat(fmatrx, nreal, tscf, tder, deldip, heat, evecs, ts)
8989
if (index(keywrd,' CYCLES') /= 0 .and. index(keywrd, " IRC") == 0) &
9090
maxcyc = nint(reada(keywrd,index(keywrd,' CYCLES')))
9191
prnt = index(keywrd,'IRC=') == 0
92-
precis = index(keywrd,' PREC') /= 0
92+
precis = index(keywrd,' PRECISE') /= 0
9393
restrt = index(keywrd,'RESTART') /= 0
9494
if (index(keywrd,'NLLSQ') /= 0) restrt = .FALSE.
9595
debug = index(keywrd,'FMAT') /= 0

src/input/readmo.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1912,7 +1912,7 @@ subroutine geo_diff(sum, rms, prt)
19121912
!
19131913
! Calculate the average and RMS differences of two geometries
19141914
!
1915-
precise = (index(keywrd, " PREC") /= 0)
1915+
precise = (index(keywrd, " PRECISE") /= 0)
19161916
residue_motion = 0.d0
19171917
No_atoms_in_residue = 0
19181918
ires_l = 10000

src/input/wrtkey.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1859,7 +1859,7 @@ subroutine wrtwor (allkey)
18591859
if (myword(allkey, " OLDGEO")) write (iw,'(" * OLDGEO - PREVIOUS GEOMETRY TO BE USED")')
18601860
if (myword(allkey, " OLDFPC")) write (iw,'(" * OLDFPC - OLD FUNDAMENTAL PHYSICAL CONSTANTS TO BE USED")')
18611861
if (myword(allkey, " OLD_HESS")) write (iw,'(" * OLD_HESS - USE THE OLD HESSIAN MATRIX")')
1862-
if (myword(allkey, " PREC")) write (iw,'(" * PRECISE - TIGHTER CRITERIA TO BE USED")')
1862+
if (myword(allkey, " PRECISE")) write (iw,'(" * PRECISE - TIGHTER CRITERIA TO BE USED")')
18631863
if (myword(allkey, " NOANCI")) write (iw,'(" * NOANCI - DO NOT USE ANALYTICAL C.I. DERIVATIVES")')
18641864
if (myword(allkey, " DFP")) write (iw,'(" * DFP - USE DAVIDON FLETCHER POWELL OPTIMIZER")')
18651865
if (myword(allkey, " XYZ")) write (iw,'(" * XYZ - CARTESIAN COORDINATE SYSTEM TO BE USED")')

src/optimization/ef.F90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1019,7 +1019,7 @@ subroutine efstr (xparam, funct, ihess, ntime, iloop, igthes, mxstep, ireclc, &
10191019
end if
10201020
tol2 = 1.d+0
10211021
if (id /= 0) tol2 = id*2.d0 - 1.d0
1022-
if (Index (keywrd, " PREC") /= 0) tol2 = tol2*5.d-2
1022+
if (Index (keywrd, " PRECISE") /= 0) tol2 = tol2*5.d-2
10231023
i = Index (keywrd, " GNORM=")
10241024
if (i /= 0) then
10251025
tol2 = reada (keywrd, i)

src/optimization/flepo.F90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ subroutine flepo(xparam, nvar, funct1)
183183
! ORDER OF PRECISION: 'GNORM' TAKES PRECEDENCE OVER 'FORCE', WHICH
184184
! TAKES PRECEDENCE OVER 'PRECISE'.
185185
tolerg = 1.0D0
186-
if (index(keywrd,'PREC') /= 0) tolerg = 0.2D0
186+
if (index(keywrd,'PRECISE') /= 0) tolerg = 0.2D0
187187
if (index(keywrd,'FORCE') /= 0) tolerg = 0.1D0
188188
!
189189
! READ IN THE GRADIENT-NORM LIMIT, IF SPECIFIED
@@ -203,7 +203,7 @@ subroutine flepo(xparam, nvar, funct1)
203203
delhof = 0.0010D0*const
204204
tolerf = 0.002D0*const
205205
tolrg = tolerg
206-
if (index(keywrd,'PREC') /= 0) then
206+
if (index(keywrd,'PRECISE') /= 0) then
207207
tolerx = tolerx*0.01D0
208208
delhof = delhof*0.01D0
209209
tolerf = tolerf*0.01D0
@@ -741,7 +741,7 @@ subroutine flepo(xparam, nvar, funct1)
741741
' DURING THESE ATTEMPTS THE ENERGY DROPPED',' BY LESS THAN',f4.1,&
742742
' KCAL/MOLE',/,10x,&
743743
' FURTHER CALCULATION IS NOT JUSTIFIED AT THIS TIME.')
744-
if (index(keywrd,'PREC') == 0) write (iw, 390)
744+
if (index(keywrd,'PRECISE') == 0) write (iw, 390)
745745
390 format(10x,' TO CONTINUE, START AGAIN WITH THE WORD "PRECISE"')
746746
last = 1
747747
call compfg (xparam, .TRUE., funct1, .TRUE., grad, .FALSE.)

src/optimization/lbfgs.F90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ subroutine lbfgs (xparam, escf)
8787
if (Index (keywrd, " CYCLES") /= 0) then
8888
maxcyc = Nint (reada (keywrd, Index (keywrd, " CYCLES")))
8989
end if
90-
if (index(keywrd, " LET") + index(keywrd, " PREC") /= 0) then
90+
if (index(keywrd, " LET") + index(keywrd, " PRECISE") /= 0) then
9191
if (index(keywrd, " LET(") /= 0) then
9292
max_bad = Nint (reada (keywrd, Index (keywrd, " LET(")))
9393
write(iw,'(/10x,a,i4)') &
@@ -107,7 +107,7 @@ subroutine lbfgs (xparam, escf)
107107
else
108108
tolerg = 1.d0
109109
if (id /= 0) tolerg = id*2.d0 - 1.d0
110-
if (Index (keywrd, " PREC") /= 0) then
110+
if (Index (keywrd, " PRECISE") /= 0) then
111111
tolerg = tolerg*0.2d0
112112
end if
113113
end if

0 commit comments

Comments
 (0)