edit version

TanabeLab · Aug 17, 2022 · bc2a13b · bc2a13b
1 parent 5f6f018
commit bc2a13b
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 66 deletions.
diff --git a/src/jos3/__init__.py b/src/jos3/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 from jos3.jos3 import *
-__version__ = '0.3.2'
+__version__ = '0.4.0'
diff --git a/test.py b/test.py
@@ -21,73 +21,73 @@
     mod.to_csv(folder="E:/desktop")
 
 
-    # mod = JOS3()
-    # print("\nNeutral")
-    # print("TcrHead: {:.3f} [oC]".format(mod.Tcr[0]))
-    # print("TskMean: {:.3f} [oC]".format(mod.TskMean))
+    mod = JOS3()
+    print("\nNeutral")
+    print("TcrHead: {:.3f} [oC]".format(mod.Tcr[0]))
+    print("TskMean: {:.3f} [oC]".format(mod.TskMean))
 
-    # mod = JOS3()
-    # mod.PAR = 2
-    # mod.To = 40
-    # mod.RH = 70
-    # mod.Va = 2
-    # mod.Icl = 0.6
-    # mod.simulate(60)
-    # print("\nAfter Hot Exposure")
-    # print("TcrHead: {:.3f} [oC]".format(mod.Tcr[0]))
-    # print("TskMean: {:.3f} [oC]".format(mod.TskMean))
+    mod = JOS3()
+    mod.PAR = 2
+    mod.To = 40
+    mod.RH = 70
+    mod.Va = 2
+    mod.Icl = 0.6
+    mod.simulate(60)
+    print("\nAfter Hot Exposure")
+    print("TcrHead: {:.3f} [oC]".format(mod.Tcr[0]))
+    print("TskMean: {:.3f} [oC]".format(mod.TskMean))
 
-    # mod = JOS3()
-    # mod.PAR = 1.2
-    # mod.To = 10
-    # mod.RH = 20
-    # mod.Va = 3
-    # mod.Icl = 0.1
-    # mod.simulate(60)
-    # print("\nAfter Cold Exposure")
-    # print("TcrHead: {:.3f} [oC]".format(mod.Tcr[0]))
-    # print("TskMean: {:.3f} [oC]".format(mod.TskMean))
+    mod = JOS3()
+    mod.PAR = 1.2
+    mod.To = 10
+    mod.RH = 20
+    mod.Va = 3
+    mod.Icl = 0.1
+    mod.simulate(60)
+    print("\nAfter Cold Exposure")
+    print("TcrHead: {:.3f} [oC]".format(mod.Tcr[0]))
+    print("TskMean: {:.3f} [oC]".format(mod.TskMean))
 
-    # # Measure calculation time
-    # import time
-    # stime = time.time()
-    # mod = JOS3()
-    # mod.To = 30
-    # mod.simulate(60)
-    # mod.To = 20
-    # mod.simulate(60)
-    # mod.To = 40
-    # mod.simulate(60)
-    # mod.To = 10
-    # mod.simulate(60)
-    # etime = time.time()
-    # print("Default output")
-    # print("Calculation time {:.2f} [sec]".format(etime-stime))
+    # Measure calculation time
+    import time
+    stime = time.time()
+    mod = JOS3()
+    mod.To = 30
+    mod.simulate(60)
+    mod.To = 20
+    mod.simulate(60)
+    mod.To = 40
+    mod.simulate(60)
+    mod.To = 10
+    mod.simulate(60)
+    etime = time.time()
+    print("Default output")
+    print("Calculation time {:.2f} [sec]".format(etime-stime))
 
-    # stime = time.time()
-    # mod = JOS3(ex_output=["BFsk", "BFcr", "Emax"])
-    # mod.To = 30
-    # mod.simulate(60)
-    # mod.To = 20
-    # mod.simulate(60)
-    # mod.To = 40
-    # mod.simulate(60)
-    # mod.To = 10
-    # mod.simulate(60)
-    # etime = time.time()
-    # print("Extra output")
-    # print("Calculation time {:.2f} [sec]".format(etime-stime))
+    stime = time.time()
+    mod = JOS3(ex_output=["BFsk", "BFcr", "Emax"])
+    mod.To = 30
+    mod.simulate(60)
+    mod.To = 20
+    mod.simulate(60)
+    mod.To = 40
+    mod.simulate(60)
+    mod.To = 10
+    mod.simulate(60)
+    etime = time.time()
+    print("Extra output")
+    print("Calculation time {:.2f} [sec]".format(etime-stime))
 
-    # stime = time.time()
-    # mod = JOS3(ex_output="all")
-    # mod.To = 30
-    # mod.simulate(60)
-    # mod.To = 20
-    # mod.simulate(60)
-    # mod.To = 40
-    # mod.simulate(60)
-    # mod.To = 10
-    # mod.simulate(60)
-    # etime = time.time()
-    # print("All output")
-    # print("Calculation time {:.2f} [sec]".format(etime-stime))
+    stime = time.time()
+    mod = JOS3(ex_output="all")
+    mod.To = 30
+    mod.simulate(60)
+    mod.To = 20
+    mod.simulate(60)
+    mod.To = 40
+    mod.simulate(60)
+    mod.To = 10
+    mod.simulate(60)
+    etime = time.time()
+    print("All output")
+    print("Calculation time {:.2f} [sec]".format(etime-stime))