Skip to content

Commit

Permalink
Merge pull request #418 from hong27/unsw-branch
Browse files Browse the repository at this point in the history 
UNSW results - NIST methane pool fire and FM burner preliminary
  • Loading branch information
@rmcdermo
rmcdermo authored Sep 1, 2023
2 parents f25a3f6 + 4d61efb commit d374e1d
Show file tree
Hide file tree
Showing 17 changed files with 9,427 additions and 0 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/Extinction.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,24 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# --------- UNSW results --------------
# Step 1: generate the plots
- name: UNSW Results
run: |
echo $GITHUB_WORKSPACE
cd $GITHUB_WORKSPACE/Extinction/FM_Burner/Computational_Results/2023/UNSW
python FM_Burner_UNSW_plot_cmp.py
# Step 2: push the plots to the releases page
- name: Push UNSW Results to release
if: ( github.event_name == 'push' || github.event_name == 'workflow_dispatch' ) && github.repository_owner == 'MaCFP'
run: |
cd $GITHUB_WORKSPACE/Extinction/FM_Burner/Computational_Results/2023/UNSW
cp README.md ./Plots/.
zip Plots.zip -r Plots
mv Plots.zip FM_Burner_NIST_Plots.zip
gh release upload SCRIPT_FIGURES FM_Burner_NIST_Plots.zip --clobber
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}


17 changes: 17 additions & 0 deletions .github/workflows/Liquid_Pool_Fires.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,3 +157,20 @@ jobs:
gh release upload SCRIPT_FIGURES Waterloo_Methanol_FMGlobal_Plots.zip --clobber
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

# UNSW results --------------------------------------------------------
- name: UNSW methane pool fire Results
run: |
echo $GITHUB_WORKSPACE
cd $GITHUB_WORKSPACE/Liquid_Pool_Fires/NIST_Pool_Fires/Computational_Results/2023/UNSW
python NIST_Pool_Fires_UNSW_plot_cmp.py
- name: Push Sandia Results to release
if: ( github.event_name == 'push' || github.event_name == 'workflow_dispatch' ) && github.repository_owner == 'MaCFP'
run: |
cd $GITHUB_WORKSPACE/Liquid_Pool_Fires/NIST_Pool_Fires/Computational_Results/2023/NIST
cp README.md ./Plots/.
zip Plots.zip -r Plots
mv Plots.zip NIST_Pool_Fires_UNSW_Plots.zip
gh release upload SCRIPT_FIGURES NIST_Pool_Fires_UNSW_Plots.zip --clobber
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
50 changes: 50 additions & 0 deletions Extinction/FM_Burner/Computational_Results/2023/UNSW/FM_Burner_UNSW_cmp_config.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
Exp_Filename ,Exp_Header_Row,Exp_Data_Row,Exp_x_Col_Name ,Exp_y_Col_Name ,Exp_Data_Label,Exp_Marker_Style,Exp_Line_Style,Exp_Line_Width,Cmp_Filename ,Cmp_Header_Row,Cmp_Data_Row,Cmp_x_Col_Name ,Cmp_y_Col_Name ,Cmp_Data_Label,Cmp_Line_Style,Plot_Title ,Plot_x_Label ,Plot_y_Label ,Plot_x_Min,Plot_x_Max,Plot_y_Min,Plot_y_Max,Plot_Flip_Axis,Plot_Legend_Location,Plot_Filename
Temperature/Mean_temperature.csv ,1 ,2 ,Radius (cm) ,1.0D ,Exp ,o , , ,UNSW_1cm_data_1D.csv ,1 ,3 ,x ,TMean ,1cm ,- ,Radial Mean Temperature Profile 1.0 D,Radius (cm) ,Temperature (K) ,0 ,12 ,0 ,1400 , ,lower left ,Radial_Mean_Temperature_1p0D.pdf



Temperature/Mean_temperature.csv ,1 ,2 ,Radius (cm) ,1.5D ,Exp ,o , , ,UNSW_1cm_data_1p5D.csv ,1 ,3 ,x ,TMean ,1cm ,- ,Radial Mean Temperature Profile 1.5 D,Radius (cm) ,Temperature (K) ,0 ,12 ,0 ,1400 , ,lower left ,Radial_Mean_Temperature_1p5D.pdf



Temperature/Mean_temperature.csv ,1 ,2 ,Radius (cm) ,2.0D ,Exp ,o , , ,UNSW_1cm_data_2D.csv ,1 ,3 ,x ,TMean ,1cm ,- ,Radial Mean Temperature Profile 2.0 D,Radius (cm) ,Temperature (K) ,0 ,12 ,0 ,1400 , ,lower left ,Radial_Mean_Temperature_2p0D.pdf



Temperature/Mean_temperature.csv ,1 ,2 ,Radius (cm) ,2.5D ,Exp ,o , , ,UNSW_1cm_data_2p5D.csv ,1 ,3 ,x ,TMean ,1cm ,- ,Radial Mean Temperature Profile 2.5 D,Radius (cm) ,Temperature (K) ,0 ,12 ,0 ,1400 , ,lower left ,Radial_Mean_Temperature_2p5D.pdf




Temperature/Mean_temperature.csv ,1 ,2 ,Radius (cm) ,3.0D ,Exp ,o , , ,UNSW_1cm_data_3D.csv ,1 ,3 ,x ,TMean ,1cm ,- ,Radial Mean Temperature Profile 3.0 D,Radius (cm) ,Temperature (K) ,0 ,12 ,0 ,1400 , ,lower left ,Radial_Mean_Temperature_3p0D.pdf


Temperature/Mean_temperature.csv ,1 ,2 ,Radius (cm) ,3.5D ,Exp ,o , , ,UNSW_1cm_data_3p5D.csv ,1 ,3 ,x ,TMean ,1cm ,- ,Radial Mean Temperature Profile 3.5 D,Radius (cm) ,Temperature (K) ,0 ,12 ,0 ,1400 , ,lower left ,Radial_Mean_Temperature_3p5D.pdf



Temperature/RMS_Temperature.csv ,1 ,2 ,Radius (cm) ,1.0D ,Exp ,o , , ,UNSW_1cm_data_1D.csv,1 ,3 ,x ,T_rms ,1cm ,- ,Radial RMS Temperature Profile 1.0 D ,Radius (cm) ,Temperature (K) ,0 ,12 ,0 ,600 , ,lower left ,Radial_RMS_Temperature_1p0D.pdf




Temperature/RMS_Temperature.csv ,1 ,2 ,Radius (cm) ,1.5D ,Exp ,o , , ,UNSW_1cm_data_1p5D.csv, 1 ,3 ,x ,T_rms ,1cm ,- ,Radial RMS Temperature Profile 1.5 D ,Radius (cm) ,Temperature (K) ,0 ,12 ,0 ,600 , ,lower left ,Radial_RMS_Temperature_1p5D.pdf



Temperature/RMS_Temperature.csv ,1 ,2 ,Radius (cm) ,2.0D ,Exp ,o , , ,UNSW_1cm_data_2D.csv , 1 ,3 ,x ,T_rms ,1cm ,- ,Radial RMS Temperature Profile 2.0 D ,Radius (cm) ,Temperature (K) ,0 ,12 ,0 ,600 , ,lower left ,Radial_RMS_Temperature_2p0D.pdf



Temperature/RMS_Temperature.csv ,1 ,2 ,Radius (cm) ,2.5D ,Exp ,o , , ,UNSW_1cm_data_2p5D.csv, 1 ,3 ,x ,T_rms ,1cm ,- ,Radial RMS Temperature Profile 2.5 D ,Radius (cm) ,Temperature (K) ,0 ,12 ,0 ,600 , ,lower left ,Radial_RMS_Temperature_2p5D.pdf



Temperature/RMS_Temperature.csv ,1 ,2 ,Radius (cm) ,3.0D ,Exp ,o , , ,UNSW_1cm_data_3D.csv ,1 ,3 ,x ,T_rms ,1cm ,- ,Radial RMS Temperature Profile 3.0 D ,Radius (cm) ,Temperature (K) ,0 ,12 ,0 ,600 , ,lower left ,Radial_RMS_Temperature_3p0D.pdf



Temperature/RMS_Temperature.csv ,1 ,2 ,Radius (cm) ,3.5D ,Exp ,o , , ,UNSW_1cm_data_3p5D.csv, 1 ,3 ,x ,T_rms ,1cm ,- ,Radial RMS Temperature Profile 3.5 D ,Radius (cm) ,Temperature (K) ,0 ,12 ,0 ,600 , ,lower left ,Radial_RMS_Temperature_3p5D.pdf



28 changes: 28 additions & 0 deletions Extinction/FM_Burner/Computational_Results/2023/UNSW/FM_Burner_UNSW_plot_cmp.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/usr/bin/env python3
# McDermott
# Feb 2021

# first, make sure the macfp module directory is in your path
# if not, uncomment the lines below and replace <path to macfp-db>
# with the path (absolute or relative) to your macfp-db repository

import sys
# sys.path.append('<path to macfp-db>/macfp-db/Utilities/')
sys.path.append('../../../../../../macfp-db/Utilities/')

import macfp
import importlib
importlib.reload(macfp) # use for development (while making changes to macfp.py)
import matplotlib.pyplot as plt

macfp.dataplot(config_filename='FM_Burner_UNSW_cmp_config.csv',
institute='UNSW',
revision='MaCFP-3, Tsukuba, 2023',
expdir='../../../Experimental_Data/',
cmpdir='./Output/',
pltdir='./Plots/',
close_figs=True,
verbose=True,
plot_list=['all'])

# plt.show()
Loading

0 comments on commit d374e1d

Please sign in to comment.