split definitions.jl & tests #137

JuliaRheology · Jul 16, 2024 · c8839cc · c8839cc
1 parent 20d0727
commit c8839cc
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 178 deletions.
diff --git a/test/definitions.jl → test/rheodata.jl b/test/definitions.jl → test/rheodata.jl
@@ -1,7 +1,8 @@
 println("===============================================")
-println("Testing definition.jl")
+println("Testing rheodata.jl")
 println("===============================================")
 
+
 function _RheoTimeData_explicit_nolog()
     a = Vector{RheoFloat}(1.0:1.0:3.0)
     b = Vector{RheoFloat}(4.0:1.0:6.0)
@@ -127,49 +128,3 @@ function __mapdata!()
 end
 @test __mapdata!()
 
-
-
-
-
-
-
-
-function _freezeparams()
-    SLS2_mod = freezeparams( SLS2, G₀=2, η₂=3.5)
-
-    relaxmod(SLS2, 1, [2,1,2,3,3.5]) == relaxmod(SLS2_mod, 1, [1,2,3])
-end
-@test _freezeparams()
-
-
-function _getparams()
-    m = RheoModel(Maxwell, k=1, eta=2)
-    p1 = getparams(m)
-    p2 = getparams(m,unicode=false)
-    (p1.k==1.0) && (p1.η==2.0) &&  (p2.k==1.0) && (p2.eta==2.0) 
-end
-@test _getparams()
-
-function _getparams_dict()
-    m = RheoModel(Maxwell, k=1, eta=2)
-    p = dict(getparams(m,unicode=false))
-    (p[:k]==1.0) && (p[:eta]==2.0) 
-end
-@test _getparams_dict()
-
-
-
-#
-#   The moduli functions on arrays are extensively tested as part of the model tests
-#
-
-
-function _scalar_moduli()
-    m=RheoModel(Spring, k=2)
-    (relaxmod(m))(1) == relaxmod(m, 1) == relaxmod(Spring, k=2, 1) == 2. &&
-        (creepcomp(m))(1) == creepcomp(m, 1) == creepcomp(Spring, k=2, 1) == 0.5 &&
-        (storagemod(m))(1) == storagemod(m, 1) == storagemod(Spring, k=2, 1) == 2. &&
-        (lossmod(m))(1) == lossmod(m, 1) == lossmod(Spring, k=2, 1) == 0.0 &&
-        (dynamicmod(m))(1) == dynamicmod(m, 1) == dynamicmod(Spring, k=2, 1) == 2.0 + 0.0*im 
-end
-@test _scalar_moduli()
diff --git a/test/rheomodel.jl b/test/rheomodel.jl
@@ -1,136 +1,7 @@
 println("===============================================")
-println("Testing definition.jl")
+println("Testing rheomodel.jl")
 println("===============================================")
 
-function _RheoTimeData_explicit_nolog()
-    a = Vector{RheoFloat}(1.0:1.0:3.0)
-    b = Vector{RheoFloat}(4.0:1.0:6.0)
-    c = Vector{RheoFloat}(7.0:1.0:9.0)
-
-    data = RheoTimeData(a, b, c, nothing)
-
-    data.σ==a && data.ϵ==b && data.t==c && isnothing(data.log)
-end
-@test _RheoTimeData_explicit_nolog()
-
-function _RheoTimeData_const_nolog()
-    eps = Vector{RheoFloat}(1.0:1.0:3.0)
-    sig = Vector{RheoFloat}(4.0:1.0:6.0)
-    t = Vector{RheoFloat}(7.0:1.0:9.0)
-
-    data = RheoTimeData(strain=eps, stress=sig, t=t, savelog=false)
-    showlog(data)
-
-    getstress(data)==sig && getstrain(data)==eps && gettime(data)==t && isnothing(data.log)
-end
-@test _RheoTimeData_const_nolog()
-
-function _RheoTimeData_const_nostrain()
-    sig = Vector{RheoFloat}(4.0:1.0:6.0)
-    t = Vector{RheoFloat}(7.0:1.0:9.0)
-
-    data = RheoTimeData(σ=sig, t=t)
-    showlog(data)
-
-    data.σ==sig && data.ϵ==RheoFloat[] && data.t==t && data.log[1].info.type == stress_only::TimeDataType
-end
-@test _RheoTimeData_const_nostrain()
-
-function _operators_logs()
-    d1=strainfunction(timeline(0:0.5:10),t->exp(-t))
-    d2=strainfunction(timeline(0:0.5:10),t->1-exp(-t))
-    d=2*d1 - (-d2) + d2
-
-    d3=rheologrun(d.log)
-
-    (d3.ϵ == d.ϵ) && all([ abs(e-2.)<=eps(RheoFloat) for e in d.ϵ ])
-end
-@test _operators_logs()
-
-
-
-function _RheoFreqData_explicit_nolog()
-    a = Vector{RheoFloat}(1.0:1.0:3.0)
-    b = Vector{RheoFloat}(4.0:1.0:6.0)
-    c = Vector{RheoFloat}(7.0:1.0:9.0)
-
-    data = RheoFreqData(a, b, c, nothing)
-
-    data.Gp==a && data.Gpp==b && data.ω==c && isnothing(data.log)
-end
-@test _RheoFreqData_explicit_nolog()
-
-function _RheoFreqData_const_nolog()
-    a = Vector{RheoFloat}(1.0:1.0:3.0)
-    b = Vector{RheoFloat}(4.0:1.0:6.0)
-    c = Vector{RheoFloat}(7.0:1.0:9.0)
-
-    data = RheoFreqData(omega=a, Gp=b, Gpp=c , savelog=false)
-    showlog(data)
-
-    getfreq(data)==a && getstorage(data)==b && getloss(data)==c && isnothing(data.log)
-end
-@test _RheoFreqData_const_nolog()
-
-
-
-function _rheoconvert()
-    vi64=Int64(1)
-    ai64=[vi64,vi64]
-    arf=Vector{RheoFloat}([1,2,3])
-    rheoconvert(RheoFloat(1.0))===rheoconvert(vi64) && typeof(rheoconvert(ai64)) == Vector{RheoFloat} &&
-        arf === rheoconvert(arf)  &&  ai64 !== rheoconvert(ai64)
-end
-@test _rheoconvert()
-
-
-function _union_strain1stress2()
-    time_instance = timeline(t_start=0.0, t_end=15.0, step=0.2)
-    imposed_strain = strainfunction(time_instance, sawtooth(offset=5.0, amp=2, period=5))
-    imposed_stress = stressfunction(time_instance, stairs(offset=3.0, amp=0.5, width=4.0))
-
-    combined = imposed_strain|imposed_stress
-
-    (combined.σ==imposed_stress.σ) && (combined.ϵ==imposed_strain.ϵ) && (combined.t==imposed_stress.t)
-end
-@test _union_strain1stress2()
-
-function _union_stress1strain2()
-    time_instance = timeline(t_start=0.0, t_end=15.0, step=0.2)
-    imposed_strain = strainfunction(time_instance, sawtooth(offset=5.0, amp=2, period=5))
-    imposed_stress = stressfunction(time_instance, stairs(offset=3.0, amp=0.5, width=4.0))
-
-    combined = imposed_stress|imposed_strain
-
-    (combined.σ==imposed_stress.σ) && (combined.ϵ==imposed_strain.ϵ) && (combined.t==imposed_stress.t)
-end
-@test _union_stress1strain2()
-
-
-
-function __setdata!()
-  t=timeline(0:0.1:1)
-  RHEOS._setdata!(t.ϵ,t.t)
-  b = t.ϵ==t.t
-  RHEOS._setdata!(t.ϵ,2 .* t.t)
-  b && (t.ϵ== 2 .* t.t)
-end
-@test __setdata!()
-
-
-function __mapdata!()
-  t=timeline(0:0.1:1)
-  RHEOS._mapdata!(x->x,t.ϵ,t.t)
-  b = t.ϵ==t.t
-  RHEOS._mapdata!(x->2*x, t.ϵ, t.t)
-  b && (t.ϵ== 2 .* t.t)
-end
-@test __mapdata!()
-
-
-
-
-
 
 
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -11,7 +11,8 @@ println("|")
 
 
 include("symbols.jl")
-include("definitions.jl")
+include("rheodata.jl")
+include("rheomodel.jl")
 include("base.jl")
 include("datagen.jl")
 include("IO.jl")