Merge pull request #15569 from rmcdermo/master

Python: get scatplot working for verification (commented)

Author: rmcdermo

Utilities/Python/FDS_validation_script.py

@@ -47,18 +47,17 @@
 #                                          close_figs=True,
 #                                          verbose=True,
 #                                          plot_range=["all"],
-#                                          quantity_filter=["Target Heat Flux"],
 #                                          ) # see notes below on plot_range
 
 # # ----- write saved_data, drange to disk -----
 # import pickle
 
 # # Save
-# with open("saved_data_debug.pkl", "wb") as f:
+# with open("saved_data_validation.pkl", "wb") as f:
 #     pickle.dump((saved_data, drange), f)
 
 # # Later...
-# with open("saved_data_debug.pkl", "rb") as f:
+# with open("saved_data_validation.pkl", "rb") as f:
 #     saved_data, drange = pickle.load(f)
 # #---------------------------------------------
 

Utilities/Python/FDS_verification_script.py

@@ -28,17 +28,45 @@
 
 # Dataplot and scatplot options
 
+Dataplot_Inputs_File = '../Matlab/FDS_verification_dataplot_inputs.csv';
+Working_Dir = '../../Verification/';
+Manuals_Dir = '../../Manuals/';
+Scatterplot_Inputs_File = '../Matlab/FDS_verification_scatterplot_inputs.csv';
+
 # Statistics output options
 
-# Run dataplot and scatplot scripts
+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.dataplot(config_filename='../Matlab/FDS_verification_dataplot_inputs.csv',
-                    expdir='../../Verification/',
-                    cmpdir='../../Verification/',
-                    pltdir='../../Manuals/',
-                    close_figs=True,
-                    verbose=True,
-                    plot_range=[2,2]) # plot_range[start, end], optionally instead use plot_list['Dataname']
+# 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