Merge pull request #370 from drjfloyd/master

UMD SBI - FSRI plots
MaCFP · Aug 21, 2023 · 28b28f0 · 28b28f0
2 parents cf3c3ad + 3c41945
commit 28b28f0
Show file tree

Hide file tree

Showing 54 changed files with 1,037 additions and 124 deletions.
diff --git a/.github/requirements.txt b/.github/requirements.txt
@@ -5,4 +5,6 @@
 numpy
 matplotlib
 pandas
+scipy
+seaborn
 
diff --git a/.github/workflows/Fire_Growth.yml b/.github/workflows/Fire_Growth.yml
@@ -90,3 +90,23 @@ jobs:
 
       # ADD YOUR INSTITUTION BELOW, COPY STEPS 1 AND 2, CHANGE INSTITUTE NAME (AFTER 2023 AND WITHIN ZIP FILENAME)
 
+# When submitting computational results, add your script to the list below (follow the example)
+
+      # Step 1: generate the plots
+      - name: FSRI Preliminary SBI Results
+        run: |
+          echo $GITHUB_WORKSPACE
+          cd $GITHUB_WORKSPACE/Fire_Growth/UMD_SBI/Computational_Results/2023/FSRI
+          python FSRI_SBI_plot_cmp.py
+
+      # Step 2: push the plots to the releases page
+      - name: Push FSRI Results to release
+        if: github.event_name == 'push' && github.repository_owner == 'MaCFP'
+        run: |
+          cd $GITHUB_WORKSPACE/Fire_Growth/UMD_SBI/Computational_Results/2023/FSRI
+          cp README.md Plots/.
+          zip Plots.zip -r Plots
+          mv Plots.zip UMB_SBI_FSRI_Plots.zip
+          gh release upload SCRIPT_FIGURES UMD_SBI_FSRI_Plots.zip --clobber
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/Fire_Growth/UMD_SBI/Computational_Results/2023/FSRI/FSRI_SBI_cmp_config.csv b/Fire_Growth/UMD_SBI/Computational_Results/2023/FSRI/FSRI_SBI_cmp_config.csv
diff --git a/Fire_Growth/UMD_SBI/Computational_Results/2023/FSRI/FSRI_SBI_plot_cmp.py b/Fire_Growth/UMD_SBI/Computational_Results/2023/FSRI/FSRI_SBI_plot_cmp.py
@@ -0,0 +1,23 @@
+#!/usr/bin/env python3
+# McGrattan
+# Aug 2023
+
+import sys
+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='FSRI_SBI_cmp_config.csv',
+               institute='FSRI',
+               revision='MaCFP-3, Tsukuba, 2023',
+               expdir='../../../Experimental_Data/',
+               cmpdir='./',
+               pltdir='./Plots/',
+               close_figs=True,
+               verbose=True,
+               plot_list=['all'])
+
+# plt.show()
diff --git a/Fire_Growth/UMD_SBI/Computational_Results/2023/FSRI/Plots/.gitignore b/Fire_Growth/UMD_SBI/Computational_Results/2023/FSRI/Plots/.gitignore
diff --git a/...tational_Results/2023/NIST-FSRI/README.md → ...Computational_Results/2023/FSRI/README.md b/...tational_Results/2023/NIST-FSRI/README.md → ...Computational_Results/2023/FSRI/README.md
diff --git a/...esults_Other_Props/1_cm/sbi_1cm_Aalto.fds → ...esults_Other_Props/1_cm/sbi_1cm_Aalto.fds b/...esults_Other_Props/1_cm/sbi_1cm_Aalto.fds → ...esults_Other_Props/1_cm/sbi_1cm_Aalto.fds
diff --git a/...s_Other_Props/1_cm/sbi_1cm_Aalto_devc.csv → ...s_Other_Props/1_cm/sbi_1cm_Aalto_devc.csv b/...s_Other_Props/1_cm/sbi_1cm_Aalto_devc.csv → ...s_Other_Props/1_cm/sbi_1cm_Aalto_devc.csv
diff --git a/...s_Other_Props/1_cm/sbi_1cm_Aalto_line.csv → ...s_Other_Props/1_cm/sbi_1cm_Aalto_line.csv b/...s_Other_Props/1_cm/sbi_1cm_Aalto_line.csv → ...s_Other_Props/1_cm/sbi_1cm_Aalto_line.csv
diff --git a/...lts_Other_Props/1_cm/sbi_1cm_NIST2021.fds → ...lts_Other_Props/1_cm/sbi_1cm_NIST2021.fds b/...lts_Other_Props/1_cm/sbi_1cm_NIST2021.fds → ...lts_Other_Props/1_cm/sbi_1cm_NIST2021.fds
diff --git a/...ther_Props/1_cm/sbi_1cm_NIST2021_devc.csv → ...ther_Props/1_cm/sbi_1cm_NIST2021_devc.csv b/...ther_Props/1_cm/sbi_1cm_NIST2021_devc.csv → ...ther_Props/1_cm/sbi_1cm_NIST2021_devc.csv
diff --git a/...ther_Props/1_cm/sbi_1cm_NIST2021_line.csv → ...ther_Props/1_cm/sbi_1cm_NIST2021_line.csv b/...ther_Props/1_cm/sbi_1cm_NIST2021_line.csv → ...ther_Props/1_cm/sbi_1cm_NIST2021_line.csv
diff --git a/...esults_Other_Props/2_cm/sbi_2cm_Aalto.fds → ...esults_Other_Props/2_cm/sbi_2cm_Aalto.fds b/...esults_Other_Props/2_cm/sbi_2cm_Aalto.fds → ...esults_Other_Props/2_cm/sbi_2cm_Aalto.fds
diff --git a/...s_Other_Props/2_cm/sbi_2cm_Aalto_devc.csv → ...s_Other_Props/2_cm/sbi_2cm_Aalto_devc.csv b/...s_Other_Props/2_cm/sbi_2cm_Aalto_devc.csv → ...s_Other_Props/2_cm/sbi_2cm_Aalto_devc.csv
diff --git a/...s_Other_Props/2_cm/sbi_2cm_Aalto_line.csv → ...s_Other_Props/2_cm/sbi_2cm_Aalto_line.csv b/...s_Other_Props/2_cm/sbi_2cm_Aalto_line.csv → ...s_Other_Props/2_cm/sbi_2cm_Aalto_line.csv
diff --git a/.../Results_Other_Props/2_cm/sbi_2cm_BUW.fds → .../Results_Other_Props/2_cm/sbi_2cm_BUW.fds b/.../Results_Other_Props/2_cm/sbi_2cm_BUW.fds → .../Results_Other_Props/2_cm/sbi_2cm_BUW.fds
diff --git a/...lts_Other_Props/2_cm/sbi_2cm_BUW_devc.csv → ...lts_Other_Props/2_cm/sbi_2cm_BUW_devc.csv b/...lts_Other_Props/2_cm/sbi_2cm_BUW_devc.csv → ...lts_Other_Props/2_cm/sbi_2cm_BUW_devc.csv
diff --git a/...lts_Other_Props/2_cm/sbi_2cm_BUW_line.csv → ...lts_Other_Props/2_cm/sbi_2cm_BUW_line.csv b/...lts_Other_Props/2_cm/sbi_2cm_BUW_line.csv → ...lts_Other_Props/2_cm/sbi_2cm_BUW_line.csv
diff --git a/.../Results_Other_Props/2_cm/sbi_2cm_DBI.fds → .../Results_Other_Props/2_cm/sbi_2cm_DBI.fds b/.../Results_Other_Props/2_cm/sbi_2cm_DBI.fds → .../Results_Other_Props/2_cm/sbi_2cm_DBI.fds
diff --git a/...lts_Other_Props/2_cm/sbi_2cm_DBI_devc.csv → ...lts_Other_Props/2_cm/sbi_2cm_DBI_devc.csv b/...lts_Other_Props/2_cm/sbi_2cm_DBI_devc.csv → ...lts_Other_Props/2_cm/sbi_2cm_DBI_devc.csv
diff --git a/...lts_Other_Props/2_cm/sbi_2cm_DBI_line.csv → ...lts_Other_Props/2_cm/sbi_2cm_DBI_line.csv b/...lts_Other_Props/2_cm/sbi_2cm_DBI_line.csv → ...lts_Other_Props/2_cm/sbi_2cm_DBI_line.csv
diff --git a/...sults_Other_Props/2_cm/sbi_2cm_GiHaze.fds → ...sults_Other_Props/2_cm/sbi_2cm_GiHaze.fds b/...sults_Other_Props/2_cm/sbi_2cm_GiHaze.fds → ...sults_Other_Props/2_cm/sbi_2cm_GiHaze.fds
diff --git a/..._Other_Props/2_cm/sbi_2cm_GiHaze_devc.csv → ..._Other_Props/2_cm/sbi_2cm_GiHaze_devc.csv b/..._Other_Props/2_cm/sbi_2cm_GiHaze_devc.csv → ..._Other_Props/2_cm/sbi_2cm_GiHaze_devc.csv
diff --git a/..._Other_Props/2_cm/sbi_2cm_GiHaze_line.csv → ..._Other_Props/2_cm/sbi_2cm_GiHaze_line.csv b/..._Other_Props/2_cm/sbi_2cm_GiHaze_line.csv → ..._Other_Props/2_cm/sbi_2cm_GiHaze_line.csv
diff --git a/...ts_Other_Props/2_cm/sbi_2cm_NIST_2021.fds → ...ts_Other_Props/2_cm/sbi_2cm_NIST_2021.fds b/...ts_Other_Props/2_cm/sbi_2cm_NIST_2021.fds → ...ts_Other_Props/2_cm/sbi_2cm_NIST_2021.fds
diff --git a/...her_Props/2_cm/sbi_2cm_NIST_2021_devc.csv → ...her_Props/2_cm/sbi_2cm_NIST_2021_devc.csv b/...her_Props/2_cm/sbi_2cm_NIST_2021_devc.csv → ...her_Props/2_cm/sbi_2cm_NIST_2021_devc.csv
diff --git a/...her_Props/2_cm/sbi_2cm_NIST_2021_line.csv → ...her_Props/2_cm/sbi_2cm_NIST_2021_line.csv b/...her_Props/2_cm/sbi_2cm_NIST_2021_line.csv → ...her_Props/2_cm/sbi_2cm_NIST_2021_line.csv
diff --git a/...ts_Other_Props/2_cm/sbi_2cm_NIST_StMU.fds → ...ts_Other_Props/2_cm/sbi_2cm_NIST_StMU.fds b/...ts_Other_Props/2_cm/sbi_2cm_NIST_StMU.fds → ...ts_Other_Props/2_cm/sbi_2cm_NIST_StMU.fds
diff --git a/...her_Props/2_cm/sbi_2cm_NIST_StMU_devc.csv → ...her_Props/2_cm/sbi_2cm_NIST_StMU_devc.csv b/...her_Props/2_cm/sbi_2cm_NIST_StMU_devc.csv → ...her_Props/2_cm/sbi_2cm_NIST_StMU_devc.csv
diff --git a/...Results_Other_Props/2_cm/sbi_2cm_UMET.fds → ...Results_Other_Props/2_cm/sbi_2cm_UMET.fds b/...Results_Other_Props/2_cm/sbi_2cm_UMET.fds → ...Results_Other_Props/2_cm/sbi_2cm_UMET.fds
diff --git a/...ts_Other_Props/2_cm/sbi_2cm_UMET_devc.csv → ...ts_Other_Props/2_cm/sbi_2cm_UMET_devc.csv b/...ts_Other_Props/2_cm/sbi_2cm_UMET_devc.csv → ...ts_Other_Props/2_cm/sbi_2cm_UMET_devc.csv
diff --git a/...ts_Other_Props/2_cm/sbi_2cm_UMET_line.csv → ...ts_Other_Props/2_cm/sbi_2cm_UMET_line.csv b/...ts_Other_Props/2_cm/sbi_2cm_UMET_line.csv → ...ts_Other_Props/2_cm/sbi_2cm_UMET_line.csv
diff --git a/...3/NIST-FSRI/Results_UMD_Props/sbi_1cm.fds → ...s/2023/FSRI/Results_UMD_Props/sbi_1cm.fds b/...3/NIST-FSRI/Results_UMD_Props/sbi_1cm.fds → ...s/2023/FSRI/Results_UMD_Props/sbi_1cm.fds
diff --git a/...T-FSRI/Results_UMD_Props/sbi_1cm_devc.csv → ...3/FSRI/Results_UMD_Props/sbi_1cm_devc.csv b/...T-FSRI/Results_UMD_Props/sbi_1cm_devc.csv → ...3/FSRI/Results_UMD_Props/sbi_1cm_devc.csv
diff --git a/...T-FSRI/Results_UMD_Props/sbi_1cm_line.csv → ...3/FSRI/Results_UMD_Props/sbi_1cm_line.csv b/...T-FSRI/Results_UMD_Props/sbi_1cm_line.csv → ...3/FSRI/Results_UMD_Props/sbi_1cm_line.csv
diff --git a/...3/NIST-FSRI/Results_UMD_Props/sbi_2cm.fds → ...s/2023/FSRI/Results_UMD_Props/sbi_2cm.fds b/...3/NIST-FSRI/Results_UMD_Props/sbi_2cm.fds → ...s/2023/FSRI/Results_UMD_Props/sbi_2cm.fds
diff --git a/...T-FSRI/Results_UMD_Props/sbi_2cm_devc.csv → ...3/FSRI/Results_UMD_Props/sbi_2cm_devc.csv b/...T-FSRI/Results_UMD_Props/sbi_2cm_devc.csv → ...3/FSRI/Results_UMD_Props/sbi_2cm_devc.csv
diff --git a/...T-FSRI/Results_UMD_Props/sbi_2cm_line.csv → ...3/FSRI/Results_UMD_Props/sbi_2cm_line.csv b/...T-FSRI/Results_UMD_Props/sbi_2cm_line.csv → ...3/FSRI/Results_UMD_Props/sbi_2cm_line.csv
diff --git a/...3/NIST-FSRI/Results_UMD_Props/sbi_4cm.fds → ...s/2023/FSRI/Results_UMD_Props/sbi_4cm.fds b/...3/NIST-FSRI/Results_UMD_Props/sbi_4cm.fds → ...s/2023/FSRI/Results_UMD_Props/sbi_4cm.fds
diff --git a/...T-FSRI/Results_UMD_Props/sbi_4cm_devc.csv → ...3/FSRI/Results_UMD_Props/sbi_4cm_devc.csv b/...T-FSRI/Results_UMD_Props/sbi_4cm_devc.csv → ...3/FSRI/Results_UMD_Props/sbi_4cm_devc.csv
diff --git a/...T-FSRI/Results_UMD_Props/sbi_4cm_line.csv → ...3/FSRI/Results_UMD_Props/sbi_4cm_line.csv b/...T-FSRI/Results_UMD_Props/sbi_4cm_line.csv → ...3/FSRI/Results_UMD_Props/sbi_4cm_line.csv
diff --git a/.../NIST-FSRI/Results_UMD_Props/sbi_p5cm.fds → .../2023/FSRI/Results_UMD_Props/sbi_p5cm.fds b/.../NIST-FSRI/Results_UMD_Props/sbi_p5cm.fds → .../2023/FSRI/Results_UMD_Props/sbi_p5cm.fds
diff --git a/...-FSRI/Results_UMD_Props/sbi_p5cm_devc.csv → .../FSRI/Results_UMD_Props/sbi_p5cm_devc.csv b/...-FSRI/Results_UMD_Props/sbi_p5cm_devc.csv → .../FSRI/Results_UMD_Props/sbi_p5cm_devc.csv
diff --git a/...-FSRI/Results_UMD_Props/sbi_p5cm_line.csv → .../FSRI/Results_UMD_Props/sbi_p5cm_line.csv b/...-FSRI/Results_UMD_Props/sbi_p5cm_line.csv → .../FSRI/Results_UMD_Props/sbi_p5cm_line.csv
diff --git a/.../Results_UMD__Props_Blowing/sbi_2cm_h.fds → ...I/Results_UMD_Props_Blowing/sbi_2cm_h.fds b/.../Results_UMD__Props_Blowing/sbi_2cm_h.fds → ...I/Results_UMD_Props_Blowing/sbi_2cm_h.fds
diff --git a/...lts_UMD__Props_Blowing/sbi_2cm_h_devc.csv → ...ults_UMD_Props_Blowing/sbi_2cm_h_devc.csv b/...lts_UMD__Props_Blowing/sbi_2cm_h_devc.csv → ...ults_UMD_Props_Blowing/sbi_2cm_h_devc.csv
diff --git a/...lts_UMD__Props_Blowing/sbi_2cm_h_line.csv → ...ults_UMD_Props_Blowing/sbi_2cm_h_line.csv b/...lts_UMD__Props_Blowing/sbi_2cm_h_line.csv → ...ults_UMD_Props_Blowing/sbi_2cm_h_line.csv
diff --git a/...esults_UMD_Props_Cone_Flux/sbi_2cm_hf.fds → ...esults_UMD_Props_Cone_Flux/sbi_2cm_hf.fds b/...esults_UMD_Props_Cone_Flux/sbi_2cm_hf.fds → ...esults_UMD_Props_Cone_Flux/sbi_2cm_hf.fds
@@ -1,4 +1,4 @@
-&HEAD CHID='sbi_2cm'/
+&HEAD CHID='sbi_2cm_hf'/
 
 &MESH XB=-0.60, 0.40,-0.80, 0.20,-0.18,0.52,IJK=50,50,35,MULT_ID='M1'/
 &MULT ID='M1',DX=1.0,DY=1.0,DZ=0.7,I_UPPER=1,J_UPPER=1,K_UPPER=3/

diff --git a/...ults_UMD_Props_Cone_Flux/sbi_2cm_devc.csv → ...s_UMD_Props_Cone_Flux/sbi_2cm_hf_devc.csv b/...ults_UMD_Props_Cone_Flux/sbi_2cm_devc.csv → ...s_UMD_Props_Cone_Flux/sbi_2cm_hf_devc.csv
diff --git a/...ults_UMD_Props_Cone_Flux/sbi_2cm_line.csv → ...s_UMD_Props_Cone_Flux/sbi_2cm_hf_line.csv b/...ults_UMD_Props_Cone_Flux/sbi_2cm_line.csv → ...s_UMD_Props_Cone_Flux/sbi_2cm_hf_line.csv
diff --git a/...esults_UMD_Props_Cone_Flux/sbi_4cm_hf.fds → ...esults_UMD_Props_Cone_Flux/sbi_4cm_hf.fds b/...esults_UMD_Props_Cone_Flux/sbi_4cm_hf.fds → ...esults_UMD_Props_Cone_Flux/sbi_4cm_hf.fds
@@ -1,4 +1,4 @@
-&HEAD CHID='sbi_4cm'/
+&HEAD CHID='sbi_4cm_hf'/
 
 &MESH XB=-0.60, 1.40,-0.80, 1.20,-0.20,2.60,IJK=50,50,70/
 

diff --git a/...ults_UMD_Props_Cone_Flux/sbi_4cm_devc.csv → ...s_UMD_Props_Cone_Flux/sbi_4cm_hf_devc.csv b/...ults_UMD_Props_Cone_Flux/sbi_4cm_devc.csv → ...s_UMD_Props_Cone_Flux/sbi_4cm_hf_devc.csv
diff --git a/...ults_UMD_Props_Cone_Flux/sbi_4cm_line.csv → ...s_UMD_Props_Cone_Flux/sbi_4cm_hf_line.csv b/...ults_UMD_Props_Cone_Flux/sbi_4cm_line.csv → ...s_UMD_Props_Cone_Flux/sbi_4cm_hf_line.csv
diff --git a/Utilities/macfp.py b/Utilities/macfp.py