From a143964acfe57ee589650b8e7838a24ee27fa72a Mon Sep 17 00:00:00 2001 From: Jarvist Moore Frost Date: Wed, 10 Oct 2018 20:26:11 +0100 Subject: [PATCH] Should fix (self-inflicted) brokeness on Julia 1.0 --- REQUIRE | 2 +- src/PolaronMobility.jl | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/REQUIRE b/REQUIRE index d6f76c74..b42f08b8 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,4 +1,4 @@ julia 0.6 QuadGK -Optim 0.15- +Optim 0.15 diff --git a/src/PolaronMobility.jl b/src/PolaronMobility.jl index 01b01c56..28f4adc6 100644 --- a/src/PolaronMobility.jl +++ b/src/PolaronMobility.jl @@ -12,8 +12,10 @@ export ImX ##### load in library routines... ##### # stdlib -using LinearAlgebra -using Printf +if VERSION > v"0.7.0-DEV.2005" + using LinearAlgebra + using Printf +end # one-dimensional numerical integration in Julia using adaptive Gauss-Kronrod quadrature import QuadGK.quadgk @@ -27,12 +29,12 @@ const me=MassElectron = 9.10938188e-31; # kg const Boltzmann = const kB = 1.3806504e-23; # kg m2 / K s2 const ε_0 = 8.854E-12 #Units: C2N−1m−2, permittivity of free space -include("types.jl") # Polaron type -include("FeynmanTheory.jl") # Actions + variational functions -include("HellwarthTheory.jl") # multimode -> equivalent mode. +include("types.jl") # Polaron types +include("FeynmanTheory.jl") # Actions + variational functions +include("HellwarthTheory.jl") # multimode -> equivalent mode. include("MobilityTheories.jl") # Main polaronmobility function -include("Susceptibility.jl") # ImX calculation -include("OedipusRex.jl") # Optical Absorption +include("Susceptibility.jl") # ImX calculation +include("OedipusRex.jl") # Optical Absorption end # module