reactingMixture: use the foamChemistryReader directly rather than chemistryReader::New

This formalises the flexible and extensible OpenFOAM thermodynamics and reaction
format as the direct input to OpenFOAM solvers.  The CHEMKIN format is still
supported by first converting to the OpenFOAM format using the chemkinToFoam
utility.
This commit is contained in:
Henry Weller
2019-08-02 14:47:37 +01:00
parent 50dc057184
commit 4baf73b54d
57 changed files with 82 additions and 438 deletions

View File

@ -26,7 +26,6 @@ thermoType
specie specie;
}
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo";

View File

@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory
cleanCase
rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
rm -rf 0 chemFoam.out constant/reactions constant/thermo \
validation/OF_vs_CHEMKINII.eps validation/chemkinII
#------------------------------------------------------------------------------

View File

@ -7,6 +7,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Set application name
application=$(getApplication)
runApplication chemkinToFoam \
chemkin/chem.inp chemkin/therm.dat chemkin/transportProperties \
constant/reactions constant/thermo
runApplication $application
(cd validation && ./Allrun $*)

View File

@ -26,8 +26,7 @@ thermoType
specie specie;
}
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";
CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
foamChemistryFile "$FOAM_CASE/constant/reactions";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo";
// ************************************************************************* //

View File

@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory
cleanCase
rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
rm -rf 0 chemFoam.out constant/reactions constant/thermo \
validation/OF_vs_CHEMKINII.eps validation/chemkinII
#------------------------------------------------------------------------------

View File

@ -7,6 +7,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Set application name
application=$(getApplication)
runApplication chemkinToFoam \
chemkin/chem.inp chemkin/therm.dat chemkin/transportProperties \
constant/reactions constant/thermo
runApplication $application
(cd validation && ./Allrun $*)

View File

@ -26,8 +26,7 @@ thermoType
specie specie;
}
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";
CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
foamChemistryFile "$FOAM_CASE/constant/reactions";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo";
// ************************************************************************* //

View File

@ -6,6 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory
cleanCase
rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
rm -rf 0 chemFoam.out constant/reactions constant/thermo \
validation/OF_vs_CHEMKINII.eps validation/chemkinII
#------------------------------------------------------------------------------

View File

@ -7,6 +7,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Set application name
application=$(getApplication)
runApplication chemkinToFoam \
chemkin/chem.inp chemkin/therm.dat chemkin/transportProperties \
constant/reactions constant/thermo
runApplication $application
(cd validation && ./Allrun $*)

View File

@ -26,8 +26,7 @@ thermoType
specie specie;
}
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";
CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
foamChemistryFile "$FOAM_CASE/constant/reactions";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo";
// ************************************************************************* //

View File

@ -6,7 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory
cleanCase
rm -rf 0 chemFoam.out validation/OF_vs_CHEMKINII.eps validation/chemkinII
rm -rf 0 chemFoam.out constant/reactions constant/thermo \
validation/OF_vs_CHEMKINII.eps validation/chemkinII
#------------------------------------------------------------------------------

View File

@ -7,6 +7,10 @@ cd ${0%/*} || exit 1 # Run from this directory
# Set application name
application=$(getApplication)
runApplication chemkinToFoam \
chemkin/chem.inp chemkin/therm.dat chemkin/transportProperties \
constant/reactions constant/thermo
runApplication $application
(cd validation && ./Allrun $*)

View File

@ -26,8 +26,7 @@ thermoType
specie specie;
}
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";
CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
foamChemistryFile "$FOAM_CASE/constant/reactions";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo";
// ************************************************************************* //

View File

@ -28,7 +28,6 @@ thermoType
inertSpecie air;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/include/reactions.air";

View File

@ -26,7 +26,6 @@ thermoType
}
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/pyrolysisRegion/reactions";

View File

@ -30,7 +30,6 @@ inertSpecie N2;
fuel C3H8;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";

View File

@ -26,7 +26,6 @@ thermoType
}
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/panelRegion/reactions";

View File

@ -30,7 +30,6 @@ inertSpecie N2;
fuel C3H8;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";

View File

@ -30,7 +30,6 @@ inertSpecie N2;
fuel CH4;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";

View File

@ -30,7 +30,6 @@ inertSpecie N2;
fuel CH4;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";

View File

@ -29,7 +29,6 @@ thermoType
inertSpecie N2;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactionsGRI";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGasGRI";

View File

@ -28,7 +28,6 @@ thermoType
inertSpecie N2;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactionsGRI";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGasGRI";

View File

@ -28,7 +28,6 @@ thermoType
inertSpecie N2;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";

View File

@ -28,7 +28,6 @@ thermoType
inertSpecie N2;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";

View File

@ -28,7 +28,6 @@ thermoType
inertSpecie N2;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";

View File

@ -28,7 +28,6 @@ thermoType
inertSpecie N2;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactionsGRI";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGasGRI";

View File

@ -28,7 +28,6 @@ thermoType
inertSpecie N2;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactionsGRI";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGasGRI";

View File

@ -28,7 +28,6 @@ thermoType
inertSpecie N2;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactionsGRI";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo.compressibleGasGRI";

View File

@ -28,7 +28,6 @@ thermoType
inertSpecie N2;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/gas/reactions";

View File

@ -26,7 +26,6 @@ thermoType
specie specie;
}
chemistryReader foamChemistryReader;
foamChemistryThermoFile "$FOAM_CASE/constant/foam.dat";

View File

@ -28,7 +28,6 @@ thermoType
inertSpecie N2;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";

View File

@ -26,7 +26,6 @@ thermoType
specie specie;
}
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/foam.inp";

View File

@ -26,7 +26,6 @@ thermoType
specie specie;
}
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";

View File

@ -26,7 +26,6 @@ thermoType
specie specie;
}
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/foam.inp";

View File

@ -26,7 +26,6 @@ thermoType
specie specie;
}
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";

View File

@ -26,7 +26,6 @@ thermoType
specie specie;
}
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/foam.inp";

View File

@ -26,7 +26,6 @@ thermoType
specie specie;
}
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/foam.inp";

View File

@ -26,7 +26,6 @@ thermoType
specie specie;
}
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";

View File

@ -26,7 +26,6 @@ thermoType
specie specie;
}
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";

View File

@ -26,7 +26,6 @@ thermoType
specie specie;
}
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions";

View File

@ -0,0 +1,11 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/CleanFunctions
cleanCase
rm -rf constant/reactions constant/thermo
#------------------------------------------------------------------------------

View File

@ -0,0 +1,17 @@
#!/bin/sh
cd ${0%/*} || exit 1 # Run from this directory
# Source tutorial run functions
. $WM_PROJECT_DIR/bin/tools/RunFunctions
# Set application name
application=$(getApplication)
runApplication chemkinToFoam \
chemkin/chem.inp chemkin/therm.dat chemkin/transportProperties \
constant/reactions constant/thermo
runApplication blockMesh
runApplication $application
#------------------------------------------------------------------------------

View File

@ -26,9 +26,8 @@ thermoType
specie specie;
}
CHEMKINFile "$FOAM_CASE/chemkin/chem.inp";
CHEMKINThermoFile "$FOAM_CASE/chemkin/therm.dat";
CHEMKINTransportFile "$FOAM_CASE/chemkin/transportProperties";
foamChemistryFile "$FOAM_CASE/constant/reactions";
foamChemistryThermoFile "$FOAM_CASE/constant/thermo";
newFormat yes;

View File

@ -28,7 +28,6 @@ thermoType
inertSpecie AIR;
chemistryReader foamChemistryReader;
foamChemistryFile "$FOAM_CASE/constant/reactions.gas";