Skip to content

Commit 9dfd853

Browse files
nwagenbrennernwagenbrenner
committed
Merge branch 'master' of github.com:firelab/windninja
2 parents cec7b9d + 9d91fe1 commit 9dfd853

51 files changed

Lines changed: 5197 additions & 45 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/testing.yml‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,27 @@ jobs:
5454
libopenjp2-7-dev \
5555
libtiff-dev
5656
# sudo make poppler, proj, and gdal
57-
cd ${{github.workspace}}/scripts/poppler-22.02.0
57+
cd ${{github.workspace}}/scripts/poppler-22.02.0/build
5858
sudo make install
5959
cd ${{github.workspace}}/scripts/proj-8.2.1
6060
sudo make install
6161
cd ${{github.workspace}}/scripts/gdal-3.4.1
6262
sudo make install
63+
# Add qt4 libs from ppa
64+
# See here for more info:
65+
# https://ubuntuhandbook.org/index.php/2020/07/install-qt4-ubuntu-20-04/
66+
sudo add-apt-repository ppa:ubuntuhandbook1/ppa
67+
sudo apt update
68+
sudo apt install -y libqt4-dev libqtwebkit-dev
69+
# Use OpenFOAM 9; OpenFOAM 8 not available for Ubuntu 22.04
70+
# add the dl.openfoam.org repo and install OpenFOAM 9
71+
sudo sh -c "wget -O - https://dl.openfoam.org/gpg.key > /etc/apt/trusted.gpg.d/openfoam.asc"
72+
sudo add-apt-repository http://dl.openfoam.org/ubuntu
73+
sudo apt update
74+
sudo apt install -y openfoam9
75+
echo "source /opt/openfoam9/etc/bashrc" >> ~/.bashrc
76+
# return to start directory
77+
cd ${{github.workspace}}
6378
6479
- name: make build directory
6580
run: mkdir build

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ WindNinja
66
WindNinja is a diagnostic wind model developed for use in wildland fire modeling.
77

88
Web:
9-
http://firelab.org/project/windninja
9+
https://ninjastorm.firelab.org/windninja/
1010

1111
Source & wiki:
1212
https://github.com/firelab/windninja

‎data/ninjafoam/9/0/T‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
/*--------------------------------*- C++ -*----------------------------------*\
2+
========= |
3+
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
4+
\\ / O peration | Website: https://openfoam.org
5+
\\ / A nd | Version: 8
6+
\\/ M anipulation |
7+
\*---------------------------------------------------------------------------*/
8+
FoamFile
9+
{
10+
version 2.0;
11+
format ascii;
12+
class volScalarField;
13+
location "0";
14+
object T;
15+
}
16+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
17+
18+
dimensions [0 0 0 1 0 0 0];
19+
20+
internalField uniform 0;
21+
22+
boundaryField
23+
{
24+
north_face
25+
{
26+
type fixedValue;
27+
value uniform 1;
28+
}
29+
30+
west_face
31+
{
32+
type zeroGradient;
33+
}
34+
35+
east_face
36+
{
37+
type zeroGradient;
38+
}
39+
40+
south_face
41+
{
42+
type zeroGradient;
43+
}
44+
45+
minZ
46+
{
47+
type zeroGradient;
48+
}
49+
50+
maxZ
51+
{
52+
type zeroGradient;
53+
}
54+
}
55+
56+
57+
// ************************************************************************* //

‎data/ninjafoam/9/0/U‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*--------------------------------*- C++ -*----------------------------------*\
2+
========= |
3+
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
4+
\\ / O peration | Website: https://openfoam.org
5+
\\ / A nd | Version: 8
6+
\\/ M anipulation |
7+
\*---------------------------------------------------------------------------*/
8+
FoamFile
9+
{
10+
version 2.0;
11+
format ascii;
12+
class volVectorField;
13+
location "0";
14+
object U;
15+
}
16+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
17+
18+
dimensions [0 1 -1 0 0 0 0];
19+
20+
internalField uniform (0 0 0);
21+
22+
boundaryField
23+
{
24+
$boundaryField$
25+
minZ
26+
{
27+
type fixedValue;
28+
value uniform (0 0 0);
29+
}
30+
maxZ
31+
{
32+
type zeroGradient;
33+
}
34+
}
35+
36+
37+
// ************************************************************************* //

‎data/ninjafoam/9/0/epsilon‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
/*--------------------------------*- C++ -*----------------------------------*\
2+
========= |
3+
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
4+
\\ / O peration | Website: https://openfoam.org
5+
\\ / A nd | Version: 8
6+
\\/ M anipulation |
7+
\*---------------------------------------------------------------------------*/
8+
FoamFile
9+
{
10+
version 2.0;
11+
format ascii;
12+
class volScalarField;
13+
location "0";
14+
object epsilon;
15+
}
16+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
17+
18+
dimensions [0 2 -3 0 0 0 0];
19+
20+
internalField uniform 1;
21+
22+
boundaryField
23+
{
24+
$boundaryField$
25+
minZ
26+
{
27+
type epsilonWallFunction;
28+
Cmu 0.09;
29+
kappa 0.41;
30+
E 9.8;
31+
value uniform 1;
32+
}
33+
maxZ
34+
{
35+
type zeroGradient;
36+
}
37+
}
38+
39+
40+
// ************************************************************************* //

‎data/ninjafoam/9/0/genericType-kep.tmp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
$boundary_name$
2+
{
3+
type $type$;
4+
5+
}

‎data/ninjafoam/9/0/genericType.tmp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
$boundary_name$
2+
{
3+
type $type$;
4+
value uniform $inletoutletvalue$;
5+
}

‎data/ninjafoam/9/0/genericTypeVal.tmp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
$boundary_name$
2+
{
3+
type $type$;
4+
value uniform $value$;
5+
gamma $gammavalue$;
6+
p0 uniform $pvalue$;
7+
}

‎data/ninjafoam/9/0/inlet.tmp‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
$boundary_name$
2+
{
3+
type $type$;
4+
UfreeStream $U_freestream$;
5+
uDirection $direction$;
6+
inputWindHeight_Veg $InputWindHeight$;
7+
z0 $z0$;
8+
Rd $Rd$;
9+
firstCellHeight -9999.9;
10+
}

‎data/ninjafoam/9/0/k‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*--------------------------------*- C++ -*----------------------------------*\
2+
========= |
3+
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
4+
\\ / O peration | Website: https://openfoam.org
5+
\\ / A nd | Version: 8
6+
\\/ M anipulation |
7+
\*---------------------------------------------------------------------------*/
8+
FoamFile
9+
{
10+
version 2.0;
11+
format ascii;
12+
class volScalarField;
13+
location "0";
14+
object k;
15+
}
16+
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
17+
18+
dimensions [0 2 -2 0 0 0 0];
19+
20+
internalField uniform 50;
21+
22+
boundaryField
23+
{
24+
$boundaryField$
25+
minZ
26+
{
27+
type kqRWallFunction;
28+
value uniform 0.1;
29+
}
30+
maxZ
31+
{
32+
type zeroGradient;
33+
}
34+
}
35+
36+
37+
// ************************************************************************* //

0 commit comments

Comments
 (0)