Merge pull request #15571 from rmcdermo/master

Python: go live with dataplot and scatplot

Author: rmcdermo

Utilities/Python/FDS_validation_script.py

@@ -38,36 +38,36 @@
 Stats_Output = 'Validation'
 Scatterplot_Dir = '../../Manuals/FDS_Validation_Guide/SCRIPT_FIGURES/ScatterPlots/'
 
-# # Run dataplot and scatplot scripts
-
-# saved_data, drange = fdsplotlib.dataplot(config_filename=Dataplot_Inputs_File,
-#                                          expdir=EXP_Dir,
-#                                          cmpdir=OUT_Dir,
-#                                          pltdir=Manuals_Dir,
-#                                          close_figs=True,
-#                                          verbose=True,
-#                                          plot_range=["all"],
-#                                          ) # see notes below on plot_range
-
-# # ----- write saved_data, drange to disk -----
-# import pickle
-
-# # Save
-# with open("saved_data_validation.pkl", "wb") as f:
-#     pickle.dump((saved_data, drange), f)
-
-# # Later...
-# with open("saved_data_validation.pkl", "rb") as f:
-#     saved_data, drange = pickle.load(f)
-# #---------------------------------------------
-
-# fdsplotlib.scatplot(saved_data,drange,
-#                     Manuals_Dir=Manuals_Dir,
-#                     Scatterplot_Inputs_File=Scatterplot_Inputs_File,
-#                     Stats_Output=Stats_Output,
-#                     Scatterplot_Dir=Scatterplot_Dir,
-#                     verbose=True,
-#                     )
+# Run dataplot and scatplot scripts
+
+saved_data, drange = fdsplotlib.dataplot(config_filename=Dataplot_Inputs_File,
+                                         expdir=EXP_Dir,
+                                         cmpdir=OUT_Dir,
+                                         pltdir=Manuals_Dir,
+                                         close_figs=True,
+                                         verbose=True,
+                                         plot_range=["all"],
+                                         ) # see notes below on plot_range
+
+# ----- write saved_data, drange to disk -----
+import pickle
+
+# Save
+with open("saved_data_validation.pkl", "wb") as f:
+    pickle.dump((saved_data, drange), f)
+
+# Later...
+with open("saved_data_validation.pkl", "rb") as f:
+    saved_data, drange = pickle.load(f)
+#---------------------------------------------
+
+fdsplotlib.scatplot(saved_data,drange,
+                    Manuals_Dir=Manuals_Dir,
+                    Scatterplot_Inputs_File=Scatterplot_Inputs_File,
+                    Stats_Output=Stats_Output,
+                    Scatterplot_Dir=Scatterplot_Dir,
+                    verbose=True,
+                    )
 
 # Create table of git statistics for FDS Validation Guide
 

Utilities/Python/FDS_verification_script.py

@@ -38,35 +38,35 @@
 Stats_Output = 'Verification'
 Scatterplot_Dir = '../../Manuals/FDS_Verification_Guide/SCRIPT_FIGURES/ScatterPlots/'
 
-# # Run dataplot and scatplot scripts
-
-# saved_data, drange = fdsplotlib.dataplot(config_filename=Dataplot_Inputs_File,
-#                                          expdir=Working_Dir,
-#                                          cmpdir=Working_Dir,
-#                                          pltdir=Manuals_Dir,
-#                                          close_figs=True,
-#                                          verbose=True,
-#                                          plot_range=["all"]) # plot_range[start, end], optionally instead use plot_list['Dataname']
-
-# # ----- write saved_data, drange to disk -----
-# import pickle
-
-# # Save
-# with open("saved_data_verification.pkl", "wb") as f:
-#     pickle.dump((saved_data, drange), f)
-
-# # Later...
-# with open("saved_data_verification.pkl", "rb") as f:
-#     saved_data, drange = pickle.load(f)
-# #---------------------------------------------
-
-# fdsplotlib.scatplot(saved_data,drange,
-#                     Manuals_Dir=Manuals_Dir,
-#                     Scatterplot_Inputs_File=Scatterplot_Inputs_File,
-#                     Stats_Output=Stats_Output,
-#                     Scatterplot_Dir=Scatterplot_Dir,
-#                     verbose=True,
-#                     )
+# Run dataplot and scatplot scripts
+
+saved_data, drange = fdsplotlib.dataplot(config_filename=Dataplot_Inputs_File,
+                                         expdir=Working_Dir,
+                                         cmpdir=Working_Dir,
+                                         pltdir=Manuals_Dir,
+                                         close_figs=True,
+                                         verbose=True,
+                                         plot_range=["all"]) # plot_range[start, end], optionally instead use plot_list['Dataname']
+
+# ----- write saved_data, drange to disk -----
+import pickle
+
+# Save
+with open("saved_data_verification.pkl", "wb") as f:
+    pickle.dump((saved_data, drange), f)
+
+# Later...
+with open("saved_data_verification.pkl", "rb") as f:
+    saved_data, drange = pickle.load(f)
+#---------------------------------------------
+
+fdsplotlib.scatplot(saved_data,drange,
+                    Manuals_Dir=Manuals_Dir,
+                    Scatterplot_Inputs_File=Scatterplot_Inputs_File,
+                    Stats_Output=Stats_Output,
+                    Scatterplot_Dir=Scatterplot_Dir,
+                    verbose=True,
+                    )
 
 # Special cases