From 664ae668d2601882d52a028dfe1ceab510595ce1 Mon Sep 17 00:00:00 2001 From: Hostikka Simo Date: Fri, 29 Nov 2019 17:25:37 +0200 Subject: [PATCH] Fix bug in christifire.m validation script --- Utilities/Matlab/scripts/christifire.m | 34 +++++++++++++------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/Utilities/Matlab/scripts/christifire.m b/Utilities/Matlab/scripts/christifire.m index 5a799d0e922..c34b90364c2 100644 --- a/Utilities/Matlab/scripts/christifire.m +++ b/Utilities/Matlab/scripts/christifire.m @@ -12,70 +12,70 @@ % Set global reaction rate parameters expdir = '../../../exp/CHRISTIFIRE/'; -outdir = '../../../out/CHRISTIFIRE/FDS_Output_Files/'; +outdir = '../../../out/CHRISTIFIRE/'; skip_case = 0; -if ~exist([outdir 'CHRISTIFIRE_S701_tga_N2_v1_devc.csv']) +if ~exist([outdir,'CHRISTIFIRE_S701_tga_N2_v1_devc.csv']) display('Error: File CHRISTIFIRE_S701_tga_N2_v1_devc.csv does not exist. Skipping case.') skip_case = 1; end -if ~exist([outdir 'CHRISTIFIRE_S701_tga_N2_v2_devc.csv']) +if ~exist([outdir,'CHRISTIFIRE_S701_tga_N2_v2_devc.csv']) display('Error: File CHRISTIFIRE_S701_tga_N2_v2_devc.csv does not exist. Skipping case.') skip_case = 1; end -if ~exist([outdir 'CHRISTIFIRE_S701_tga_air_v1_devc.csv']) +if ~exist([outdir,'CHRISTIFIRE_S701_tga_air_v1_devc.csv']) display('Error: File CHRISTIFIRE_S701_tga_air_v1_devc.csv does not exist. Skipping case.') skip_case = 1; end -if ~exist([outdir 'CHRISTIFIRE_S701_tga_air_v2_devc.csv']) +if ~exist([outdir,'CHRISTIFIRE_S701_tga_air_v2_devc.csv']) display('Error: File CHRISTIFIRE_S701_tga_air_v2_devc.csv does not exist. Skipping case.') skip_case = 1; end -if ~exist([outdir 'CHRISTIFIRE_S701_mcc_v1_devc.csv']) +if ~exist([outdir,'CHRISTIFIRE_S701_mcc_v1_devc.csv']) display('Error: File CHRISTIFIRE_S701_mcc_v1_devc.csv does not exist. Skipping case.') skip_case = 1; end -if ~exist([outdir 'CHRISTIFIRE_S701_mcc_v2_devc.csv']) +if ~exist([outdir,'CHRISTIFIRE_S701_mcc_v2_devc.csv']) display('Error: File CHRISTIFIRE_S701_mcc_v2_devc.csv does not exist. Skipping case.') skip_case = 1; end -if ~exist([outdir 'CHRISTIFIRE_I701_tga_N2_v1_devc.csv']) +if ~exist([outdir,'CHRISTIFIRE_I701_tga_N2_v1_devc.csv']) display('Error: File CHRISTIFIRE_I701_tga_N2_v1_devc.csv does not exist. Skipping case.') skip_case = 1; end -if ~exist([outdir 'CHRISTIFIRE_I701_tga_N2_v2_devc.csv']) +if ~exist([outdir,'CHRISTIFIRE_I701_tga_N2_v2_devc.csv']) display('Error: File CHRISTIFIRE_I701_tga_N2_v2_devc.csv does not exist. Skipping case.') skip_case = 1; end -if ~exist([outdir 'CHRISTIFIRE_I701_mcc_v1_devc.csv']) +if ~exist([outdir,'CHRISTIFIRE_I701_mcc_v1_devc.csv']) display('Error: File CHRISTIFIRE_I701_mcc_v1_devc.csv does not exist. Skipping case.') skip_case = 1; end -if ~exist([outdir 'CHRISTIFIRE_I701_mcc_v2_devc.csv']) +if ~exist([outdir,'CHRISTIFIRE_I701_mcc_v2_devc.csv']) display('Error: File CHRISTIFIRE_I701_mcc_v2_devc.csv does not exist. Skipping case.') skip_case = 1; end -if ~exist([outdir 'CHRISTIFIRE_C701_cone_25_v1_devc.csv']) +if ~exist([outdir,'CHRISTIFIRE_C701_cone_25_v1_devc.csv']) display('Error: File CHRISTIFIRE_C701_cone_25_v1_devc.csv does not exist. Skipping case.') skip_case = 1; end -if ~exist([outdir 'CHRISTIFIRE_C701_cone_50_v1_devc.csv']) +if ~exist([outdir,'CHRISTIFIRE_C701_cone_50_v1_devc.csv']) display('Error: File CHRISTIFIRE_C701_cone_50_v1_devc.csv does not exist. Skipping case.') skip_case = 1; end -if ~exist([outdir 'CHRISTIFIRE_C701_cone_75_v1_devc.csv']) +if ~exist([outdir,'CHRISTIFIRE_C701_cone_75_v1_devc.csv']) display('Error: File CHRISTIFIRE_C701_cone_75_v1_devc.csv does not exist. Skipping case.') skip_case = 1; end -if ~exist([outdir 'CHRISTIFIRE_C701_cone_25_v2_devc.csv']) +if ~exist([outdir,'CHRISTIFIRE_C701_cone_25_v2_devc.csv']) display('Error: File CHRISTIFIRE_C701_cone_25_v2_devc.csv does not exist. Skipping case.') skip_case = 1; end -if ~exist([outdir 'CHRISTIFIRE_C701_cone_50_v2_devc.csv']) +if ~exist([outdir,'CHRISTIFIRE_C701_cone_50_v2_devc.csv']) display('Error: File CHRISTIFIRE_C701_cone_50_v2_devc.csv does not exist. Skipping case.') skip_case = 1; end -if ~exist([outdir 'CHRISTIFIRE_C701_cone_75_v2_devc.csv']) +if ~exist([outdir,'CHRISTIFIRE_C701_cone_75_v2_devc.csv']) display('Error: File CHRISTIFIRE_C701_cone_75_v2_devc.csv does not exist. Skipping case.') skip_case = 1; end