Skip to content

Commit 92600ed

Browse files
committed
Merge branch 'development' into 'main'
Development See merge request hepplestone/artemis!12
2 parents eb453f1 + e4483ab commit 92600ed

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/interfaces.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1502,7 +1502,7 @@ subroutine output_intf_data(SAV, ifit, lw_term, ilw_term, up_term, iup_term, lw_
15021502
SAV%tf1(ifit,2,1:3),SAV%tf2(ifit,2,1:3),&
15031503
SAV%tf1(ifit,3,1:3),SAV%tf2(ifit,3,1:3)
15041504
write(unit,'(" vector mismatch (%) = ",F0.9)') SAV%tol(ifit,1)
1505-
write(unit,'(" angle mismatch (°) = ",F0.9)') SAV%tol(ifit,2)
1505+
write(unit,'(" angle mismatch (°) = ",F0.9)') SAV%tol(ifit,2)*180/pi
15061506
write(unit,'(" area mismatch (%) = ",F0.9)') SAV%tol(ifit,3)
15071507
write(unit,*)
15081508
write(unit,'(" Lower crystal Miller plane: ",3(I3," "))') SAV%tf1(ifit,3,1:3)

src/mod_lat_compare.f90

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -887,7 +887,7 @@ subroutine endcode(SAV)
887887
SAV%tf1(1,2,1:3),SAV%tf2(1,2,1:3),&
888888
SAV%tf1(1,3,1:3),SAV%tf2(1,3,1:3)
889889
write(6,'(" vector mismatch (%) = ",F0.9)') SAV%tol(1,1)
890-
write(6,'(" angle mismatch (°) = ",F0.9)') SAV%tol(1,2)
890+
write(6,'(" angle mismatch (°) = ",F0.9)') SAV%tol(1,2)*180/pi
891891
write(6,'(" area mismatch (%) = ",F0.9)') SAV%tol(1,3)
892892
write(6,*)
893893

@@ -1380,7 +1380,7 @@ subroutine lattice_matching(SAV,tol,bas1,bas2,plane1,plane2,nmiller,lprint)
13801380
SAV%tf1(i,2,1:3),SAV%tf2(i,2,1:3),&
13811381
SAV%tf1(i,3,1:3),SAV%tf2(i,3,1:3)
13821382
write(6,'(" vector mismatch (%) = ",F0.9)') SAV%tol(i,1)
1383-
write(6,'(" angle mismatch (°) = ",F0.9)') SAV%tol(i,2)
1383+
write(6,'(" angle mismatch (°) = ",F0.9)') SAV%tol(i,2)*180/pi
13841384
write(6,'(" area mismatch (%) = ",F0.9)') SAV%tol(i,3)
13851385
write(6,*) "reduced:",lvec1(i)
13861386
write(6,*)

0 commit comments

Comments
 (0)