Skip to content

Commit

Permalink
Merge pull request #12180 from rmcdermo/master
Browse files Browse the repository at this point in the history 
Workflows: fix line endings, add GitHub Actions check for line endings
  • Loading branch information
@rmcdermo
rmcdermo authored Oct 6, 2023
2 parents 8ba755c + 1bdf8bc commit 4261181
Show file tree
Hide file tree
Showing 6 changed files with 266 additions and 228 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/Line_Endings.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Firebot workflow

name: Line_Endings

# Controls when the workflow will run
on:
# Triggers the workflow on push or pull request events but only for the master branch
push:
pull_request:

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job called "build"
check-line-endings:
# The type of runner that the job will run on
runs-on: ubuntu-latest

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v4

- name: Check for CRLF line endings
run: |
{ grep -IUlr --exclude={"*.pdf","*.png"} --exclude-dir=".git" $'\r' > tmp.txt || true; }
nlines=$(cat tmp.txt | wc -l)
if [ $nlines -gt 0 ]; then
echo "text files with dos line endings:"
cat tmp.txt
exit 1
fi
98 changes: 49 additions & 49 deletions Validation/Aalto_Woods/FDS_Input_Files/Roomcorner_M12.fds
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
&HEAD CHID='Roomcorner_M12'/
&TIME T_END=240.0 /
&SURF ID = 'woodenwalls',
COLOR='SANDY BROWN'
STRETCH_FACTOR(1) = 1
STRETCH_FACTOR(2) = 1.5
DELTA_TMP_MAX = 100.
SUBSTEP_POWER = 3
N_LAYER_CELLS_MAX(1) = 625
N_LAYER_CELLS_MAX(2) = 50
CELL_SIZE_FACTOR = 0.2,
THICKNESS = 0.01,0.2
MINIMUM_LAYER_THICKNESS = 1E-10
BACKING='EXPOSED',
MATL_ID(1,:)='water','wood',
MATL_ID(2,1)='concrete',
MATL_MASS_FRACTION(1,:) = 0.09, 0.91 /
&VENT SURF_ID='burner'
XB = 0.0,0.2,0.0,0.2,0.0,0.0
IOR = 3/
&VENT SURF_ID='woodenwalls'
XB = 0.0,0.0,0.0,2.4,0.0,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,3.6,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,3.6,2.4,2.4,0.0,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,3.6,0.0,2.4,2.4,2.4 /
&VENT SURF_ID='concretewalls'
XB = 0.0,3.6,0.0,2.4,0.0,0.0 /
&VENT SURF_ID='OPEN'
XB = 5.3,5.3,0.0,2.4,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,2.4,2.4,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,0.0,2.4,2.4,2.4 /
&OBST XB=3.6,3.8,0,2.4,0,2.4, SURF_ID6='woodenwalls','concretewalls','INERT','INERT','INERT','INERT'/
&HOLE XB = 3.59,3.81,0.8,1.6,0,2.0 /
&CATF OTHER_FILES = 'spruce_roomcorner.txt','common_roomcorner.txt','output_roomcorner.txt' /
&HEAD CHID='Roomcorner_M12'/

&TIME T_END=240.0 /

&SURF ID = 'woodenwalls',
COLOR='SANDY BROWN'
STRETCH_FACTOR(1) = 1
STRETCH_FACTOR(2) = 1.5
DELTA_TMP_MAX = 100.
SUBSTEP_POWER = 3
N_LAYER_CELLS_MAX(1) = 625
N_LAYER_CELLS_MAX(2) = 50
CELL_SIZE_FACTOR = 0.2,
THICKNESS = 0.01,0.2
MINIMUM_LAYER_THICKNESS = 1E-10
BACKING='EXPOSED',
MATL_ID(1,:)='water','wood',
MATL_ID(2,1)='concrete',
MATL_MASS_FRACTION(1,:) = 0.09, 0.91 /

&VENT SURF_ID='burner'
XB = 0.0,0.2,0.0,0.2,0.0,0.0
IOR = 3/

&VENT SURF_ID='woodenwalls'
XB = 0.0,0.0,0.0,2.4,0.0,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,3.6,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,3.6,2.4,2.4,0.0,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,3.6,0.0,2.4,2.4,2.4 /
&VENT SURF_ID='concretewalls'
XB = 0.0,3.6,0.0,2.4,0.0,0.0 /
&VENT SURF_ID='OPEN'
XB = 5.3,5.3,0.0,2.4,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,2.4,2.4,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,0.0,2.4,2.4,2.4 /

&OBST XB=3.6,3.8,0,2.4,0,2.4, SURF_ID6='woodenwalls','concretewalls','INERT','INERT','INERT','INERT'/

&HOLE XB = 3.59,3.81,0.8,1.6,0,2.0 /

&CATF OTHER_FILES = 'spruce_roomcorner.txt','common_roomcorner.txt','output_roomcorner.txt' /

&TAIL/
150 changes: 75 additions & 75 deletions Validation/Aalto_Woods/FDS_Input_Files/Roomcorner_modified.fds
View file
Original file line number Diff line number Diff line change
@@ -1,76 +1,76 @@
&HEAD CHID='Roomcorner_modified'/
&TIME T_END=330.0 /
&SURF ID = 'woodenwalls',
COLOR='SANDY BROWN'
STRETCH_FACTOR(1) = 1
STRETCH_FACTOR(2) = 1.5
DELTA_TMP_MAX = 100.
SUBSTEP_POWER = 3
N_LAYER_CELLS_MAX(1) = 1375
N_LAYER_CELLS_MAX(2) = 50
CELL_SIZE_FACTOR = 0.2,
THICKNESS = 0.022,0.2
MINIMUM_LAYER_THICKNESS = 1E-10
BACKING='EXPOSED',
MATL_ID(1,:)='water','wood',
MATL_ID(2,1)='concrete',
MATL_MASS_FRACTION(1,:) = 0.09, 0.91 /
&VENT SURF_ID='burner'
XB = 0.0,0.2,0.0,0.2,0.0,0.0
IOR = 3/
&VENT SURF_ID='woodenwalls'
XB = 0.0,0.0,0.0,2.4,0.0,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,2.4,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='concretewalls'
XB = 2.4,3.6,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='concretewalls'
XB = 0.0,3.6,2.4,2.4,0.0,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,0.2,2.1,2.3,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,0.4,1.9,2.1,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,0.6,1.7,1.9,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,0.8,1.5,1.7,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,1.0,1.3,1.5,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,1.2,0.0,1.3,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,1.4,0.9,1.1,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,1.6,0.7,0.9,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,1.8,0.5,0.7,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,2.0,0.3,0.5,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,2.2,0.1,0.3,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,2.4,0.0,0.1,2.4,2.4 /
&VENT SURF_ID='concretewalls'
XB = 0.0,3.6,0.0,2.4,2.4,2.4 /
&VENT SURF_ID='concretewalls'
XB = 0.0,3.6,0.0,2.4,0.0,0.0 /
&VENT SURF_ID='OPEN'
XB = 5.3,5.3,0.0,2.4,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,2.4,2.4,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,0.0,2.4,2.4,2.4 /
&OBST XB=3.6,3.8,0,2.4,0,2.4, SURF_ID6='concretewalls','concretewalls','INERT','INERT','INERT','INERT'/
&HOLE XB = 3.59,3.81,0.8,1.6,0,2.0 /
&CATF OTHER_FILES = 'spruce_roomcorner.txt','common_roomcorner.txt','output_roomcorner.txt' /
&HEAD CHID='Roomcorner_modified'/

&TIME T_END=330.0 /

&SURF ID = 'woodenwalls',
COLOR='SANDY BROWN'
STRETCH_FACTOR(1) = 1
STRETCH_FACTOR(2) = 1.5
DELTA_TMP_MAX = 100.
SUBSTEP_POWER = 3
N_LAYER_CELLS_MAX(1) = 1375
N_LAYER_CELLS_MAX(2) = 50
CELL_SIZE_FACTOR = 0.2,
THICKNESS = 0.022,0.2
MINIMUM_LAYER_THICKNESS = 1E-10
BACKING='EXPOSED',
MATL_ID(1,:)='water','wood',
MATL_ID(2,1)='concrete',
MATL_MASS_FRACTION(1,:) = 0.09, 0.91 /

&VENT SURF_ID='burner'
XB = 0.0,0.2,0.0,0.2,0.0,0.0
IOR = 3/

&VENT SURF_ID='woodenwalls'
XB = 0.0,0.0,0.0,2.4,0.0,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,2.4,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='concretewalls'
XB = 2.4,3.6,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='concretewalls'
XB = 0.0,3.6,2.4,2.4,0.0,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,0.2,2.1,2.3,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,0.4,1.9,2.1,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,0.6,1.7,1.9,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,0.8,1.5,1.7,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,1.0,1.3,1.5,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 0.0,1.2,0.0,1.3,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,1.4,0.9,1.1,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,1.6,0.7,0.9,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,1.8,0.5,0.7,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,2.0,0.3,0.5,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,2.2,0.1,0.3,2.4,2.4 /
&VENT SURF_ID='woodenwalls'
XB = 1.2,2.4,0.0,0.1,2.4,2.4 /
&VENT SURF_ID='concretewalls'
XB = 0.0,3.6,0.0,2.4,2.4,2.4 /
&VENT SURF_ID='concretewalls'
XB = 0.0,3.6,0.0,2.4,0.0,0.0 /
&VENT SURF_ID='OPEN'
XB = 5.3,5.3,0.0,2.4,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,0.0,0.0,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,2.4,2.4,0.0,2.4 /
&VENT SURF_ID='OPEN'
XB = 3.8,5.3,0.0,2.4,2.4,2.4 /

&OBST XB=3.6,3.8,0,2.4,0,2.4, SURF_ID6='concretewalls','concretewalls','INERT','INERT','INERT','INERT'/

&HOLE XB = 3.59,3.81,0.8,1.6,0,2.0 /

&CATF OTHER_FILES = 'spruce_roomcorner.txt','common_roomcorner.txt','output_roomcorner.txt' /

&TAIL/
Loading

0 comments on commit 4261181

Please sign in to comment.