Skip to content

Commit a762858

Browse files
committed
Merge branch 'develop'
Adding reacting flow capability
2 parents fe4c379 + b5a943a commit a762858

Some content is hidden

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

45 files changed

+1450
-258
lines changed

.appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ platform: x64
99
environment:
1010
PYTHON: C:\Python35-x64
1111
PATH: C:\Program Files\Project\bin;C:\Program Files\Microsoft MPI\Bin;%PATH%
12-
AITHER_FLUID_DATABASE: C:\Program Files\Project\fluidDatabase
12+
AITHER_INSTALL_DIRECTORY: C:\Program Files\Project
1313
build_script:
1414
- ps: >-
1515
powershell ci\appveyor\installMPI.ps1

.travis.yml

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ matrix:
2727
- CXX_COMPILER=g++-5
2828
- C_COMPILER=gcc-5
2929
- BUILD_TYPE=release
30-
- AITHER_FLUID_DATABASE=$TRAVIS_BUILD_DIR/build/install/fluidDatabase
30+
- AITHER_INSTALL_DIRECTORY=$TRAVIS_BUILD_DIR/build/install
3131
- os: linux
3232
dist: trusty
3333
sudo: required
@@ -42,7 +42,7 @@ matrix:
4242
- CXX_COMPILER=g++-6
4343
- C_COMPILER=gcc-6
4444
- BUILD_TYPE=debug
45-
- AITHER_FLUID_DATABASE=$TRAVIS_BUILD_DIR/build/install/fluidDatabase
45+
- AITHER_INSTALL_DIRECTORY=$TRAVIS_BUILD_DIR/build/install
4646
- os: linux
4747
dist: trusty
4848
sudo: required
@@ -57,7 +57,22 @@ matrix:
5757
- CXX_COMPILER=g++-7
5858
- C_COMPILER=gcc-7
5959
- BUILD_TYPE=release
60-
- AITHER_FLUID_DATABASE=$TRAVIS_BUILD_DIR/build/install/fluidDatabase
60+
- AITHER_INSTALL_DIRECTORY=$TRAVIS_BUILD_DIR/build/install
61+
- os: linux
62+
dist: trusty
63+
sudo: required
64+
compiler: gcc
65+
addons:
66+
apt:
67+
sources:
68+
- ubuntu-toolchain-r-test
69+
packages:
70+
- g++-8 gcc-8 libstdc++-8-dev
71+
env:
72+
- CXX_COMPILER=g++-8
73+
- C_COMPILER=gcc-8
74+
- BUILD_TYPE=release
75+
- AITHER_INSTALL_DIRECTORY=$TRAVIS_BUILD_DIR/build/install
6176
- os: linux
6277
dist: trusty
6378
sudo: required
@@ -73,17 +88,17 @@ matrix:
7388
- CXX_COMPILER=clang++-3.8
7489
- C_COMPILER=clang-3.8
7590
- BUILD_TYPE=release
76-
- AITHER_FLUID_DATABASE=$TRAVIS_BUILD_DIR/build/install/fluidDatabase
91+
- AITHER_INSTALL_DIRECTORY=$TRAVIS_BUILD_DIR/build/install
7792
- os: osx
7893
osx_image: xcode8
7994
compiler: gcc
8095
env:
81-
- CXX_COMPILER=g++-7
82-
- C_COMPILER=gcc-7
83-
- HOMEBREW_CC=gcc-7
84-
- HOMEBREW_CXX=g++-7
96+
- CXX_COMPILER=g++-8
97+
- C_COMPILER=gcc-8
98+
- HOMEBREW_CC=gcc-8
99+
- HOMEBREW_CXX=g++-8
85100
- BUILD_TYPE=release
86-
- AITHER_FLUID_DATABASE=$TRAVIS_BUILD_DIR/build/install/fluidDatabase
101+
- AITHER_INSTALL_DIRECTORY=$TRAVIS_BUILD_DIR/build/install
87102
- os: osx
88103
osx_image: xcode8
89104
compiler: clang
@@ -93,14 +108,15 @@ matrix:
93108
- HOMEBREW_CC=clang
94109
- HOMEBREW_CXX=clang++
95110
- BUILD_TYPE=release
96-
- AITHER_FLUID_DATABASE=$TRAVIS_BUILD_DIR/build/install/fluidDatabase
111+
- AITHER_INSTALL_DIRECTORY=$TRAVIS_BUILD_DIR/build/install
97112

98113
# upgrade packages
99114
before_install:
100115
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
101116
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y python3; fi
102117
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
103-
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gcc python3; fi
118+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew upgrade python; fi
119+
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gcc; fi
104120
- test -n $CC && unset CC
105121
- test -n $CXX && unset CXX
106122
- which $CXX_COMPILER

README.md

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,36 @@
66
| Develop | [![Build Status](https://travis-ci.org/mnucci32/aither.svg?branch=develop)](https://travis-ci.org/mnucci32/aither) | [![Build status](https://ci.appveyor.com/api/projects/status/o7fc231lp9jxlsib/branch/develop?svg=true)](https://ci.appveyor.com/project/mnucci32/aither/branch/develop) | [![Coverage Status](https://codecov.io/github/mnucci32/aither/coverage.svg?branch=develop)](https://codecov.io/github/mnucci32/aither?branch=develop) |
77

88
### About The Code
9-
This code is for a 3D Navier-Stokes computational fluid dynamics solver. It is
10-
a cell centered, structured solver, using multi-block structured grids in Plot3D
11-
format. It uses explicit and implicit time integration methods. It uses MUSCL
12-
extrapolation to reconstruct the primitive variables from the cell centers to
13-
the cell faces for 2nd order accuracy. Higher order reconstruction is acheived
14-
with a 5th order WENO reconstruction for the inviscid fluxes, and a 4th order
15-
central reconstruction for the viscous fluxes. The code uses the Roe
16-
flux difference splitting scheme for the inviscid fluxes, and a central scheme
17-
for the viscous fluxes. It is second order accurate in both space and time.
9+
Aither is a 3D Navier-Stokes computational fluid dynamics solver capable of
10+
modeling finite rate chemsitry. It is a cell centered, structured solver, using
11+
multi-block structured grids in Plot3D format. It uses explicit and implicit
12+
time integration methods. It uses MUSCL extrapolation to reconstruct the
13+
primitive variables from the cell centers to the cell faces for 2nd order
14+
accuracy. Higher order reconstruction is acheived with a 5th order WENO
15+
reconstruction for the inviscid fluxes, and a 4th order central reconstruction
16+
for the viscous fluxes. The code uses either the Roe flux difference splitting
17+
or AUSMPW+ flux vector splitting scheme for the inviscid fluxes, and a central
18+
scheme for the viscous fluxes. It is second order accurate in both space and
19+
time.
1820

1921
### Current Status
2022
The code is 2nd order accurate in space and time. Available explicit time
2123
integration methods are forward euler (1st order) and a minimum storage four
2224
stage Runge-Kutta method (2nd order). The implicit solver (LU-SGS, BLU-SGS,
2325
DPLUR, BDPLUR) is implemented for implicit time integration. Dual time stepping
2426
is implemented for time accuracy in the implicit solver. Available implicit
25-
time integrations methods come from the Beam and Warming family of methods and
27+
time integration methods come from the Beam and Warming family of methods and
2628
are the implicit euler (1st order), Crank-Nicholson (2nd order), and BDF2
2729
(2nd order) methods. The code has been thoroughly commented. It has been made
2830
parallel using MPI. For RANS simulations the Wilcox K-Omega 2006 and SST 2003
2931
turbulence models are available. Wall functions are supported for both models.
3032
For detatched eddy simulations, the SST-DES turbulence model is available. For
31-
large eddy simulations, the WALE subgrid scale model is available. A
32-
Multi-species flow capability is in progress. Supported diffusion models will be
33-
Schmidt number based diffusion.
33+
large eddy simulations, the WALE subgrid scale model is available.
34+
Multispecies flow is supported and a Schmidt number based model is used for
35+
diffusion. Reacting flow is modeled with a finite rate chemistry model.
3436

3537
### To Do List
3638
* Add multigrid scheme for improved convergence
37-
* Add reacting flow capability
3839
* Performance improvements
3940

4041
### Dependencies
@@ -50,7 +51,7 @@ cmake -DCMAKE_INSTALL_PREFIX=/path/to/installation -DCMAKE_BUILD_TYPE=release /p
5051
make
5152
make install
5253

53-
export AITHER_FLUID_DATABASE=/path/to/installation/fluidDatabase
54+
export AITHER_INSTALL_DIRECTORY=/path/to/installation
5455
```
5556

5657
Cmake will automatically look for an MPI package. To specify a specific

chemistryMechanisms/CH4_5s2r.mch

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
CH4 + 1.5 O2 => CO + 2 H2O : forwardRate=arrhenius(C=2e9, eta=0, theta=17866.1); modifyReactants=[CH4=0.9, O2=1.1]
2+
CO + 0.5 O2 <=> CO2 : forwardRate=arrhenius(C=6.3e4, eta=0, theta=6039.3)

chemistryMechanisms/O2_2s2r.mch

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Two reaction, two species dissociating oxygen mechanism
2+
# Rates from Luke, adjusted to be in mol instead of kmol
3+
#
4+
# Luke, E. A. "A Rule-Based Specification System For Computational Fluid
5+
# Dynamics". Ph. D. Thesis, December 1999.
6+
7+
2 O2 <=> 2 O + O2 : forwardRate=arrhenius(C=1.9e15, eta=-1.5, theta=59500)
8+
O2 + O <=> 3 O : forwardRate=arrhenius(C=6.4e17, eta=-2, theta=59500)

fluidDatabase/Ar.dat

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
1+
# This data is aggregated from the following sources
2+
#
3+
# NIST Computational Chemistry Comparison and Benchmark Database
4+
# NIST Standard Reference Database Number 101
5+
# Release 18, October 2016, Editor: Russell D. Johnson III
6+
# http://cccbdb.nist.gov/
7+
#
8+
# P.J. Linstrom and W.G. Mallard, Eds., NIST Chemistry WebBook,
9+
# NIST Standard Reference Database Number 69,
10+
# National Institute of Standards and Technology, Gaithersburg MD, 20899,
11+
# doi:10.18434/T4D303, (retrieved March 3, 2018).
12+
113
# general fluid properties
214
n: 1.5
315
molarMass: 39.948
416
vibrationalTemperature: []
17+
heatOfFormation: 0
18+
referencePressure: 101325
19+
referenceTemperature: 298.15
20+
referenceEntropy: 154.85
521

622
# Sutherland's coefficients for transport properties
723
# ----- viscosity -----

fluidDatabase/CH4.dat

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
1+
# This data is aggregated from the following sources
2+
#
3+
# NIST Computational Chemistry Comparison and Benchmark Database
4+
# NIST Standard Reference Database Number 101
5+
# Release 18, October 2016, Editor: Russell D. Johnson III
6+
# http://cccbdb.nist.gov/
7+
#
8+
# P.J. Linstrom and W.G. Mallard, Eds., NIST Chemistry WebBook,
9+
# NIST Standard Reference Database Number 69,
10+
# National Institute of Standards and Technology, Gaithersburg MD, 20899,
11+
# doi:10.18434/T4D303, (retrieved March 3, 2018).
12+
113
# general fluid properties
214
n: 3.0
315
molarMass: 16.0425
416
vibrationalTemperature: [4196.38, 2207.18, 2207.18, 4343.43, 4343.43, 4343.43, 1879.13, 1879.13, 1879.13]
17+
heatOfFormation: -74600
18+
referencePressure: 101325
19+
referenceTemperature: 298.15
20+
referenceEntropy: 186.37
521

622
# Sutherland's coefficients for transport properties
723
# ----- viscosity -----

fluidDatabase/CO.dat

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
1+
# This data is aggregated from the following sources
2+
#
3+
# NIST Computational Chemistry Comparison and Benchmark Database
4+
# NIST Standard Reference Database Number 101
5+
# Release 18, October 2016, Editor: Russell D. Johnson III
6+
# http://cccbdb.nist.gov/
7+
#
8+
# P.J. Linstrom and W.G. Mallard, Eds., NIST Chemistry WebBook,
9+
# NIST Standard Reference Database Number 69,
10+
# National Institute of Standards and Technology, Gaithersburg MD, 20899,
11+
# doi:10.18434/T4D303, (retrieved March 3, 2018).
12+
113
# general fluid properties
214
n: 2.5
315
molarMass: 28.0101
416
vibrationalTemperature: [3121.5]
17+
heatOfFormation: -110530
18+
referencePressure: 101325
19+
referenceTemperature: 298.15
20+
referenceEntropy: 197.66
521

622
# Sutherland's coefficients for transport properties
723
# ----- viscosity -----

fluidDatabase/CO2.dat

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
1+
# This data is aggregated from the following sources
2+
#
3+
# NIST Computational Chemistry Comparison and Benchmark Database
4+
# NIST Standard Reference Database Number 101
5+
# Release 18, October 2016, Editor: Russell D. Johnson III
6+
# http://cccbdb.nist.gov/
7+
#
8+
# P.J. Linstrom and W.G. Mallard, Eds., NIST Chemistry WebBook,
9+
# NIST Standard Reference Database Number 69,
10+
# National Institute of Standards and Technology, Gaithersburg MD, 20899,
11+
# doi:10.18434/T4D303, (retrieved March 3, 2018).
12+
113
# general fluid properties
214
n: 2.5
315
molarMass: 44.0095
416
vibrationalTemperature: [960.1, 960.1, 1932.1, 3380.1]
17+
heatOfFormation: -393510
18+
referencePressure: 101325
19+
referenceTemperature: 298.15
20+
referenceEntropy: 213.79
521

622
# Sutherland's coefficients for transport properties
723
# ----- viscosity -----

fluidDatabase/H.dat

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
1+
# This data is aggregated from the following sources
2+
#
3+
# NIST Computational Chemistry Comparison and Benchmark Database
4+
# NIST Standard Reference Database Number 101
5+
# Release 18, October 2016, Editor: Russell D. Johnson III
6+
# http://cccbdb.nist.gov/
7+
#
8+
# P.J. Linstrom and W.G. Mallard, Eds., NIST Chemistry WebBook,
9+
# NIST Standard Reference Database Number 69,
10+
# National Institute of Standards and Technology, Gaithersburg MD, 20899,
11+
# doi:10.18434/T4D303, (retrieved March 3, 2018).
12+
113
# general fluid properties
214
n: 1.5
315
molarMass: 1.00794
416
vibrationalTemperature: []
17+
heatOfFormation: 218000
18+
referencePressure: 101325
19+
referenceTemperature: 298.15
20+
referenceEntropy: 114.72
521

622
# Sutherland's coefficients for transport properties
723
# ----- viscosity -----

fluidDatabase/H2.dat

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
1+
# This data is aggregated from the following sources
2+
#
3+
# NIST Computational Chemistry Comparison and Benchmark Database
4+
# NIST Standard Reference Database Number 101
5+
# Release 18, October 2016, Editor: Russell D. Johnson III
6+
# http://cccbdb.nist.gov/
7+
#
8+
# P.J. Linstrom and W.G. Mallard, Eds., NIST Chemistry WebBook,
9+
# NIST Standard Reference Database Number 69,
10+
# National Institute of Standards and Technology, Gaithersburg MD, 20899,
11+
# doi:10.18434/T4D303, (retrieved March 3, 2018).
12+
113
# general fluid properties
214
n: 2.5
315
molarMass: 2.01588
416
vibrationalTemperature: [6338.3]
17+
heatOfFormation: 0
18+
referencePressure: 101325
19+
referenceTemperature: 298.15
20+
referenceEntropy: 130680
521

622
# Sutherland's coefficients for transport properties
723
# ----- viscosity -----

fluidDatabase/H2O.dat

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
1+
# This data is aggregated from the following sources
2+
#
3+
# NIST Computational Chemistry Comparison and Benchmark Database
4+
# NIST Standard Reference Database Number 101
5+
# Release 18, October 2016, Editor: Russell D. Johnson III
6+
# http://cccbdb.nist.gov/
7+
#
8+
# P.J. Linstrom and W.G. Mallard, Eds., NIST Chemistry WebBook,
9+
# NIST Standard Reference Database Number 69,
10+
# National Institute of Standards and Technology, Gaithersburg MD, 20899,
11+
# doi:10.18434/T4D303, (retrieved March 3, 2018).
12+
113
# general fluid properties
214
n: 3.0
315
molarMass: 18.0153
416
vibrationalTemperature: [2294.3, 5261.7, 5403.8]
17+
heatOfFormation: -241810
18+
referencePressure: 101325
19+
referenceTemperature: 298.15
20+
referenceEntropy: 188.84
521

622
# Sutherland's coefficients for transport properties
723
# ----- viscosity -----

fluidDatabase/He.dat

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
1+
# This data is aggregated from the following sources
2+
#
3+
# NIST Computational Chemistry Comparison and Benchmark Database
4+
# NIST Standard Reference Database Number 101
5+
# Release 18, October 2016, Editor: Russell D. Johnson III
6+
# http://cccbdb.nist.gov/
7+
#
8+
# P.J. Linstrom and W.G. Mallard, Eds., NIST Chemistry WebBook,
9+
# NIST Standard Reference Database Number 69,
10+
# National Institute of Standards and Technology, Gaithersburg MD, 20899,
11+
# doi:10.18434/T4D303, (retrieved March 3, 2018).
12+
113
# general fluid properties
214
n: 1.5
315
molarMass: 4.002602
416
vibrationalTemperature: []
17+
heatOfFormation: 0
18+
referencePressure: 101325
19+
referenceTemperature: 298.15
20+
referenceEntropy: 126.15
521

622
# Sutherland's coefficients for transport properties
723
# ----- viscosity -----

fluidDatabase/N.dat

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
1+
# This data is aggregated from the following sources
2+
#
3+
# NIST Computational Chemistry Comparison and Benchmark Database
4+
# NIST Standard Reference Database Number 101
5+
# Release 18, October 2016, Editor: Russell D. Johnson III
6+
# http://cccbdb.nist.gov/
7+
#
8+
# P.J. Linstrom and W.G. Mallard, Eds., NIST Chemistry WebBook,
9+
# NIST Standard Reference Database Number 69,
10+
# National Institute of Standards and Technology, Gaithersburg MD, 20899,
11+
# doi:10.18434/T4D303, (retrieved March 3, 2018).
12+
113
# general fluid properties
214
n: 1.5
315
molarMass: 14.0067
416
vibrationalTemperature: []
17+
heatOfFormation: 472680
18+
referencePressure: 101325
19+
referenceTemperature: 298.15
20+
referenceEntropy: 153.3
521

622
# Sutherland's coefficients for transport properties
723
# ----- viscosity -----

0 commit comments

Comments
 (0)