Skip to content

Commit

Permalink
Merge pull request #2 from braamvandyk/v0.2
Browse files Browse the repository at this point in the history 
V0.2
  • Loading branch information
@braamvandyk
braamvandyk committed Aug 12, 2018
2 parents 2bd660c + 64250c5 commit e661098
Show file tree
Hide file tree
Showing 11 changed files with 77 additions and 86 deletions.
12 changes: 6 additions & 6 deletions src/SteamTables.jl
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
__precompile__()

"""
#SteamTables
# SteamTables
IAPWS-97 Industrial Formulation Properties of water and steam.
Provides the Gibbs and Helmholtz free energies, enthalpy, entropy Cp, Cv and sonic velocity given inputs that are eith P&T, P&h or P&s.
##Exported functions:
## Exported functions:
###Single input:
### Single input:
Psat(T) and Tsat(P) returns the saturation linearindices
###Two inputs:
### Two inputs:
P and T
SpecificG, SpecificF, SpecificV, SpecificU, SpecificS,
Expand Down Expand Up @@ -61,8 +61,8 @@ const Mr = 18.01528 #kg/kmol Molecular weight of water

export Psat, Tsat,
SpecificG, SpecificF, SpecificV, SpecificU, SpecificS, SpecificH, SpecificCP, SpecificCV, SpeedOfSound,
SpecificG_Ph, SpecificF_Ph, SpecificV_Ph, SpecificU_Ph, SpecificS_Ph, SpecificH_Ph, SpecificCP_Ph, SpecificCV_Ph, SpeedOfSound_Ph,
SpecificG_Ps, SpecificF_Ps, SpecificV_Ps, SpecificU_Ps, SpecificS_Ps, SpecificH_Ps, SpecificCP_Ps, SpecificCV_Ps, SpeedOfSound_Ps,
SpecificG_Ph, SpecificF_Ph, SpecificV_Ph, SpecificU_Ph, SpecificS_Ph, SpecificCP_Ph, SpecificCV_Ph, SpeedOfSound_Ph,
SpecificG_Ps, SpecificF_Ps, SpecificV_Ps, SpecificU_Ps, SpecificH_Ps, SpecificCP_Ps, SpecificCV_Ps, SpeedOfSound_Ps,
R, Tc, Pc, ρc, T3, P3, Mr

using Roots
Expand Down
51 changes: 21 additions & 30 deletions test/runtests.jl
View file
Original file line number Diff line number Diff line change
@@ -1,63 +1,54 @@
using SteamTables
@static if VERSION < v"0.7.0-DEV.2005"
using Base.Test

mysignif(x, n) = signif(x, n)
else
using Test

mysignif(x, n) = round(x; sigdigits = n)
end

const TestDigits = 6 # number of significant digits to test selected functions to

println("Region 1, forwards equations for P and T")
include("testreg1.jl")
@testset "Region 1, forwards equations for P and T" begin include("testreg1.jl") end

println("Region 1, backwards equations for P and h")
# The free energies have lower consistency between the forward and backwards equations. Check to fewer significant digits.
include("testreg1Ph.jl")
@testset "Region 1, backwards equations for P and h" begin include("testreg1Ph.jl") end

println("Region 1, backwards equations for P and s")
# The free energies have lower consistency between the forward and backwards equations. Check to fewer significant digits.
include("testreg1Ps.jl")

println("Region 2, forwards equations for P and T")
include("testreg2.jl")

println("Region 2a, backwards equations for P and h")
# The free energies have lower consistency between the forward and backwards equations. Check to fewer significant digits.
include("testreg2aPh.jl")
@testset "Region 1, backwards equations for P and s" begin include("testreg1Ps.jl") end
@testset "Region 2, forwards equations for P and T" begin include("testreg2.jl") end

# The free energies have lower consistency between the forward and backwards equations. Check to fewer significant digits.
@testset "Region 2a, backwards equations for P and h" begin include("testreg2aPh.jl") end

println("Region 2b, backwards equations for P and h")
# The free energies have lower consistency between the forward and backwards equations. Check to fewer significant digits.
include("testreg2bPh.jl")
@testset "Region 2b, backwards equations for P and h" begin include("testreg2bPh.jl") end

println("Region 2c, backwards equations for P and h")
# The free energies have lower consistency between the forward and backwards equations. Check to fewer significant digits.
include("testreg2cPh.jl")
@testset "Region 2c, backwards equations for P and h" begin include("testreg2cPh.jl") end

println("Region 2a, backwards equations for P and s")
# The free energies have lower consistency between the forward and backwards equations. Check to fewer significant digits.
include("testreg2aPs.jl")
@testset "Region 2a, backwards equations for P and s" begin include("testreg2aPs.jl") end

println("Region 2b, backwards equations for P and s")
# The free energies have lower consistency between the forward and backwards equations. Check to fewer significant digits.
#@test signif(SpecificG(8.0, 0.600_484_040E3), TestDigits) ≈ signif(SpecificG_Ps(8.0, 6.0), TestDigits)
include("testreg2bPs.jl")
#@test mysignif(SpecificG(8.0, 0.600_484_040E3), TestDigits) ≈ mysignif(SpecificG_Ps(8.0, 6.0), TestDigits)
@testset "Region 2b, backwards equations for P and s" begin include("testreg2bPs.jl") end

println("Region 2c, backwards equations for P and s")
# The free energies have lower consistency between the forward and backwards equations. Check to fewer significant digits.
include("testreg2cPs.jl")
@testset "Region 2c, backwards equations for P and s" begin include("testreg2cPs.jl") end

println("Region 3, forwards equations for P and T")
# Region 3 is specified in terms of density rather than pressure. The utility functions fix this by solving
# for the pressure. This does introduce some small error, which means we should check to fewer significant digits.
# For consistency the checks here are done to the same number of digits as for the free energies, although the
# accuracy here will be better.
include("testreg3.jl")
@testset "Region 3, forwards equations for P and T" begin include("testreg3.jl") end

println("Region 4 - saturation pressure from temperature")
include("testreg4T.jl")
@testset "Region 4 - saturation pressure from temperature" begin include("testreg4T.jl") end

println("Region 4 - saturation temperature from pressure")
include("testreg4P.jl")
@testset "Region 4 - saturation temperature from pressure" begin include("testreg4P.jl") end

println("Region 5 - forwards equations for P and T")
include("testreg5.jl")
@testset "Region 5 - forwards equations for P and T" begin include("testreg5.jl") end
12 changes: 6 additions & 6 deletions test/testreg1Ph.jl
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@test signif(SpecificG(3.0, 0.391_798_509E3), TestDigits) ≈ signif(SpecificG_Ph(3.0, 500.0), TestDigits)
@test signif(SpecificG(80.0, 0.378_108_626E3), TestDigits) ≈ signif(SpecificG_Ph(80.0, 500.0), TestDigits)
@test signif(SpecificG(80.0, 0.611_041_229E3), TestDigits) ≈ signif(SpecificG_Ph(80.0, 1500.0), TestDigits)
@test signif(SpecificF(3.0, 0.391_798_509E3), TestDigits) ≈ signif(SpecificF_Ph(3.0, 500.0), TestDigits)
@test signif(SpecificF(80.0, 0.378_108_626E3), TestDigits) ≈ signif(SpecificF_Ph(80.0, 500.0), TestDigits)
@test signif(SpecificF(80.0, 0.611_041_229E3), TestDigits) ≈ signif(SpecificF_Ph(80.0, 1500.0), TestDigits)
@test mysignif(SpecificG(3.0, 0.391_798_509E3), TestDigits) ≈ mysignif(SpecificG_Ph(3.0, 500.0), TestDigits)
@test mysignif(SpecificG(80.0, 0.378_108_626E3), TestDigits) ≈ mysignif(SpecificG_Ph(80.0, 500.0), TestDigits)
@test mysignif(SpecificG(80.0, 0.611_041_229E3), TestDigits) ≈ mysignif(SpecificG_Ph(80.0, 1500.0), TestDigits)
@test mysignif(SpecificF(3.0, 0.391_798_509E3), TestDigits) ≈ mysignif(SpecificF_Ph(3.0, 500.0), TestDigits)
@test mysignif(SpecificF(80.0, 0.378_108_626E3), TestDigits) ≈ mysignif(SpecificF_Ph(80.0, 500.0), TestDigits)
@test mysignif(SpecificF(80.0, 0.611_041_229E3), TestDigits) ≈ mysignif(SpecificF_Ph(80.0, 1500.0), TestDigits)
@test SpecificV(3.0, 0.391_798_509E3) ≈ SpecificV_Ph(3.0, 500.0)
@test SpecificV(80.0, 0.378_108_626E3) ≈ SpecificV_Ph(80.0, 500.0)
@test SpecificV(80.0, 0.611_041_229E3) ≈ SpecificV_Ph(80.0, 1500.0)
Expand Down
12 changes: 6 additions & 6 deletions test/testreg1Ps.jl
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@test signif(SpecificG(3.0, 0.307_842_258E3), TestDigits) ≈ signif(SpecificG_Ps(3.0, 0.5), TestDigits)
@test signif(SpecificG(80.0, 0.309_979_785E3), TestDigits) ≈ signif(SpecificG_Ps(80.0, 0.5), TestDigits)
@test signif(SpecificG(80.0, 0.565_899_909E3), TestDigits) ≈ signif(SpecificG_Ps(80.0, 3.0), TestDigits)
@test signif(SpecificF(3.0, 0.307_842_258E3), TestDigits) ≈ signif(SpecificF_Ps(3.0, 0.5), TestDigits)
@test signif(SpecificF(80.0, 0.309_979_785E3), TestDigits) ≈ signif(SpecificF_Ps(80.0, 0.5), TestDigits)
@test signif(SpecificF(80.0, 0.565_899_909E3), TestDigits) ≈ signif(SpecificF_Ps(80.0, 3.0), TestDigits)
@test mysignif(SpecificG(3.0, 0.307_842_258E3), TestDigits) ≈ mysignif(SpecificG_Ps(3.0, 0.5), TestDigits)
@test mysignif(SpecificG(80.0, 0.309_979_785E3), TestDigits) ≈ mysignif(SpecificG_Ps(80.0, 0.5), TestDigits)
@test mysignif(SpecificG(80.0, 0.565_899_909E3), TestDigits) ≈ mysignif(SpecificG_Ps(80.0, 3.0), TestDigits)
@test mysignif(SpecificF(3.0, 0.307_842_258E3), TestDigits) ≈ mysignif(SpecificF_Ps(3.0, 0.5), TestDigits)
@test mysignif(SpecificF(80.0, 0.309_979_785E3), TestDigits) ≈ mysignif(SpecificF_Ps(80.0, 0.5), TestDigits)
@test mysignif(SpecificF(80.0, 0.565_899_909E3), TestDigits) ≈ mysignif(SpecificF_Ps(80.0, 3.0), TestDigits)
@test SpecificV(3.0, 0.307_842_258E3) ≈ SpecificV_Ps(3.0, 0.5)
@test SpecificV(80.0, 0.309_979_785E3) ≈ SpecificV_Ps(80.0, 0.5)
@test SpecificV(80.0, 0.565_899_909E3) ≈ SpecificV_Ps(80.0, 3.0)
Expand Down
12 changes: 6 additions & 6 deletions test/testreg2aPh.jl
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@test signif(SpecificG(0.001, 0.534_433_241E3), TestDigits) ≈ signif(SpecificG_Ph(0.001, 3000), TestDigits)
@test signif(SpecificG(3.0, 0.575_373_370E3), TestDigits) ≈ signif(SpecificG_Ph(3.0, 3000), TestDigits)
@test signif(SpecificG(3.0, 0.101_077_577E4), TestDigits) ≈ signif(SpecificG_Ph(3.0, 4000), TestDigits)
@test signif(SpecificF(0.001, 0.534_433_241E3), TestDigits) ≈ signif(SpecificF_Ph(0.001, 3000), TestDigits)
@test signif(SpecificF(3.0, 0.575_373_370E3), TestDigits) ≈ signif(SpecificF_Ph(3.0, 3000), TestDigits)
@test signif(SpecificF(3.0, 0.101_077_577E4), TestDigits) ≈ signif(SpecificF_Ph(3.0, 4000), TestDigits)
@test mysignif(SpecificG(0.001, 0.534_433_241E3), TestDigits) ≈ mysignif(SpecificG_Ph(0.001, 3000), TestDigits)
@test mysignif(SpecificG(3.0, 0.575_373_370E3), TestDigits) ≈ mysignif(SpecificG_Ph(3.0, 3000), TestDigits)
@test mysignif(SpecificG(3.0, 0.101_077_577E4), TestDigits) ≈ mysignif(SpecificG_Ph(3.0, 4000), TestDigits)
@test mysignif(SpecificF(0.001, 0.534_433_241E3), TestDigits) ≈ mysignif(SpecificF_Ph(0.001, 3000), TestDigits)
@test mysignif(SpecificF(3.0, 0.575_373_370E3), TestDigits) ≈ mysignif(SpecificF_Ph(3.0, 3000), TestDigits)
@test mysignif(SpecificF(3.0, 0.101_077_577E4), TestDigits) ≈ mysignif(SpecificF_Ph(3.0, 4000), TestDigits)
@test SpecificV(0.001, 0.534_433_241E3) ≈ SpecificV_Ph(0.001, 3000)
@test SpecificV(3.0, 0.575_373_370E3) ≈ SpecificV_Ph(3.0, 3000)
@test SpecificV(3.0, 0.101_077_577E4) ≈ SpecificV_Ph(3.0, 4000)
Expand Down
12 changes: 6 additions & 6 deletions test/testreg2aPs.jl
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@test signif(SpecificG(0.1, 0.399_517_097E3), TestDigits) ≈ signif(SpecificG_Ps(0.1, 7.5), TestDigits)
@test signif(SpecificG(0.1, 0.514_127_081E3), TestDigits) ≈ signif(SpecificG_Ps(0.1, 8.0), TestDigits)
@test signif(SpecificG(2.5, 0.103_984_917E4), TestDigits) ≈ signif(SpecificG_Ps(2.5, 8.0), TestDigits)
@test signif(SpecificF(0.1, 0.399_517_097E3), TestDigits) ≈ signif(SpecificF_Ps(0.1, 7.5), TestDigits)
@test signif(SpecificF(0.1, 0.514_127_081E3), TestDigits) ≈ signif(SpecificF_Ps(0.1, 8.0), TestDigits)
@test signif(SpecificF(2.5, 0.103_984_917E4), TestDigits) ≈ signif(SpecificF_Ps(2.5, 8.0), TestDigits)
@test mysignif(SpecificG(0.1, 0.399_517_097E3), TestDigits) ≈ mysignif(SpecificG_Ps(0.1, 7.5), TestDigits)
@test mysignif(SpecificG(0.1, 0.514_127_081E3), TestDigits) ≈ mysignif(SpecificG_Ps(0.1, 8.0), TestDigits)
@test mysignif(SpecificG(2.5, 0.103_984_917E4), TestDigits) ≈ mysignif(SpecificG_Ps(2.5, 8.0), TestDigits)
@test mysignif(SpecificF(0.1, 0.399_517_097E3), TestDigits) ≈ mysignif(SpecificF_Ps(0.1, 7.5), TestDigits)
@test mysignif(SpecificF(0.1, 0.514_127_081E3), TestDigits) ≈ mysignif(SpecificF_Ps(0.1, 8.0), TestDigits)
@test mysignif(SpecificF(2.5, 0.103_984_917E4), TestDigits) ≈ mysignif(SpecificF_Ps(2.5, 8.0), TestDigits)
@test SpecificV(0.1, 0.399_517_097E3) ≈ SpecificV_Ps(0.1, 7.5)
@test SpecificV(0.1, 0.514_127_081E3) ≈ SpecificV_Ps(0.1, 8.0)
@test SpecificV(2.5, 0.103_984_917E4) ≈ SpecificV_Ps(2.5, 8.0)
Expand Down
12 changes: 6 additions & 6 deletions test/testreg2bPh.jl
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@test signif(SpecificG(5.0, 0.801_299_102E3), TestDigits) ≈ signif(SpecificG_Ph(5.0, 3500), TestDigits)
@test signif(SpecificG(5.0, 0.101_531_583E4), TestDigits) ≈ signif(SpecificG_Ph(5.0, 4000), TestDigits)
@test signif(SpecificG(25.0, 0.875_279_054E3), TestDigits) ≈ signif(SpecificG_Ph(25.0, 3500), TestDigits)
@test signif(SpecificF(5.0, 0.801_299_102E3), TestDigits) ≈ signif(SpecificF_Ph(5.0, 3500), TestDigits)
@test signif(SpecificF(5.0, 0.101_531_583E4), TestDigits) ≈ signif(SpecificF_Ph(5.0, 4000), TestDigits)
@test signif(SpecificF(25.0, 0.875_279_054E3), TestDigits) ≈ signif(SpecificF_Ph(25.0, 3500), TestDigits)
@test mysignif(SpecificG(5.0, 0.801_299_102E3), TestDigits) ≈ mysignif(SpecificG_Ph(5.0, 3500), TestDigits)
@test mysignif(SpecificG(5.0, 0.101_531_583E4), TestDigits) ≈ mysignif(SpecificG_Ph(5.0, 4000), TestDigits)
@test mysignif(SpecificG(25.0, 0.875_279_054E3), TestDigits) ≈ mysignif(SpecificG_Ph(25.0, 3500), TestDigits)
@test mysignif(SpecificF(5.0, 0.801_299_102E3), TestDigits) ≈ mysignif(SpecificF_Ph(5.0, 3500), TestDigits)
@test mysignif(SpecificF(5.0, 0.101_531_583E4), TestDigits) ≈ mysignif(SpecificF_Ph(5.0, 4000), TestDigits)
@test mysignif(SpecificF(25.0, 0.875_279_054E3), TestDigits) ≈ mysignif(SpecificF_Ph(25.0, 3500), TestDigits)
@test SpecificV(5.0, 0.801_299_102E3) ≈ SpecificV_Ph(5.0, 3500)
@test SpecificV(5.0, 0.101_531_583E4) ≈ SpecificV_Ph(5.0, 4000)
@test SpecificV(25.0, 0.875_279_054E3) ≈ SpecificV_Ph(25.0, 3500)
Expand Down
10 changes: 5 additions & 5 deletions test/testreg2bPs.jl
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
@test signif(SpecificG(8.0, 0.106_495_556E4), TestDigits) ≈ signif(SpecificG_Ps(8.0, 7.5), TestDigits)
@test signif(SpecificG(90.0, 0.103_801_126E4), TestDigits) ≈ signif(SpecificG_Ps(90.0, 6.0), TestDigits)
@test signif(SpecificF(8.0, 0.600_484_040E3), TestDigits) ≈ signif(SpecificF_Ps(8.0, 6.0), TestDigits)
@test signif(SpecificF(8.0, 0.106_495_556E4), TestDigits) ≈ signif(SpecificF_Ps(8.0, 7.5), TestDigits)
@test signif(SpecificF(90.0, 0.103_801_126E4), TestDigits) ≈ signif(SpecificF_Ps(90.0, 6.0), TestDigits)
@test mysignif(SpecificG(8.0, 0.106_495_556E4), TestDigits) ≈ mysignif(SpecificG_Ps(8.0, 7.5), TestDigits)
@test mysignif(SpecificG(90.0, 0.103_801_126E4), TestDigits) ≈ mysignif(SpecificG_Ps(90.0, 6.0), TestDigits)
@test mysignif(SpecificF(8.0, 0.600_484_040E3), TestDigits) ≈ mysignif(SpecificF_Ps(8.0, 6.0), TestDigits)
@test mysignif(SpecificF(8.0, 0.106_495_556E4), TestDigits) ≈ mysignif(SpecificF_Ps(8.0, 7.5), TestDigits)
@test mysignif(SpecificF(90.0, 0.103_801_126E4), TestDigits) ≈ mysignif(SpecificF_Ps(90.0, 6.0), TestDigits)
@test SpecificV(8.0, 0.600_484_040E3) ≈ SpecificV_Ps(8.0, 6.0)
@test SpecificV(8.0, 0.106_495_556E4) ≈ SpecificV_Ps(8.0, 7.5)
@test SpecificV(90.0, 0.103_801_126E4) ≈ SpecificV_Ps(90.0, 6.0)
Expand Down
12 changes: 6 additions & 6 deletions test/testreg2cPh.jl
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@test signif(SpecificG(40.0, 0.743_056_411E3), TestDigits) ≈ signif(SpecificG_Ph(40.0, 2700.0), TestDigits)
@test signif(SpecificG(60.0, 0.791_137_067E3), TestDigits) ≈ signif(SpecificG_Ph(60.0, 2700.0), TestDigits)
@test signif(SpecificG(60.0, 0.882_756_860E3), TestDigits) ≈ signif(SpecificG_Ph(60.0, 3200.0), TestDigits)
@test signif(SpecificF(40.0, 0.743_056_411E3), TestDigits) ≈ signif(SpecificF_Ph(40.0, 2700.0), TestDigits)
@test signif(SpecificF(60.0, 0.791_137_067E3), TestDigits) ≈ signif(SpecificF_Ph(60.0, 2700.0), TestDigits)
@test signif(SpecificF(60.0, 0.882_756_860E3), TestDigits) ≈ signif(SpecificF_Ph(60.0, 3200.0), TestDigits)
@test mysignif(SpecificG(40.0, 0.743_056_411E3), TestDigits) ≈ mysignif(SpecificG_Ph(40.0, 2700.0), TestDigits)
@test mysignif(SpecificG(60.0, 0.791_137_067E3), TestDigits) ≈ mysignif(SpecificG_Ph(60.0, 2700.0), TestDigits)
@test mysignif(SpecificG(60.0, 0.882_756_860E3), TestDigits) ≈ mysignif(SpecificG_Ph(60.0, 3200.0), TestDigits)
@test mysignif(SpecificF(40.0, 0.743_056_411E3), TestDigits) ≈ mysignif(SpecificF_Ph(40.0, 2700.0), TestDigits)
@test mysignif(SpecificF(60.0, 0.791_137_067E3), TestDigits) ≈ mysignif(SpecificF_Ph(60.0, 2700.0), TestDigits)
@test mysignif(SpecificF(60.0, 0.882_756_860E3), TestDigits) ≈ mysignif(SpecificF_Ph(60.0, 3200.0), TestDigits)
@test SpecificV(40.0, 0.743_056_411E3) ≈ SpecificV_Ph(40.0, 2700.0)
@test SpecificV(60.0, 0.791_137_067E3) ≈ SpecificV_Ph(60.0, 2700.0)
@test SpecificV(60.0, 0.882_756_860E3) ≈ SpecificV_Ph(60.0, 3200.0)
Expand Down
12 changes: 6 additions & 6 deletions test/testreg2cPs.jl
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@test signif(SpecificG(20.0, 0.697_992_849E3), TestDigits) ≈ signif(SpecificG_Ps(20.0, 5.75), TestDigits)
@test signif(SpecificG(80.0, 0.854_011_484E3), TestDigits) ≈ signif(SpecificG_Ps(80.0, 5.25), TestDigits)
@test signif(SpecificG(80.0, 0.949_017_998E3), TestDigits) ≈ signif(SpecificG_Ps(80.0, 5.75), TestDigits)
@test signif(SpecificF(20.0, 0.697_992_849E3), TestDigits) ≈ signif(SpecificF_Ps(20.0, 5.75), TestDigits)
@test signif(SpecificF(80.0, 0.854_011_484E3), TestDigits) ≈ signif(SpecificF_Ps(80.0, 5.25), TestDigits)
@test signif(SpecificF(80.0, 0.949_017_998E3), TestDigits) ≈ signif(SpecificF_Ps(80.0, 5.75), TestDigits)
@test mysignif(SpecificG(20.0, 0.697_992_849E3), TestDigits) ≈ mysignif(SpecificG_Ps(20.0, 5.75), TestDigits)
@test mysignif(SpecificG(80.0, 0.854_011_484E3), TestDigits) ≈ mysignif(SpecificG_Ps(80.0, 5.25), TestDigits)
@test mysignif(SpecificG(80.0, 0.949_017_998E3), TestDigits) ≈ mysignif(SpecificG_Ps(80.0, 5.75), TestDigits)
@test mysignif(SpecificF(20.0, 0.697_992_849E3), TestDigits) ≈ mysignif(SpecificF_Ps(20.0, 5.75), TestDigits)
@test mysignif(SpecificF(80.0, 0.854_011_484E3), TestDigits) ≈ mysignif(SpecificF_Ps(80.0, 5.25), TestDigits)
@test mysignif(SpecificF(80.0, 0.949_017_998E3), TestDigits) ≈ mysignif(SpecificF_Ps(80.0, 5.75), TestDigits)
@test SpecificV(20.0, 0.697_992_849E3) ≈ SpecificV_Ps(20.0, 5.75)
@test SpecificV(80.0, 0.854_011_484E3) ≈ SpecificV_Ps(80.0, 5.25)
@test SpecificV(80.0, 0.949_017_998E3) ≈ SpecificV_Ps(80.0, 5.75)
Expand Down
6 changes: 3 additions & 3 deletions test/testreg3.jl
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@test signif(SpecificV(0.255_837_018E2, 650.0), TestDigits) ≈ 0.002
@test signif(SpecificV(0.222_930_643E2, 650.0), TestDigits) ≈ 0.005
@test signif(SpecificV(0.783_095_639E2, 750.0), TestDigits) ≈ 0.002
@test mysignif(SpecificV(0.255_837_018E2, 650.0), TestDigits) ≈ 0.002
@test mysignif(SpecificV(0.222_930_643E2, 650.0), TestDigits) ≈ 0.005
@test mysignif(SpecificV(0.783_095_639E2, 750.0), TestDigits) ≈ 0.002
@test SpecificH(0.255_837_018E2, 650.0) ≈ 0.186_343_019E4
@test SpecificH(0.222_930_643E2, 650.0) ≈ 0.237_512_401E4
@test SpecificH(0.783_095_639E2, 750.0) ≈ 0.225_868_845E4
Expand Down

0 comments on commit e661098

Please sign in to comment.