Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Submodules/macfp-db
Submodule macfp-db updated 41 files
+1 −1 .github/workflows/Buoyant_Plumes.yml
+1 −1 .github/workflows/Experimental_Data.yml
+1 −1 .github/workflows/Extinction.yml
+1 −1 .github/workflows/Fire_Growth.yml
+1 −1 .github/workflows/Gaseous_Pool_Fires.yml
+1 −1 .github/workflows/Line_Endings.yml
+1 −1 .github/workflows/Liquid_Pool_Fires.yml
+1 −1 .github/workflows/MaCFP-1_Build_LaTeX.yml
+1 −1 .github/workflows/Wall_Fires.yml
+0 −41 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/horizontal_velocity_mean_15.2_OC.csv
+0 −41 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/horizontal_velocity_mean_16.8_OC.csv
+0 −41 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/horizontal_velocity_mean_20.9_OC.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC15.2_0.5D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC15.2_1.0D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC15.2_1.5D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC15.2_2.0D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC15.2_2.5D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC15.2_3.0D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC15.2_3.5D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC16.8_0.5D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC16.8_1.0D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC16.8_1.5D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC16.8_2.0D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC16.8_2.5D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC16.8_3.0D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC16.8_3.5D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC20.9_0.5D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC20.9_1.0D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC20.9_1.5D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC20.9_2.0D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC20.9_2.5D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC20.9_3.0D.csv
+0 −200 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_PDF_OC20.9_3.5D.csv
+0 −14 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_mean.csv
+0 −14 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/temperature_rms.csv
+0 −41 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/vertical_velocity_mean_15.2_OC.csv
+0 −41 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/vertical_velocity_mean_16.8_OC.csv
+0 −41 Extinction/FM_Burner/Experimental_Data/Dataset_Update_Oct2025/vertical_velocity_mean_20.9_OC.csv
+60 −25 Extinction/FM_Burner/Experimental_Data/FM_Burner_dataset_update_Oct2025/plot_temperature_profiles.py
+2 −3 Extinction/FM_Burner/Experimental_Data/FM_Burner_dataset_update_Oct2025/temperature_mean.csv
+2 −3 Extinction/FM_Burner/Experimental_Data/FM_Burner_dataset_update_Oct2025/temperature_rms.csv
2 changes: 1 addition & 1 deletion Submodules/matl-db
Submodule matl-db updated 55 files
+113 −0 Scripts/MaCFP-4/MCC_analysis.py
+73 −0 Scripts/MaCFP-4/TGA_analysis.py
+159 −0 Scripts/MaCFP-4/Utils.py
+2,033 −0 Wood/Calibration_Data/MFSL/MFSL_TGA_N2_10K_R1.csv
+2,033 −0 Wood/Calibration_Data/MFSL/MFSL_TGA_N2_10K_R2.csv
+2,033 −0 Wood/Calibration_Data/MFSL/MFSL_TGA_N2_10K_R3.csv
+34 −0 Wood/Calibration_Data/MFSL/README.md
+77 −0 Wood/Calibration_Data/TIFP+UCT/README.md
+3,502 −0 Wood/Calibration_Data/TIFP+UCT/TIFP+UCT_Gasification_hor_parallel_30kW_R1.csv
+3,502 −0 Wood/Calibration_Data/TIFP+UCT/TIFP+UCT_Gasification_hor_parallel_30kW_R2.csv
+1,602 −0 Wood/Calibration_Data/TIFP+UCT/TIFP+UCT_Gasification_hor_parallel_60kW_R1.csv
+1,595 −0 Wood/Calibration_Data/TIFP+UCT/TIFP+UCT_Gasification_hor_parallel_60kW_R2.csv
+1,602 −0 Wood/Calibration_Data/TIFP+UCT/TIFP+UCT_Gasification_hor_parallel_60kW_R3.csv
+4,325 −0 Wood/Calibration_Data/TIFP+UCT/TIFP+UCT_STA_N2_10K_R1.csv
+4,325 −0 Wood/Calibration_Data/TIFP+UCT/TIFP+UCT_STA_N2_10K_R2.csv
+4,325 −0 Wood/Calibration_Data/TIFP+UCT/TIFP+UCT_STA_N2_10K_R3.csv
+2,359 −0 Wood/Calibration_Data/TIFP+UCT/TIFP+UCT_STA_N2_20K_R1.csv
+2,359 −0 Wood/Calibration_Data/TIFP+UCT/TIFP+UCT_STA_N2_20K_R2.csv
+2,359 −0 Wood/Calibration_Data/TIFP+UCT/TIFP+UCT_STA_N2_20K_R3.csv
+8,345 −0 Wood/Calibration_Data/TIFP+UCT/TIFP+UCT_STA_N2_5K_R1.csv
+8,345 −0 Wood/Calibration_Data/TIFP+UCT/TIFP+UCT_STA_N2_5K_R2.csv
+8,345 −0 Wood/Calibration_Data/TIFP+UCT/TIFP+UCT_STA_N2_5K_R3.csv
+8,345 −0 Wood/Calibration_Data/TIFP+UCT/TIFP+UCT_STA_N2_5K_R4.csv
+48 −0 Wood/Calibration_Data/TUBS/README.md
+1,605 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_10K_R1.csv
+1,595 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_10K_R2.csv
+1,596 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_10K_R3.csv
+1,594 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_20K_R1.csv
+1,593 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_20K_R2.csv
+1,588 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_20K_R3.csv
+1,586 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_30K_R1.csv
+1,586 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_30K_R2.csv
+1,581 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_30K_R3.csv
+1,589 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_40K_R1.csv
+1,576 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_40K_R2.csv
+1,586 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_40K_R3.csv
+1,595 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_50K_R1.csv
+1,593 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_50K_R2.csv
+1,593 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_50K_R3.csv
+1,615 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_5K_R1.csv
+1,607 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_5K_R2.csv
+1,593 −0 Wood/Calibration_Data/TUBS/TUBS_TGA_N2_5K_R3.csv
+305 −0 Wood/Calibration_Data/UMET/README.md
+2,208 −0 Wood/Calibration_Data/UMET/UMET_Cone_30KW_hor_R1.csv
+2,349 −0 Wood/Calibration_Data/UMET/UMET_Cone_30KW_hor_R2.csv
+2,344 −0 Wood/Calibration_Data/UMET/UMET_Cone_30KW_hor_R3.csv
+2,344 −0 Wood/Calibration_Data/UMET/UMET_Cone_60KW_hor_R1.csv
+1,842 −0 Wood/Calibration_Data/UMET/UMET_Cone_60KW_hor_R2.csv
+1,842 −0 Wood/Calibration_Data/UMET/UMET_Cone_60KW_hor_R3.csv
+1,521 −0 Wood/Calibration_Data/UMET/UMET_TGA_N2_10K_R1.csv
+1,521 −0 Wood/Calibration_Data/UMET/UMET_TGA_N2_10K_R2.csv
+1,521 −0 Wood/Calibration_Data/UMET/UMET_TGA_N2_10K_R3.csv
+1,521 −0 Wood/Calibration_Data/UMET/UMET_TGA_O2-21_10K_R1.csv
+1,521 −0 Wood/Calibration_Data/UMET/UMET_TGA_O2-21_10K_R2.csv
+1,521 −0 Wood/Calibration_Data/UMET/UMET_TGA_O2-21_10K_R3.csv