GIT: resolved merge conflict

This commit is contained in:
andy
2012-08-21 18:17:27 +01:00
72 changed files with 1175 additions and 779 deletions

View File

@ -11,10 +11,10 @@ gnuplot<<EOF
set xlabel "Time / [s]" font "Helvetica,24"
set ylabel "Temperature / [K]" font "Helvetica,24"
set grid
set key left top
set key left top
set xrange [0:0.001]
set yrange [750:2750]
set ytics 250
set ytics 250
plot \
"../chemFoam.out" u 1:2 t "OpenFOAM" with points lt 1 pt 6 ps 1.5,\
"chemkinII" with lines title "Chemkin II" lt -1

View File

@ -53,13 +53,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 300;
Cp0 4187;

View File

@ -23,7 +23,8 @@ active true;
infinitelyFastChemistryCoeffs
{
C 5.0;
semiImplicit no;
C 5.0;
}
FSDCoeffs

View File

@ -53,13 +53,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 300;
Cp0 4187;

View File

@ -22,6 +22,7 @@ active on;
infinitelyFastChemistryCoeffs
{
semiImplicit no;
C 5.0;
}

View File

@ -53,13 +53,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 300;
Cp0 4187;

View File

@ -60,13 +60,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 350;
Cp0 4100;

View File

@ -54,13 +54,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 300;
Cp0 4187;

View File

@ -53,10 +53,6 @@ constantProperties
{
parcelTypeId 2;
rhoMin 1e-15;
TMin 200;
minParticleMass 1e-15;
rho0 2500;
T0 300;
Cp0 900;

View File

@ -45,11 +45,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
minParticleMass 1e-15;
rho0 964;
youngsModulus 6e8;
poissonsRatio 0.35;

View File

@ -37,11 +37,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
minParticleMass 1e-15;
rho0 964;
youngsModulus 6e8;
poissonsRatio 0.35;

View File

@ -54,13 +54,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 300;
Cp0 4100;

View File

@ -54,13 +54,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 350;
Cp0 4100;

View File

@ -54,13 +54,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 350;
Cp0 4100;

View File

@ -53,13 +53,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 300;
Cp0 4187;

View File

@ -53,13 +53,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 300;
Cp0 4187;

View File

@ -53,13 +53,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 300;
Cp0 4187;

View File

@ -54,13 +54,6 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
rho0 1000;
T0 300;
Cp0 4187;

View File

@ -54,16 +54,9 @@ solution
constantProperties
{
parcelTypeId 1;
rhoMin 1e-15;
TMin 200;
pMin 1000;
minParticleMass 1e-15;
T0 320;
// place holders for rho0 and T0 - reset from liquid props using T0
// place holders for rho0 and Cp0 - reset from liquid props using T0
rho0 1000;
Cp0 4187;

View File

@ -151,7 +151,7 @@ motionControl
{
priority 1;
mode bothSides;
surfaceCellSizeFunction uniformValue;
uniformValueCoeffs
{

View File

@ -139,7 +139,7 @@ surfaceConformation
// conformation, initial protrusion tests.
surfacePtReplaceDistCoeff 0.5;
surfacePtExclusionDistanceCoeff 0.5;
}

View File

@ -1,12 +1,12 @@
#!/bin/sh
cd ${0%/*} || exit 1 # run from this directory
(
cd flange || exit
./Allrun
)
(
cd flange || exit
./Allrun
)
exit 0
# These cases are links to solver test cases and are run when the Allrun