update for zenodo caching

Snakefile

@@ -1,4 +1,4 @@
-rule figure1:
+rule sim_figure1:
     output:
         directory("src/data/Figure1")
     conda:
@@ -7,7 +7,7 @@ rule figure1:
         True
     script:
         "src/scripts/run_ebtel_figure1.py"
-rule figure2:
+rule sim_figure2:
     output:
         directory("src/data/Figure2")
     conda:
@@ -16,7 +16,7 @@ rule figure2:
         True
     script:
         "src/scripts/run_ebtel_figure2.py"
-rule figure3:
+rule sim_figure3:
     output:
         directory("src/data/Figure3")
     conda:
@@ -25,3 +25,24 @@ rule figure3:
         True
     script:
         "src/scripts/run_ebtel_figure3.py"
+rule plot_figure1:
+    input:
+        "src/data/Figure1"
+    conda:
+        "environment.yml"
+    script:
+        "src/scripts/render_figure1.py"
+rule plot_figure2:
+    input:
+        "src/data/Figure2"
+    conda:
+        "environment.yml"
+    script:
+        "src/scripts/render_figure2.py"
+rule plot_figure3:
+    input:
+        "src/data/Figure3"
+    conda:
+        "environment.yml"
+    script:
+        "src/scripts/render_figure3.py"

src/scripts/render_figure1.py

@@ -2,13 +2,13 @@
 Script to render the data into Figure 1
 
 """
-import os
+# import os
 import paths
 from plot import plot_figures
 from read import read_ebtel_file
 
 # Call the script to run the simulations for Figure 1
-os.system("python "+ str(paths.scripts / "run_ebtel_figure1.py"))
+# os.system("python "+ str(paths.scripts / "run_ebtel_figure1.py"))
 
 # Let's calculate some cases with single heating events first
 lengths = ['40']

src/scripts/render_figure2.py

@@ -2,13 +2,13 @@
 Script to render the data into Figure 2
 
 """
-import os
+#import os
 import paths
 from plot import plot_figures
 from read import read_ebtel_file
 
 # Call the script to run the simulations for Figure 2
-os.system("python "+ str(paths.scripts / "run_ebtel_figure2.py"))
+#os.system("python "+ str(paths.scripts / "run_ebtel_figure2.py"))
 
 # Let's calculate some cases with single heating events first
 lengths = ['80']

src/scripts/render_figure3.py

@@ -2,13 +2,13 @@
 Script to render the data into Figure 3
 
 """
-import os
+#import os
 import paths
 from plot import plot_figures
 from read import read_ebtel_file
 
 # Call the script to run the simulations for Figure 3
-os.system("python "+ str(paths.scripts / "run_ebtel_figure3.py"))
+#os.system("python "+ str(paths.scripts / "run_ebtel_figure3.py"))
 
 # Let's calculate a couple of nanoflare trains for comparison
 lengths = ['40', '80']

src/scripts/run_ebtel_figure1.py

@@ -9,6 +9,8 @@
 import paths
 from configure import read_initial_configuration, write_new_configuration
 
+paths.figure1.mkdir(parents=True, exist_ok=True)
+
 initial_lines = read_initial_configuration()
 
 # single heating events

src/scripts/run_ebtel_figure2.py

@@ -9,6 +9,8 @@
 import paths
 from configure import read_initial_configuration, write_new_configuration
 
+paths.figure2.mkdir(parents=True, exist_ok=True)
+
 initial_lines = read_initial_configuration()
 
 # single heating events

src/scripts/run_ebtel_figure3.py

@@ -9,6 +9,8 @@
 import paths
 from configure import read_initial_configuration, write_new_configuration
 
+paths.figure3.mkdir(parents=True, exist_ok=True)
+
 initial_lines = read_initial_configuration()
 
 # nanoflare trains